Remove a bunch more references to _LIBCPP_INLINE_VISIBILITY

and adjust the tests that needed it to set their breakpoints more robustly.

<rdar://problem/41867390>

llvm-svn: 336403

8 files changed, 18 insertions, 40 deletions

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 058a79317d1..9d1cbfd9128 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
@@ -1,8 +1,4 @@
 #include <string>
-#ifdef _LIBCPP_INLINE_VISIBILITY
-#undef _LIBCPP_INLINE_VISIBILITY
-#endif
-#define _LIBCPP_INLINE_VISIBILITY
 #include <map>
 #include <vector>
 
@@ -39,4 +35,4 @@ int main()
 	svter svI = sv.begin();
 
 	return 0; // Set break point at this line.
-}
\ No newline at end of file
+}
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/TestDataFormatterLibcxxList.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/TestDataFormatterLibcxxList.py
index c3c9981a4de..5f48b3541e5 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/TestDataFormatterLibcxxList.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/TestDataFormatterLibcxxList.py
@@ -88,8 +88,9 @@ class LibcxxListDataFormatterTestCase(TestBase):
                     substrs=['list has 0 items',
                              '{}'])
 
-        self.runCmd("n")
-
+        self.runCmd("n") # This gets up past the printf
+        self.runCmd("n") # Now advance over the first push_back.
+        
         self.expect("frame variable numbers_list",
                     substrs=['list has 1 items',
                              '[0] = ',
@@ -187,6 +188,7 @@ class LibcxxListDataFormatterTestCase(TestBase):
                              '\"is\"',
                              '\"smart\"'])
 
+        self.runCmd("n") # This gets us past the printf
         self.runCmd("n")
 
         # check access-by-index
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/loop/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/loop/main.cpp
index 6a1266528d5..7c623e9a68b 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/loop/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/loop/main.cpp
@@ -3,12 +3,8 @@
 #define private public
 #define protected public
 
-#ifdef _LIBCPP_INLINE_VISIBILITY
-#undef _LIBCPP_INLINE_VISIBILITY
-#endif
-#define _LIBCPP_INLINE_VISIBILITY
 #include <list>
-
+#include <stdio.h>
 #include <assert.h>
 
 typedef std::list<int> int_list;
@@ -18,7 +14,8 @@ int main()
 #ifdef LLDB_USING_LIBCPP
     int_list *numbers_list = new int_list{1,2,3,4,5,6,7,8,9,10};
 
-    auto *third_elem = numbers_list->__end_.__next_->__next_->__next_; // Set break point at this line.
+    printf("// Set break point at this line.");
+    auto *third_elem = numbers_list->__end_.__next_->__next_->__next_;
     assert(third_elem->__value_ == 3);
     auto *fifth_elem = third_elem->__next_->__next_;
     assert(fifth_elem->__value_ == 5);
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/main.cpp
index 4f2bd74495a..56375874f37 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/main.cpp
@@ -1,10 +1,6 @@
 #include <string>
-#ifdef _LIBCPP_INLINE_VISIBILITY
-#undef _LIBCPP_INLINE_VISIBILITY
-#endif
-#define _LIBCPP_INLINE_VISIBILITY
 #include <list>
-
+#include <stdio.h>
 
 typedef std::list<int> int_list;
 typedef std::list<std::string> string_list;
@@ -13,7 +9,8 @@ int main()
 {
     int_list numbers_list;
     
-    (numbers_list.push_back(0x12345678)); // Set break point at this line.
+    printf("// Set break point at this line.");
+    (numbers_list.push_back(0x12345678));
     (numbers_list.push_back(0x11223344));
     (numbers_list.push_back(0xBEEFFEED));
     (numbers_list.push_back(0x00ABBA00));
@@ -32,12 +29,15 @@ int main()
     (text_list.push_back(std::string("is")));
     (text_list.push_back(std::string("smart")));
     
-    (text_list.push_back(std::string("!!!"))); // Set second break point at this line.
+    printf("// Set second break point at this line.");
+    (text_list.push_back(std::string("!!!"))); 
     
     std::list<int> countingList = {3141, 3142, 3142,3142,3142, 3142, 3142, 3141};
     countingList.sort();
-    countingList.unique(); // Set third break point at this line.
-    countingList.size(); // Set fourth break point at this line.
+    printf("// Set third break point at this line.");
+    countingList.unique();
+    printf("// Set fourth break point at this line.");
+    countingList.size();
 
     return 0;
 }
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/main.cpp
index 1e1dd3b1603..c315dcb9b40 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/main.cpp
@@ -1,8 +1,4 @@
 #include <string>
-#ifdef _LIBCPP_INLINE_VISIBILITY
-#undef _LIBCPP_INLINE_VISIBILITY
-#endif
-#define _LIBCPP_INLINE_VISIBILITY
 #include <set>
 
 typedef std::multiset<int> intset;
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/main.cpp
index cc3033ef26e..29efcc61e65 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/main.cpp
@@ -1,8 +1,4 @@
 #include <string>
-#ifdef _LIBCPP_INLINE_VISIBILITY
-#undef _LIBCPP_INLINE_VISIBILITY
-#endif
-#define _LIBCPP_INLINE_VISIBILITY
 #include <set>
 
 typedef std::set<int> intset;
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/main.cpp
index 4e8a1a779c0..81a5763559d 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/main.cpp
@@ -1,8 +1,4 @@
 #include <string>
-#ifdef _LIBCPP_INLINE_VISIBILITY
-#undef _LIBCPP_INLINE_VISIBILITY
-#endif
-#define _LIBCPP_INLINE_VISIBILITY
 #include <unordered_map>
 #include <unordered_set>
 
@@ -81,4 +77,4 @@ int main()
 	thefoo_rw();  // Set break point at this line.
 	
     return 0;
-}
\ No newline at end of file
+}
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/main.cpp
index 91fe509465e..026cfc863f2 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/main.cpp
@@ -1,9 +1,4 @@
 #include <string>
-#ifdef _LIBCPP_INLINE_VISIBILITY
-#undef _LIBCPP_INLINE_VISIBILITY
-#endif
-#define _LIBCPP_INLINE_VISIBILITY
-
 #include <vector>
 
 int main()