diff --git a/compiler-rt/lib/gwp_asan/optional/segv_handler_posix.cpp b/compiler-rt/lib/gwp_asan/optional/segv_handler_posix.cpp
index c55175fca11fee656dff1930083bcfa09d92e547..9567e752697c4f912559b1424000cf61394c74ca 100644
--- a/compiler-rt/lib/gwp_asan/optional/segv_handler_posix.cpp
+++ b/compiler-rt/lib/gwp_asan/optional/segv_handler_posix.cpp
@@ -98,9 +98,6 @@ void dumpReport(uintptr_t ErrorPtr, const gwp_asan::AllocatorState *State,
   assert(Metadata && "dumpReport missing Metadata.");
   assert(Printf && "dumpReport missing Printf.");
 
-  if (!__gwp_asan_error_is_mine(State, ErrorPtr))
-    return;
-
   Printf("*** GWP-ASan detected a memory error ***\n");
   ScopedEndOfReportDecorator Decorator(Printf);
 
@@ -167,11 +164,13 @@ SegvBacktrace_t BacktraceForSignalHandler;
 // OHOS_LOCAL begin
 #if defined(__OHOS__)
 static bool sigSegvHandlerOhos(int sig, siginfo_t *info, void *ucontext) {
-  if (GPAForSignalHandler) {
+  uintptr_t ErrorPtr = reinterpret_cast<uintptr_t>(info->si_addr);
+  const gwp_asan::AllocatorState *State =
+    GPAForSignalHandler->getAllocatorState();
+    
+  if (__gwp_asan_error_is_mine(State, ErrorPtr)) {
     GPAForSignalHandler->stop();
-    dumpReport(reinterpret_cast<uintptr_t>(info->si_addr),
-               GPAForSignalHandler->getAllocatorState(),
-               GPAForSignalHandler->getMetadataRegion(),
+    dumpReport(ErrorPtr, State, GPAForSignalHandler->getMetadataRegion(),
                BacktraceForSignalHandler, PrintfForSignalHandler,
                PrintBacktraceForSignalHandler, ucontext);
   }