[Lldb-commits] [lldb] r273695 - Fix an issue where LLDB would show the key and value of a single entry NSDictionary in the wrong order

[Enrico Granata via lldb-commits]

Author: enrico
Date: Fri Jun 24 12:48:01 2016
New Revision: 273695

URL: http://llvm.org/viewvc/llvm-project?rev=273695&view=rev
Log:
Fix an issue where LLDB would show the key and value of a single entry NSDictionary in the wrong order

Fixes rdar://26478641


Added:
    lldb/trunk/packages/Python/lldbsuite/test/lang/objc/single-entry-dictionary/
    lldb/trunk/packages/Python/lldbsuite/test/lang/objc/single-entry-dictionary/Makefile
    lldb/trunk/packages/Python/lldbsuite/test/lang/objc/single-entry-dictionary/TestObjCSingleEntryDictionary.py
    lldb/trunk/packages/Python/lldbsuite/test/lang/objc/single-entry-dictionary/main.m
Modified:
    lldb/trunk/source/Plugins/Language/ObjC/NSDictionary.cpp

Added: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/single-entry-dictionary/Makefile
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/objc/single-entry-dictionary/Makefile?rev=273695&view=auto
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/single-entry-dictionary/Makefile (added)
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/single-entry-dictionary/Makefile Fri Jun 24 12:48:01 2016
@@ -0,0 +1,7 @@
+LEVEL = ../../../make
+
+OBJC_SOURCES := main.m
+
+include $(LEVEL)/Makefile.rules
+
+LDFLAGS += -framework Foundation

Added: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/single-entry-dictionary/TestObjCSingleEntryDictionary.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/objc/single-entry-dictionary/TestObjCSingleEntryDictionary.py?rev=273695&view=auto
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/single-entry-dictionary/TestObjCSingleEntryDictionary.py (added)
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/single-entry-dictionary/TestObjCSingleEntryDictionary.py Fri Jun 24 12:48:01 2016
@@ -0,0 +1,68 @@
+"""Test that we properly vend children for a single entry NSDictionary"""
+
+from __future__ import print_function
+
+
+
+import unittest2
+import os, time
+import platform
+
+from distutils.version import StrictVersion
+
+import lldb
+from lldbsuite.test.decorators import *
+from lldbsuite.test.lldbtest import *
+from lldbsuite.test import lldbutil
+
+class ObjCSingleEntryDictionaryTestCase(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.line = line_number('main.m', '// break here')
+
+    @skipUnlessDarwin
+    def test_single_entry_dict(self):
+        self.build()
+        exe = os.path.join(os.getcwd(), "a.out")
+        self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET)
+
+        # Break inside the foo function which takes a bar_ptr argument.
+        lldbutil.run_break_set_by_file_and_line (self, "main.m", self.line, num_expected_locations=1, loc_exact=True)
+
+        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'])
+
+        # The breakpoint should have a hit count of 1.
+        self.expect("breakpoint list -f", BREAKPOINT_HIT_ONCE,
+            substrs = [' resolved, hit count = 1'])
+
+        d1 = self.frame().FindVariable("d1")
+        d1.SetPreferSyntheticValue(True)
+        d1.SetPreferDynamicValue(lldb.eDynamicCanRunTarget)
+        
+        self.assertTrue(d1.GetNumChildren() == 1, "dictionary has != 1 child elements")
+        pair = d1.GetChildAtIndex(0)
+        pair.SetPreferSyntheticValue(True)
+        pair.SetPreferDynamicValue(lldb.eDynamicCanRunTarget)
+        
+        self.assertTrue(pair.GetNumChildren() == 2, "pair has != 2 child elements")
+        
+        key = pair.GetChildMemberWithName("key")
+        value = pair.GetChildMemberWithName("value")
+        
+        key.SetPreferSyntheticValue(True)
+        key.SetPreferDynamicValue(lldb.eDynamicCanRunTarget)
+        value.SetPreferSyntheticValue(True)
+        value.SetPreferDynamicValue(lldb.eDynamicCanRunTarget)
+        
+        self.assertTrue(key.GetSummary() == '@"key"', "key doesn't contain key")
+        self.assertTrue(value.GetSummary() == '@"value"', "value doesn't contain value")

Added: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/single-entry-dictionary/main.m
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/objc/single-entry-dictionary/main.m?rev=273695&view=auto
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/single-entry-dictionary/main.m (added)
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/single-entry-dictionary/main.m Fri Jun 24 12:48:01 2016
@@ -0,0 +1,7 @@
+#import <Foundation/Foundation.h>
+
+int main() {
+  NSDictionary *d1 = @{@"key" : @"value"};
+  NSLog(@"%@\n", d1); // break here
+  return 0;
+}

Modified: lldb/trunk/source/Plugins/Language/ObjC/NSDictionary.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Language/ObjC/NSDictionary.cpp?rev=273695&r1=273694&r2=273695&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Language/ObjC/NSDictionary.cpp (original)
+++ lldb/trunk/source/Plugins/Language/ObjC/NSDictionary.cpp Fri Jun 24 12:48:01 2016
@@ -593,10 +593,10 @@ lldb_private::formatters::NSDictionary1S
     
     Error error;
     
-    lldb::addr_t key_at_idx = process_sp->ReadPointerFromMemory(key_ptr, error);
+    lldb::addr_t value_at_idx = process_sp->ReadPointerFromMemory(key_ptr, error);
     if (error.Fail())
         return nullptr;
-    lldb::addr_t value_at_idx = process_sp->ReadPointerFromMemory(value_ptr, error);
+    lldb::addr_t key_at_idx = process_sp->ReadPointerFromMemory(value_ptr, error);
     if (error.Fail())
         return nullptr;