diff --git a/src/gausskernel/runtime/executor/instrument.cpp b/src/gausskernel/runtime/executor/instrument.cpp index b36da82b7..a30b80bcf 100644 --- a/src/gausskernel/runtime/executor/instrument.cpp +++ b/src/gausskernel/runtime/executor/instrument.cpp @@ -434,7 +434,11 @@ void SetInstrNull() void CalculateContextSize(MemoryContext ctx, int64* memory_size) { +#ifndef ENABLE_MEMORY_CHECK AllocSetContext* aset = (AllocSetContext*)ctx; +#else + AsanSetContext* aset = (AsanSetContext*)ctx; +#endif MemoryContext child; if (ctx == NULL) diff --git a/src/include/storage/ipc.h b/src/include/storage/ipc.h index fd6185279..e3343e18f 100644 --- a/src/include/storage/ipc.h +++ b/src/include/storage/ipc.h @@ -75,7 +75,6 @@ extern void shmem_exit(int code); extern void on_proc_exit(pg_on_exit_callback function, Datum arg); extern void before_shmem_exit(pg_on_exit_callback function, Datum arg); extern void on_shmem_exit(pg_on_exit_callback function, Datum arg); -extern void before_shmem_exit(pg_on_exit_callback function, Datum arg); extern void cancel_shmem_exit(pg_on_exit_callback function, Datum arg); extern void on_exit_reset(void);