Merge pull request #9724 from swiftlang/lldb-remove-bounds-safety-recognizer

[lldb][Target] Remove BoundsSafetyTrapFrameRecognizer

Author: adrian-prantl

lldb/include/lldb/Target/BoundsSafetyTrapFrameRecognizer.h

@@ -12,7 +12,6 @@ add_lldb_library(lldbTarget
   AssertFrameRecognizer.cpp
   DynamicRegisterInfo.cpp
   ExecutionContext.cpp
-  BoundsSafetyTrapFrameRecognizer.cpp
   InstrumentationRuntime.cpp
   InstrumentationRuntimeStopInfo.cpp
   JITLoader.cpp

lldb/source/Target/BoundsSafetyTrapFrameRecognizer.cpp

@@ -43,9 +43,6 @@
 #include "lldb/Target/ABI.h"
 #include "lldb/Target/AssertFrameRecognizer.h"
 #include "lldb/Target/DynamicLoader.h"
-/* TO_UPSTREAM(BoundsSafety) ON */
-#include "lldb/Target/BoundsSafetyTrapFrameRecognizer.h"
-/* TO_UPSTREAM(BoundsSafety) OFF */
 #include "lldb/Target/InstrumentationRuntime.h"
 #include "lldb/Target/JITLoader.h"
 #include "lldb/Target/JITLoaderList.h"
@@ -546,9 +543,6 @@ Process::Process(lldb::TargetSP target_sp, ListenerSP listener_sp,
   // common C LanguageRuntime plugin.
   RegisterAssertFrameRecognizer(this);
   RegisterVerboseTrapFrameRecognizer(*this);
-  /* TO_UPSTREAM(BoundsSafety) ON */
-  RegisterBoundsSafetyTrapFrameRecognizer(*this);
-  /* TO_UPSTREAM(BoundsSafety) OFF */
 }
 
 Process::~Process() {

lldb/source/Target/CMakeLists.txt

@@ -148,8 +148,11 @@ namespace lldb_private {
 
 void RegisterVerboseTrapFrameRecognizer(Process &process) {
   RegularExpressionSP module_regex_sp = nullptr;
+  // Older -fbounds-safety versions didn't have a ClangTrapPrefix, so the name
+  // of the frame was just the bounds-check failure message. This regex supports
+  // the old and new style of frames.
   auto symbol_regex_sp = std::make_shared<RegularExpression>(
-      llvm::formatv("^{0}", ClangTrapPrefix).str());
+      llvm::formatv("^({0}|Bounds check failed|Pointer Check runtime failure)", ClangTrapPrefix).str());
 
   StackFrameRecognizerSP srf_recognizer_sp =
       std::make_shared<VerboseTrapFrameRecognizer>();

lldb/source/Target/Process.cpp

@@ -80,13 +80,10 @@ def partial_oob(self, type_name):
     def overflow_oob(self, type_name):
         return self.get_idx_var_regex(oob_kind=OOBKind.Overflow, type_name=type_name)
 
-    def setUp(self):
-        TestBase.setUp(self)
-        if _get_bool_config("ios_disclosed", fail_value=False):
-            self.build()
-
     @skipIf(bugnumber="rdar://141363609")
     def test_bidi_known_type_size(self):
+        self.build()
+
         (_, self.process, _, bkpt) = lldbutil.run_to_source_breakpoint(
             self, r"// break here:.+", lldb.SBFileSpec("bidi_check_known_type_size.c")
         )
@@ -156,6 +153,8 @@ def test_bidi_known_type_size(self):
 
     @skipIf(bugnumber="rdar://141363609")
     def test_bidi_unknown_type_size(self):
+        self.build()
+
         (_, self.process, _, bkpt) = lldbutil.run_to_source_breakpoint(
             self, r"// break here:.+", lldb.SBFileSpec("bidi_check_unknown_type_size.c")
         )
@@ -206,6 +205,8 @@ def test_bidi_unknown_type_size(self):
 
     @skipIf(bugnumber="rdar://141363609")
     def test_idx_known_type_size(self):
+        self.build()
+
         (_, self.process, _, bkpt) = lldbutil.run_to_source_breakpoint(
             self, r"// break here:.+", lldb.SBFileSpec("idx_check_known_type_size.c")
         )
@@ -256,6 +257,8 @@ def test_idx_known_type_size(self):
 
     @skipIf(bugnumber="rdar://141363609")
     def test_idx_unknown_type_size(self):
+        self.build()
+
         (_, self.process, _, bkpt) = lldbutil.run_to_source_breakpoint(
             self, r"// break here:.+", lldb.SBFileSpec("idx_check_unknown_type_size.c")
         )

lldb/source/Target/VerboseTrapFrameRecognizer.cpp

@@ -1,4 +1,3 @@
-# REQUIRES: rdar141363609
 # UNSUPPORTED: system-windows
 # RUN: %clang_host -Xclang -fbounds-safety -g -O0 %S/Inputs/boundsSafetyTrap.c -o %t.out
 # RUN: %lldb -b -s %s %t.out | FileCheck %s