[Lldb-commits] [lldb] r221298 - Fix a problem where ValueObjectVariable was not correctly setting its 'has value changed' flag for scalar valued variables. This fixes rdar://17851144

[Enrico Granata]

Author: enrico
Date: Tue Nov  4 15:28:50 2014
New Revision: 221298

URL: http://llvm.org/viewvc/llvm-project?rev=221298&view=rev
Log:
Fix a problem where ValueObjectVariable was not correctly setting its 'has value changed' flag for scalar valued variables. This fixes rdar://17851144

Added:
    lldb/trunk/test/python_api/value_var_update/
    lldb/trunk/test/python_api/value_var_update/Makefile
    lldb/trunk/test/python_api/value_var_update/TestValueVarUpdate.py
    lldb/trunk/test/python_api/value_var_update/main.c
Modified:
    lldb/trunk/source/Core/ValueObjectVariable.cpp

Modified: lldb/trunk/source/Core/ValueObjectVariable.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/ValueObjectVariable.cpp?rev=221298&r1=221297&r2=221298&view=diff
==============================================================================
--- lldb/trunk/source/Core/ValueObjectVariable.cpp (original)
+++ lldb/trunk/source/Core/ValueObjectVariable.cpp Tue Nov  4 15:28:50 2014
@@ -248,6 +248,8 @@ ValueObjectVariable::UpdateValue ()
                     Value value(m_value);
                     value.SetContext(Value::eContextTypeVariable, variable);
                     m_error = value.GetValueAsData(&exe_ctx, m_data, 0, GetModule().get());
+                    
+                    SetValueDidChange (value_type != old_value.GetValueType() || m_value.GetScalar() != old_value.GetScalar());
                 }
                 break;
             }

Added: lldb/trunk/test/python_api/value_var_update/Makefile
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/python_api/value_var_update/Makefile?rev=221298&view=auto
==============================================================================
--- lldb/trunk/test/python_api/value_var_update/Makefile (added)
+++ lldb/trunk/test/python_api/value_var_update/Makefile Tue Nov  4 15:28:50 2014
@@ -0,0 +1,7 @@
+LEVEL = ../../make
+
+C_SOURCES := main.c
+# See TestHelloWorld.py, which specifies the executable name with a dictionary.
+EXE := hello_world
+
+include $(LEVEL)/Makefile.rules

Added: lldb/trunk/test/python_api/value_var_update/TestValueVarUpdate.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/python_api/value_var_update/TestValueVarUpdate.py?rev=221298&view=auto
==============================================================================
--- lldb/trunk/test/python_api/value_var_update/TestValueVarUpdate.py (added)
+++ lldb/trunk/test/python_api/value_var_update/TestValueVarUpdate.py Tue Nov  4 15:28:50 2014
@@ -0,0 +1,68 @@
+"""Test SBValue::GetValueDidChange"""
+
+import os, sys, time
+import unittest2
+import lldb
+import time
+from lldbtest import *
+
+class HelloWorldTestCase(TestBase):
+
+    mydir = TestBase.compute_mydir(__file__)
+
+    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @python_api_test
+    @dsym_test
+    def test_with_dsym_and_process_launch_api(self):
+        """Test SBValue::GetValueDidChange"""
+        self.buildDsym(dictionary=self.d)
+        self.setTearDownCleanup(dictionary=self.d)
+        self.do_test()
+
+    @python_api_test
+    @dwarf_test
+    def test_with_dwarf_and_process_launch_api(self):
+        """Test SBValue::GetValueDidChange"""
+        self.buildDwarf(dictionary=self.d)
+        self.setTearDownCleanup(dictionary=self.d)
+        self.do_test()
+
+    def setUp(self):
+        # Call super's setUp().
+        TestBase.setUp(self)
+        # Get the full path to our executable to be attached/debugged.
+        self.exe = os.path.join(os.getcwd(), self.testMethodName)
+        self.d = {'EXE': self.testMethodName}
+
+    def do_test(self):
+        """Create target, breakpoint, launch a process, and then kill it."""
+
+        target = self.dbg.CreateTarget(self.exe)
+
+        breakpoint = target.BreakpointCreateBySourceRegex("break here", lldb.SBFileSpec("main.c"))
+
+        self.runCmd("run", RUN_SUCCEEDED)
+        
+        # The stop reason of the thread should be breakpoint.
+        self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
+            substrs = ['stopped',
+                       'stop reason = breakpoint'])
+
+        i = self.frame().FindVariable("i")
+        i_val = i.GetValueAsUnsigned(0)
+        
+        if self.TraceOn(): self.runCmd("frame variable")
+        
+        self.runCmd("continue")
+
+        if self.TraceOn(): self.runCmd("frame variable")
+        
+        self.assertTrue(i_val != i.GetValueAsUnsigned(0), "GetValue() is saying a lie")
+        self.assertTrue(i.GetValueDidChange(), "GetValueDidChange() is saying a lie")
+
+
+if __name__ == '__main__':
+    import atexit
+    lldb.SBDebugger.Initialize()
+    atexit.register(lambda: lldb.SBDebugger.Terminate())
+    unittest2.main()

Added: lldb/trunk/test/python_api/value_var_update/main.c
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/python_api/value_var_update/main.c?rev=221298&view=auto
==============================================================================
--- lldb/trunk/test/python_api/value_var_update/main.c (added)
+++ lldb/trunk/test/python_api/value_var_update/main.c Tue Nov  4 15:28:50 2014
@@ -0,0 +1,9 @@
+int main() {
+    int i = 0;
+    for (int j = 3; j < 20; j++)
+    {
+        i += j;
+        i = i - 1; // break here
+    }
+    return i;
+}