[compiler-rt] Use GetNextInstructionPc in signal handlers

[vitalybuka]

Summary

All other stack trace callers assume that PC contains return address.
HWAsan already use GetNextInstructionPc in similar code.

PR43339

[vitalybuka]

clang-format

[vitalybuka]

Remove garbage comment

[eugenis]

LGTM

[eugenis]

compiler-rt/test/sanitizer_common/TestCases/Linux/signal_line.cpp

9 ↗

(On Diff #222743)

Well, this is not a good symptom.
Do you know why?

[vitalybuka]

compiler-rt/test/sanitizer_common/TestCases/Linux/signal_line.cpp

9 ↗

(On Diff #222743)

That's a copy/paste from similar test.
I'd like to land this one, if it's green the to try to land a patch removing this lines, for easier reverting

[vitalybuka]

compiler-rt/test/sanitizer_common/TestCases/Linux/signal_line.cpp

9 ↗

(On Diff #222743)

from sanitizer_common/TestCases/Linux/ill.cpp

[vitalybuka]

remove REQUIRED

[vitalybuka]

compiler-rt/test/sanitizer_common/TestCases/Linux/signal_line.cpp

9 ↗

(On Diff #222743)

hm, probably safer to keep all platforms
at least we will know where it does not work ASAP
done

compiler-rt/trunk/lib/asan/asan_errors.cpp

#if SANITIZER_FREEBSD || SANITIZER_NETBSD
   // that raised the signal (as it does on Linux).
   fast = true;
 #endif
   // Tests and maybe some users expect that scariness is going to be printed
   // just before the stack. As only asan has scariness score we have no
   // corresponding code in the sanitizer_common and we use this callback to
   // print it.
   static_cast<const ScarinessScoreBase *>(callback_context)->Print();
-  stack->Unwind(sig.pc, sig.bp, sig.context, fast);
+  stack->Unwind(StackTrace::GetNextInstructionPc(sig.pc), sig.bp, sig.context,
+                fast);
 }
 
 void ErrorDeadlySignal::Print() {
   ReportDeadlySignal(signal, tid, &OnStackUnwind, &scariness);
 }
 
 void ErrorDoubleFree::Print() {
   Decorator d;

compiler-rt/trunk/lib/lsan/lsan.cpp

static void InitializeFlags() {
 
   if (common_flags()->help) parser.PrintFlagDescriptions();
 
   __sanitizer_set_report_path(common_flags()->log_path);
 }
 
 static void OnStackUnwind(const SignalContext &sig, const void *,
                           BufferedStackTrace *stack) {
-  stack->Unwind(sig.pc, sig.bp, sig.context,
+  stack->Unwind(StackTrace::GetNextInstructionPc(sig.pc), sig.bp, sig.context,
                 common_flags()->fast_unwind_on_fatal);
 }
 
 static void LsanOnDeadlySignal(int signo, void *siginfo, void *context) {
   HandleDeadlySignal(siginfo, context, GetCurrentThread(), &OnStackUnwind,
                      nullptr);
 }
 

compiler-rt/trunk/lib/msan/msan.cpp

void __msan_warning_noreturn() {
   if (__msan::flags()->print_stats)
     ReportStats();
   Printf("Exiting\n");
   Die();
 }
 
 static void OnStackUnwind(const SignalContext &sig, const void *,
                           BufferedStackTrace *stack) {
-  stack->Unwind(sig.pc, sig.bp, sig.context,
+  stack->Unwind(StackTrace::GetNextInstructionPc(sig.pc), sig.bp, sig.context,
                 common_flags()->fast_unwind_on_fatal);
 }
 
 static void MsanOnDeadlySignal(int signo, void *siginfo, void *context) {
   HandleDeadlySignal(siginfo, context, GetTid(), &OnStackUnwind, nullptr);
 }
 
 static void MsanCheckFailed(const char *file, int line, const char *cond,

compiler-rt/trunk/lib/tsan/rtl/tsan_rtl.cpp

for (uptr p0 = beg; p0 <= end; p0 += (end - beg) / 4) {
       }
     }
   }
 }
 
 #if !SANITIZER_GO
 static void OnStackUnwind(const SignalContext &sig, const void *,
                           BufferedStackTrace *stack) {
-  stack->Unwind(sig.pc, sig.bp, sig.context,
+  stack->Unwind(StackTrace::GetNextInstructionPc(sig.pc), sig.bp, sig.context,
                 common_flags()->fast_unwind_on_fatal);
 }
 
 static void TsanOnDeadlySignal(int signo, void *siginfo, void *context) {
   HandleDeadlySignal(siginfo, context, GetTid(), &OnStackUnwind, nullptr);
 }
 #endif
 

compiler-rt/trunk/lib/ubsan/ubsan_signals_standalone.cpp

 // TODO(yln): Temporary workaround. Will be removed.
 void ubsan_GetStackTrace(BufferedStackTrace *stack, uptr max_depth,
                          uptr pc, uptr bp, void *context, bool fast);
 
 namespace __ubsan {
 
 static void OnStackUnwind(const SignalContext &sig, const void *,
                           BufferedStackTrace *stack) {
-  ubsan_GetStackTrace(stack, kStackTraceMax, sig.pc, sig.bp, sig.context,
-                common_flags()->fast_unwind_on_fatal);
+  ubsan_GetStackTrace(stack, kStackTraceMax,
+                      StackTrace::GetNextInstructionPc(sig.pc), sig.bp,
+                      sig.context, common_flags()->fast_unwind_on_fatal);
 }
 
 static void UBsanOnDeadlySignal(int signo, void *siginfo, void *context) {
   HandleDeadlySignal(siginfo, context, GetTid(), &OnStackUnwind, nullptr);
 }
 
 static bool is_initialized = false;
 

compiler-rt/trunk/test/sanitizer_common/TestCases/Linux/signal_line.cpp

+// Test line numbers in signal handlers
+
+// RUN: %clangxx %s -o %t -O0
+// RUN: %env_tool_opts=handle_segv=1:print_stacktrace=1 not %run %t 1 2>&1 | FileCheck --check-prefixes=CHECK1,CHECK %s
+// RUN: %env_tool_opts=handle_segv=1:print_stacktrace=1 not %run %t 2 2>&1 | FileCheck --check-prefixes=CHECK2,CHECK %s
+// RUN: %env_tool_opts=handle_segv=1:print_stacktrace=1 not %run %t 3 2>&1 | FileCheck --check-prefixes=CHECK3,CHECK %s
+// RUN: %env_tool_opts=handle_segv=1:print_stacktrace=1 not %run %t 4 2>&1 | FileCheck --check-prefixes=CHECK4,CHECK %s
+
+#include <cstdio>
+#include <string>
+
+// CHECK: [[SAN:.*Sanitizer]]:DEADLYSIGNAL
+// CHECK: ERROR: [[SAN]]: SEGV on unknown address {{0x[^ ]*}} (pc
+int main(int argc, char **argv) {
+  int n = atoi(argv[1]);
+
+  if (n == 1)
+    *((volatile int *)0x0) = __LINE__;
+  // CHECK1: #{{[0-9]+ .*}}main {{.*}}signal_line.cpp:[[@LINE-1]]:[[TAB:[0-9]+]]
+  // CHECK1: SUMMARY: [[SAN]]: SEGV {{.*}}signal_line.cpp:[[@LINE-2]]:[[TAB]] in main
+
+  if (n == 2)
+    *((volatile int *)0x0) = __LINE__;
+  // CHECK2: #{{[0-9]+ .*}}main {{.*}}signal_line.cpp:[[@LINE-1]]:[[TAB:[0-9]+]]
+  // CHECK2: SUMMARY: [[SAN]]: SEGV {{.*}}signal_line.cpp:[[@LINE-2]]:[[TAB]] in main
+
+  if (n == 3)
+    *((volatile int *)0x0) = __LINE__;
+  // CHECK3: #{{[0-9]+ .*}}main {{.*}}signal_line.cpp:[[@LINE-1]]:[[TAB:[0-9]+]]
+  // CHECK3: SUMMARY: [[SAN]]: SEGV {{.*}}signal_line.cpp:[[@LINE-2]]:[[TAB]] in main
+
+  if (n == 4)
+    *((volatile int *)0x0) = __LINE__;
+  // CHECK4: #{{[0-9]+ .*}}main {{.*}}signal_line.cpp:[[@LINE-1]]:[[TAB:[0-9]+]]
+  // CHECK4: SUMMARY: [[SAN]]: SEGV {{.*}}signal_line.cpp:[[@LINE-2]]:[[TAB]] in main
+}