kubamracek updated this revision to Diff 195413.
kubamracek added a comment.
Adding a test case.
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D60737/new/
https://reviews.llvm.org/D60737
Files:
packages/Python/lldbsuite/test/lang/cpp/global_variables/Makefile
packages/Python/lldbsuite/test/lang/cpp/global_variables/TestGlobalVariables.py
packages/Python/lldbsuite/test/lang/cpp/global_variables/main.cpp
source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
Index: source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
===================================================================
--- source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
+++ source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
@@ -2036,6 +2036,7 @@
llvm::StringRef basename;
llvm::StringRef context;
+ bool name_is_mangled = (bool)Mangled(name);
if (!CPlusPlusLanguage::ExtractContextAndIdentifier(name.GetCString(),
context, basename))
@@ -2085,7 +2086,8 @@
&variables);
while (pruned_idx < variables.GetSize()) {
VariableSP var_sp = variables.GetVariableAtIndex(pruned_idx);
- if (var_sp->GetName().GetStringRef().contains(name.GetStringRef()))
+ if (name_is_mangled ||
+ var_sp->GetName().GetStringRef().contains(name.GetStringRef()))
++pruned_idx;
else
variables.RemoveVariableAtIndex(pruned_idx);
Index: packages/Python/lldbsuite/test/lang/cpp/global_variables/main.cpp
===================================================================
--- packages/Python/lldbsuite/test/lang/cpp/global_variables/main.cpp
+++ packages/Python/lldbsuite/test/lang/cpp/global_variables/main.cpp
@@ -0,0 +1,17 @@
+//===-- main.c --------------------------------------------------*- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+#include <stdio.h>
+
+namespace abc {
+ int g_file_global_int = 42;
+}
+
+int main (int argc, char const *argv[])
+{
+ return abc::g_file_global_int; // Set break point at this line. //// break $source:$line; continue; var -global g_a -global g_global_int
+}
Index: packages/Python/lldbsuite/test/lang/cpp/global_variables/TestGlobalVariables.py
===================================================================
--- packages/Python/lldbsuite/test/lang/cpp/global_variables/TestGlobalVariables.py
+++ packages/Python/lldbsuite/test/lang/cpp/global_variables/TestGlobalVariables.py
@@ -0,0 +1,58 @@
+"""Show global variables and check that they do indeed have global scopes."""
+
+from __future__ import print_function
+
+
+from lldbsuite.test.decorators import *
+from lldbsuite.test.lldbtest import *
+from lldbsuite.test import lldbutil
+
+
+class GlobalVariablesCppTestCase(TestBase):
+
+ mydir = TestBase.compute_mydir(__file__)
+
+ def setUp(self):
+ # Call super's setUp().
+ TestBase.setUp(self)
+ # Find the line number to break inside main().
+ self.source = 'main.cpp'
+ self.line = line_number(self.source, '// Set break point at this line.')
+ self.shlib_names = ["a"]
+
+ @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24764")
+ @expectedFailureAll(oslist=["linux"], archs=["aarch64"], bugnumber="llvm.org/pr37301")
+ def test_without_process(self):
+ """Test that static initialized variables can be inspected without
+ process."""
+ self.build()
+
+ # Create a target by the debugger.
+ target = self.dbg.CreateTarget(self.getBuildArtifact("a.out"))
+ self.assertTrue(target, VALID_TARGET)
+
+ # Break inside the main.
+ lldbutil.run_break_set_by_file_and_line(
+ self, self.source, self.line, num_expected_locations=1, loc_exact=True)
+
+ # Now launch the process, and do not stop at entry point.
+ process = target.LaunchSimple(None, None, self.get_process_working_directory())
+ self.assertTrue(process, PROCESS_IS_VALID)
+
+ # Check that we can access g_file_global_int by its name
+ self.expect("target variable g_file_global_int", VARIABLES_DISPLAYED_CORRECTLY,
+ substrs=['42'])
+ self.expect("target variable abc::g_file_global_int", VARIABLES_DISPLAYED_CORRECTLY,
+ substrs=['42'])
+ self.expect("target variable xyz::g_file_global_int", VARIABLES_DISPLAYED_CORRECTLY,
+ error=True, substrs=['can\'t find global variable'])
+
+ # Check that we can access g_file_global_int by its mangled name
+ addr = target.EvaluateExpression("&abc::g_file_global_int").GetValueAsUnsigned()
+ self.assertTrue(addr != 0)
+ mangled = lldb.SBAddress(addr, target).GetSymbol().GetMangledName()
+ self.assertTrue(mangled != None)
+ gv = target.FindFirstGlobalVariable(mangled)
+ self.assertTrue(gv.IsValid())
+ self.assertEqual(gv.GetName(), "abc::g_file_global_int")
+ self.assertEqual(gv.GetValueAsUnsigned(), 42)
Index: packages/Python/lldbsuite/test/lang/cpp/global_variables/Makefile
===================================================================
--- packages/Python/lldbsuite/test/lang/cpp/global_variables/Makefile
+++ packages/Python/lldbsuite/test/lang/cpp/global_variables/Makefile
@@ -0,0 +1,5 @@
+LEVEL = ../../../make
+
+CXX_SOURCES := main.cpp
+
+include $(LEVEL)/Makefile.rules
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
