maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

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
This commit is contained in:
Jim Ingham 2018-07-06 00:16:21 +00:00
parent e6de96410b
commit a5bdba4fa5
8 changed files with 18 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/main.cpp
View File

@ -1,8 +1,4 @@
#include <string> #include <string>
#ifdef _LIBCPP_INLINE_VISIBILITY
#undef _LIBCPP_INLINE_VISIBILITY
#endif
#define _LIBCPP_INLINE_VISIBILITY
#include <map> #include <map>
#include <vector> #include <vector>

4
lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/TestDataFormatterLibcxxList.py
View File

@ -88,7 +88,8 @@ class LibcxxListDataFormatterTestCase(TestBase):
substrs=['list has 0 items', 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", self.expect("frame variable numbers_list",
substrs=['list has 1 items', substrs=['list has 1 items',
@ -187,6 +188,7 @@ class LibcxxListDataFormatterTestCase(TestBase):
'\"is\"', '\"is\"',
'\"smart\"']) '\"smart\"'])
self.runCmd("n") # This gets us past the printf
self.runCmd("n") self.runCmd("n")
# check access-by-index # check access-by-index

9
lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/loop/main.cpp
View File

@ -3,12 +3,8 @@
#define private public #define private public
#define protected public #define protected public
#ifdef _LIBCPP_INLINE_VISIBILITY
#undef _LIBCPP_INLINE_VISIBILITY
#endif
#define _LIBCPP_INLINE_VISIBILITY
#include <list> #include <list>
#include <stdio.h>
#include <assert.h> #include <assert.h>
typedef std::list<int> int_list; typedef std::list<int> int_list;
@ -18,7 +14,8 @@ int main()
#ifdef LLDB_USING_LIBCPP #ifdef LLDB_USING_LIBCPP
int_list *numbers_list = new int_list{1,2,3,4,5,6,7,8,9,10}; 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); assert(third_elem->__value_ == 3);
auto *fifth_elem = third_elem->__next_->__next_; auto *fifth_elem = third_elem->__next_->__next_;
assert(fifth_elem->__value_ == 5); assert(fifth_elem->__value_ == 5);

18
lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/main.cpp
View File

@ -1,10 +1,6 @@
#include <string> #include <string>
#ifdef _LIBCPP_INLINE_VISIBILITY
#undef _LIBCPP_INLINE_VISIBILITY
#endif
#define _LIBCPP_INLINE_VISIBILITY
#include <list> #include <list>
#include <stdio.h>
typedef std::list<int> int_list; typedef std::list<int> int_list;
typedef std::list<std::string> string_list; typedef std::list<std::string> string_list;
@ -13,7 +9,8 @@ int main()
{ {
int_list numbers_list; 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(0x11223344));
(numbers_list.push_back(0xBEEFFEED)); (numbers_list.push_back(0xBEEFFEED));
(numbers_list.push_back(0x00ABBA00)); (numbers_list.push_back(0x00ABBA00));
@ -32,12 +29,15 @@ int main()
(text_list.push_back(std::string("is"))); (text_list.push_back(std::string("is")));
(text_list.push_back(std::string("smart"))); (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}; std::list<int> countingList = {3141, 3142, 3142,3142,3142, 3142, 3142, 3141};
countingList.sort(); countingList.sort();
countingList.unique(); // Set third break point at this line. printf("// Set third break point at this line.");
countingList.size(); // Set fourth break point at this line. countingList.unique();
printf("// Set fourth break point at this line.");
countingList.size();
return 0; return 0;
} }

4
lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/main.cpp
View File

@ -1,8 +1,4 @@
#include <string> #include <string>
#ifdef _LIBCPP_INLINE_VISIBILITY
#undef _LIBCPP_INLINE_VISIBILITY
#endif
#define _LIBCPP_INLINE_VISIBILITY
#include <set> #include <set>
typedef std::multiset<int> intset; typedef std::multiset<int> intset;

4
lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/main.cpp
View File

@ -1,8 +1,4 @@
#include <string> #include <string>
#ifdef _LIBCPP_INLINE_VISIBILITY
#undef _LIBCPP_INLINE_VISIBILITY
#endif
#define _LIBCPP_INLINE_VISIBILITY
#include <set> #include <set>
typedef std::set<int> intset; typedef std::set<int> intset;

4
lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/main.cpp
View File

@ -1,8 +1,4 @@
#include <string> #include <string>
#ifdef _LIBCPP_INLINE_VISIBILITY
#undef _LIBCPP_INLINE_VISIBILITY
#endif
#define _LIBCPP_INLINE_VISIBILITY
#include <unordered_map> #include <unordered_map>
#include <unordered_set> #include <unordered_set>

5
lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/main.cpp
View File

@ -1,9 +1,4 @@
#include <string> #include <string>
#ifdef _LIBCPP_INLINE_VISIBILITY
#undef _LIBCPP_INLINE_VISIBILITY
#endif
#define _LIBCPP_INLINE_VISIBILITY
#include <vector> #include <vector>
int main() int main()