vbalu updated this revision to Diff 98762.
vbalu added a comment.
Modified as per suggested. I used the flag option "flagsParsedVariables" to
monitor if global variable are completely parsed or not.
Looks like it never used. For a compile unit global variable will be parsed
only through the method "GetVariableList" so i set the flag there.
Repository:
rL LLVM
https://reviews.llvm.org/D32732
Files:
packages/Python/lldbsuite/test/functionalities/target_command/TestTargetCommand.py
packages/Python/lldbsuite/test/functionalities/target_command/globals.c
source/Symbol/CompileUnit.cpp
Index: source/Symbol/CompileUnit.cpp
===================================================================
--- source/Symbol/CompileUnit.cpp
+++ source/Symbol/CompileUnit.cpp
@@ -241,11 +241,16 @@
}
VariableListSP CompileUnit::GetVariableList(bool can_create) {
- if (m_variables.get() == nullptr && can_create) {
+ // Return NULL if m_variables are partially parsed
+ if (!can_create && m_flags.IsClear(flagsParsedVariables))
+ return NULL;
+ if ((m_variables.get() == nullptr || m_flags.IsClear(flagsParsedVariables)) &&
+ can_create) {
SymbolContext sc;
CalculateSymbolContext(&sc);
assert(sc.module_sp);
sc.module_sp->GetSymbolVendor()->ParseVariablesForContext(sc);
+ m_flags.Set(flagsParsedVariables);
}
return m_variables;
Index: packages/Python/lldbsuite/test/functionalities/target_command/globals.c
===================================================================
--- packages/Python/lldbsuite/test/functionalities/target_command/globals.c
+++ packages/Python/lldbsuite/test/functionalities/target_command/globals.c
@@ -12,6 +12,7 @@
const char* my_global_str = "abc";
const char **my_global_str_ptr = &my_global_str;
static int my_static_int = 228;
+int my_global_int = 10;
int main (int argc, char const *argv[])
{
Index: packages/Python/lldbsuite/test/functionalities/target_command/TestTargetCommand.py
===================================================================
--- packages/Python/lldbsuite/test/functionalities/target_command/TestTargetCommand.py
+++ packages/Python/lldbsuite/test/functionalities/target_command/TestTargetCommand.py
@@ -59,6 +59,24 @@
self.do_target_variable_command_no_fail('globals')
+ @expectedFailureAndroid(archs=['aarch64'])
+ def test_target_variable_after_print_command(self):
+ """Test 'print' command before and 'target var' after starting the inferior."""
+ d = {'C_SOURCES': 'globals.c', 'EXE': 'globals'}
+ self.build(dictionary=d)
+ self.addTearDownCleanup(dictionary=d)
+
+ self.do_target_variable_after_print_command('globals')
+
+ @expectedFailureAndroid(archs=['aarch64'])
+ def test_target_variable_with_regex(self):
+ """Test 'target var -r' command before and 'target var' after starting the inferior."""
+ d = {'C_SOURCES': 'globals.c', 'EXE': 'globals'}
+ self.build(dictionary=d)
+ self.addTearDownCleanup(dictionary=d)
+
+ self.do_target_variable_with_regex('globals')
+
def do_target_command(self):
"""Exercise 'target create', 'target list', 'target select' commands."""
exe_a = os.path.join(os.getcwd(), "a.out")
@@ -245,7 +263,8 @@
substrs=['my_global_char',
'my_global_str',
'my_global_str_ptr',
- 'my_static_int'])
+ 'my_static_int',
+ 'my_global_int'])
self.expect(
"target variable my_global_str",
@@ -273,3 +292,49 @@
substrs=[
"my_global_char",
"'X'"])
+
+ def do_target_variable_after_print_command(self, exe_name):
+ """Exercise 'print' command before and 'target var' after starting the inferior."""
+ self.runCmd("file " + exe_name, CURRENT_EXECUTABLE_SET)
+
+ self.expect(
+ "target variable my_global_char",
+ VARIABLES_DISPLAYED_CORRECTLY,
+ substrs=[
+ "my_global_char",
+ "'X'"])
+
+ self.runCmd("b main")
+ self.runCmd("run")
+
+ # To test whether all varaible are shown if we print only one variable before
+ # starting inferior
+ self.expect("target variable",
+ substrs=['my_global_char',
+ 'my_global_str',
+ 'my_global_str_ptr',
+ 'my_static_int',
+ 'my_global_int'])
+
+ def do_target_variable_with_regex(self, exe_name):
+ """Exercise 'target var -r' command before and 'target var' after starting the inferior."""
+ self.runCmd("file " + exe_name, CURRENT_EXECUTABLE_SET)
+
+ self.expect(
+ "target variable -r my_global_ch*",
+ VARIABLES_DISPLAYED_CORRECTLY,
+ substrs=[
+ "my_global_char",
+ "'X'"])
+
+ self.runCmd("b main")
+ self.runCmd("run")
+
+ # To test whether all varaible are shown if we use regex for one variable before
+ # starting inferior
+ self.expect("target variable",
+ substrs=['my_global_char',
+ 'my_global_str',
+ 'my_global_str_ptr',
+ 'my_static_int',
+ 'my_global_int'])
_______________________________________________
lldb-commits mailing list
[email protected]
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
