diff options
4 files changed, 127 insertions, 1 deletions
diff --git a/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.cpp b/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.cpp index 8b80c90de29..de34dcb988d 100644 --- a/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.cpp +++ b/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.cpp @@ -255,7 +255,7 @@ ItaniumABILanguageRuntime::GetPluginVersion() return 1; } -static const char *exception_names[] = {"__cxa_throw", "__cxa_allocate", "__cxa_rethrow", "__cxa_catch"}; +static const char *exception_names[] = {"__cxa_throw", "__cxa_allocate_exception", "__cxa_rethrow", "__cxa_begin_catch"}; static const int num_throw_names = 3; BreakpointResolverSP diff --git a/lldb/test/lang/cpp/exceptions/Makefile b/lldb/test/lang/cpp/exceptions/Makefile new file mode 100644 index 00000000000..a6bd8463ad5 --- /dev/null +++ b/lldb/test/lang/cpp/exceptions/Makefile @@ -0,0 +1,5 @@ +LEVEL = ../../../make + +CXX_SOURCES := exceptions.cpp + +include $(LEVEL)/Makefile.rules diff --git a/lldb/test/lang/cpp/exceptions/TestCPPExceptionBreakpoints.py b/lldb/test/lang/cpp/exceptions/TestCPPExceptionBreakpoints.py new file mode 100644 index 00000000000..016f9092697 --- /dev/null +++ b/lldb/test/lang/cpp/exceptions/TestCPPExceptionBreakpoints.py @@ -0,0 +1,79 @@ +""" +Test lldb exception breakpoint command for CPP. +""" + +import os, time +import unittest2 +import lldb +import lldbutil +from lldbtest import * + +class CPPBreakpointTestCase(TestBase): + + mydir = os.path.join("lang", "cpp", "exceptions") + + @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + def test_with_dsym(self): + """Test lldb exception breakpoint command for CPP.""" + self.buildDsym() + self.cpp_exceptions() + + def test_with_dwarf(self): + """Test lldb exception breakpoint command for CPP.""" + self.buildDwarf() + self.cpp_exceptions() + + def setUp(self): + # Call super's setUp(). + TestBase.setUp(self) + self.source = 'exceptions.cpp' + self.catch_line = line_number(self.source, '// This is the line you should stop at for catch') + + def cpp_exceptions (self): + """Test lldb exception breakpoint command for CPP.""" + exe = os.path.join(os.getcwd(), "a.out") + + # Create a target from the debugger. + + target = self.dbg.CreateTarget (exe) + self.assertTrue(target, VALID_TARGET) + + exception_bkpt = target.BreakpointCreateForException (lldb.eLanguageTypeC_plus_plus, True, True) + self.assertTrue (exception_bkpt, "Made an exception breakpoint") + + # Now run, and make sure we hit our breakpoint: + process = target.LaunchSimple (None, None, os.getcwd()) + self.assertTrue (process, "Got a valid process") + + stopped_threads = [] + stopped_threads = lldbutil.get_threads_stopped_at_breakpoint (process, exception_bkpt) + self.assertTrue (len(stopped_threads) == 1, "Stopped at our exception breakpoint.") + thread = stopped_threads[0] + # Make sure our throw function is still above us on the stack: + + frame_functions = lldbutil.get_function_names(thread) + self.assertTrue (frame_functions.count ("throws_exception_on_even(int)") == 1, "Our throw function is still on the stack.") + + # Okay we hit our exception throw breakpoint, now make sure we get our catch breakpoint. + # One potential complication is that we might hit a couple of the exception breakpoints in getting out of the throw. + # so loop till we don't see the throws function on the stack. We should stop one more time for our exception breakpoint + # and that should be the catch... + + while frame_functions.count ("throws_exception_on_even(int)") == 1: + stopped_threads = lldbutil.continue_to_breakpoint (process, exception_bkpt) + self.assertTrue (len(stopped_threads) == 1) + + thread = stopped_threads[0] + frame_functions = lldbutil.get_function_names(thread) + + self.assertTrue (frame_functions.count ("throws_exception_on_even(int)") == 0, "At catch our throw function is off the stack") + self.assertTrue (frame_functions.count ("intervening_function(int)") == 0, "At catch our intervening function is off the stack") + self.assertTrue (frame_functions.count ("catches_exception(int)") == 1, "At catch our catch function is on the stack") + + + +if __name__ == '__main__': + import atexit + lldb.SBDebugger.Initialize() + atexit.register(lambda: lldb.SBDebugger.Terminate()) + unittest2.main() diff --git a/lldb/test/lang/cpp/exceptions/exceptions.cpp b/lldb/test/lang/cpp/exceptions/exceptions.cpp new file mode 100644 index 00000000000..150d420b241 --- /dev/null +++ b/lldb/test/lang/cpp/exceptions/exceptions.cpp @@ -0,0 +1,42 @@ +#include <exception> +#include <stdio.h> + +int throws_exception_on_even (int value); +int intervening_function (int value); +int catches_exception (int value); + +int +catches_exception (int value) +{ + try + { + return intervening_function(value); // This is the line you should stop at for catch + } + catch (int value) + { + return value; + } +} + +int +intervening_function (int value) +{ + return throws_exception_on_even (2 * value); +} + +int +throws_exception_on_even (int value) +{ + printf ("Mod two works: %d.\n", value%2); + if (value % 2 == 0) + throw 30; + else + return value; +} + +int +main () +{ + catches_exception (10); // Stop here + return 5; +} |
