vendor/lldb/lldb-trunk-r321426vendor/lldb/lldb-trunk-r321414

1 files changed, 39 insertions, 6 deletions

diff --git a/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/TestConflictingSymbol.py b/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/TestConflictingSymbol.py
index d3327700bfd2..328c383b38fb 100644
--- a/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/TestConflictingSymbol.py
+++ b/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/TestConflictingSymbol.py
@@ -16,6 +16,13 @@ class TestConflictingSymbols(TestBase):
     mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
+    def setUp(self):
+        TestBase.setUp(self)
+
+        self.One_line = line_number('One/One.c', '// break here')
+        self.Two_line = line_number('Two/Two.c', '// break here')
+        self.main_line = line_number('main.c', '// break here')
+
     def test_conflicting_symbols(self):
         self.build()
         exe = os.path.join(os.getcwd(), "a.out")
@@ -27,15 +34,12 @@ class TestConflictingSymbols(TestBase):
         environment = self.registerSharedLibrariesWithTarget(
             target, ['One', 'Two'])
 
-        One_line = line_number('One/One.c', '// break here')
-        Two_line = line_number('Two/Two.c', '// break here')
-        main_line = line_number('main.c', '// break here')
         lldbutil.run_break_set_command(
-            self, 'breakpoint set -f One.c -l %s' % (One_line))
+            self, 'breakpoint set -f One.c -l %s' % (self.One_line))
         lldbutil.run_break_set_command(
-            self, 'breakpoint set -f Two.c -l %s' % (Two_line))
+            self, 'breakpoint set -f Two.c -l %s' % (self.Two_line))
         lldbutil.run_break_set_by_file_and_line(
-            self, 'main.c', main_line, num_expected_locations=1, loc_exact=True)
+            self, 'main.c', self.main_line, num_expected_locations=1, loc_exact=True)
 
         process = target.LaunchSimple(
             None, environment, self.get_process_working_directory())
@@ -88,3 +92,32 @@ class TestConflictingSymbols(TestBase):
             error=True,
             substrs=[
                 "Multiple internal symbols"])
+
+    @expectedFailureAll(bugnumber="llvm.org/pr35043")
+    def test_shadowed(self):
+        self.build()
+        exe = os.path.join(os.getcwd(), "a.out")
+        target = self.dbg.CreateTarget("a.out")
+        self.assertTrue(target, VALID_TARGET)
+
+        # Register our shared libraries for remote targets so they get
+        # automatically uploaded
+        environment = self.registerSharedLibrariesWithTarget(
+            target, ['One', 'Two'])
+
+        lldbutil.run_break_set_by_file_and_line(self, 'main.c', self.main_line)
+
+        process = target.LaunchSimple(
+            None, environment, self.get_process_working_directory())
+        self.assertTrue(process, PROCESS_IS_VALID)
+
+        # The stop reason of the thread should be breakpoint.
+        self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
+                    substrs=['stopped',
+                             'stop reason = breakpoint'])
+
+        # As we are shadowing the conflicting symbol, there should be no
+        # ambiguity in this expression.
+        self.expect(
+            "expr int conflicting_symbol = 474747; conflicting_symbol",
+            substrs=[ "474747"])