Fix an issue where libc++ changed the type information we get for std::map::iterator, rendering LLDB unable to display elements vended by an iterator

Fixes <rdar://problem/28237521>

llvm-svn: 282648

2 files changed, 10 insertions, 10 deletions

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/TestDataFormatterLibccIterator.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/TestDataFormatterLibccIterator.py
index cbcdc2ce739..5d23fcef04c 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/TestDataFormatterLibccIterator.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/TestDataFormatterLibccIterator.py
@@ -65,9 +65,9 @@ class LibcxxIteratorDataFormatterTestCase(TestBase):
         self.expect(
             'frame variable iimI',
             substrs=[
-                'first = 0',
-                'second = 12'])
-        self.expect('expr iimI', substrs=['first = 0', 'second = 12'])
+                'first = 43981',
+                'second = 61681'])
+        self.expect('expr iimI', substrs=['first = 43981', 'second = 61681'])
 
         self.expect(
             'frame variable simI',
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/main.cpp
index 97b37851f53..058a79317d1 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/main.cpp
@@ -20,23 +20,23 @@ typedef string_vector::iterator svter;
 
 int main()
 {
-    intint_map iim;
-	iim[0] = 12;
-	
+	intint_map iim;
+	iim[0xABCD] = 0xF0F1;
+
 	strint_map sim;
 	sim["world"] = 42;
-    
+
 	int_vector iv;
 	iv.push_back(3);
-	
+
 	string_vector sv;
 	sv.push_back("hello");
 
 	iimter iimI = iim.begin();
 	simter simI = sim.begin();
-	
+
 	ivter ivI = iv.begin();
 	svter svI = sv.begin();
 
-    return 0; // Set break point at this line.
+	return 0; // Set break point at this line.
 }
\ No newline at end of file