-
Notifications
You must be signed in to change notification settings - Fork 26
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Integrate LLVM at llvm/llvm-project@9d2351ab9aff
Updates LLVM usage to match [9d2351ab9aff](llvm/llvm-project@9d2351ab9aff) PiperOrigin-RevId: 703556800
- Loading branch information
1 parent
0da2a85
commit 3637b1c
Showing
2 changed files
with
133 additions
and
58 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,57 +1,132 @@ | ||
| Auto generated patch. Do not edit or delete it, even if empty. | ||
| diff -ruN --strip-trailing-cr a/llvm/lib/ExecutionEngine/Orc/ExecutionUtils.cpp b/llvm/lib/ExecutionEngine/Orc/ExecutionUtils.cpp | ||
| --- a/llvm/lib/ExecutionEngine/Orc/ExecutionUtils.cpp | ||
| +++ b/llvm/lib/ExecutionEngine/Orc/ExecutionUtils.cpp | ||
| @@ -573,7 +573,6 @@ | ||
| // Create __imp_ symbol | ||
| jitlink::Symbol &Ptr = | ||
| jitlink::x86_64::createAnonymousPointer(*G, Sec, &Target); | ||
| - auto name = getImpPrefix() + *KV.first; | ||
| Ptr.setName(G->intern((Twine(getImpPrefix()) + *KV.first).str())); | ||
| Ptr.setLinkage(jitlink::Linkage::Strong); | ||
| Ptr.setScope(jitlink::Scope::Default); | ||
| diff -ruN --strip-trailing-cr a/utils/bazel/llvm-project-overlay/bolt/BUILD.bazel b/utils/bazel/llvm-project-overlay/bolt/BUILD.bazel | ||
| --- a/utils/bazel/llvm-project-overlay/bolt/BUILD.bazel | ||
| +++ b/utils/bazel/llvm-project-overlay/bolt/BUILD.bazel | ||
| @@ -285,6 +285,7 @@ | ||
| "//llvm:MCParser", | ||
| "//llvm:Object", | ||
| "//llvm:ObjectYAML", | ||
| + "//llvm:OrcShared", | ||
| "//llvm:Support", | ||
| "//llvm:TargetParser", | ||
| "//llvm:config", | ||
| diff -ruN --strip-trailing-cr a/utils/bazel/llvm-project-overlay/libc/BUILD.bazel b/utils/bazel/llvm-project-overlay/libc/BUILD.bazel | ||
| --- a/utils/bazel/llvm-project-overlay/libc/BUILD.bazel | ||
| +++ b/utils/bazel/llvm-project-overlay/libc/BUILD.bazel | ||
| @@ -1442,7 +1442,10 @@ | ||
| hdrs = glob(["src/__support/time/*.h"]), | ||
| deps = [ | ||
| ":__support_common", | ||
| + ":__support_error_or", | ||
| ":hdr_time_macros", | ||
| + ":types_clockid_t", | ||
| + ":types_struct_timespec", | ||
| ":types_time_t", | ||
| ], | ||
| ) | ||
| @@ -1486,6 +1489,8 @@ | ||
| ":__support_common", | ||
| ":__support_error_or", | ||
| ":__support_osutil_vdso", | ||
| + ":types_clockid_t", | ||
| + ":types_struct_timespec", | ||
| ], | ||
| ) | ||
|
|
||
| diff -ruN --strip-trailing-cr a/utils/bazel/llvm-project-overlay/llvm/BUILD.bazel b/utils/bazel/llvm-project-overlay/llvm/BUILD.bazel | ||
| --- a/utils/bazel/llvm-project-overlay/llvm/BUILD.bazel | ||
| +++ b/utils/bazel/llvm-project-overlay/llvm/BUILD.bazel | ||
| @@ -2800,6 +2800,7 @@ | ||
| ":MC", | ||
| ":MCDisassembler", | ||
| ":Object", | ||
| + ":OrcShared", | ||
| ":OrcTargetProcess", | ||
| ":Passes", | ||
| ":Support", | ||
| diff -ruN --strip-trailing-cr a/libcxx/include/__memory/allocator_traits.h b/libcxx/include/__memory/allocator_traits.h | ||
| --- a/libcxx/include/__memory/allocator_traits.h | ||
| +++ b/libcxx/include/__memory/allocator_traits.h | ||
| @@ -44,10 +44,10 @@ | ||
|
|
||
| // __pointer | ||
| template <class _Tp> | ||
| -using __pointer_member = typename _Tp::pointer; | ||
| +using __pointer_member _LIBCPP_NODEBUG = typename _Tp::pointer; | ||
|
|
||
| template <class _Tp, class _Alloc> | ||
| -using __pointer = __detected_or_t<_Tp*, __pointer_member, __libcpp_remove_reference_t<_Alloc> >; | ||
| +using __pointer _LIBCPP_NODEBUG = __detected_or_t<_Tp*, __pointer_member, __libcpp_remove_reference_t<_Alloc> >; | ||
|
|
||
| // __const_pointer | ||
| _LIBCPP_ALLOCATOR_TRAITS_HAS_XXX(__has_const_pointer, const_pointer); | ||
| @@ -58,7 +58,7 @@ | ||
| template <class _Tp, class _Ptr, class _Alloc> | ||
| struct __const_pointer<_Tp, _Ptr, _Alloc, false> { | ||
| #ifdef _LIBCPP_CXX03_LANG | ||
| - using type = typename pointer_traits<_Ptr>::template rebind<const _Tp>::other; | ||
| + using type _LIBCPP_NODEBUG = typename pointer_traits<_Ptr>::template rebind<const _Tp>::other; | ||
| #else | ||
| using type _LIBCPP_NODEBUG = typename pointer_traits<_Ptr>::template rebind<const _Tp>; | ||
| #endif | ||
| @@ -96,10 +96,10 @@ | ||
|
|
||
| // __size_type | ||
| template <class _Tp> | ||
| -using __size_type_member = typename _Tp::size_type; | ||
| +using __size_type_member _LIBCPP_NODEBUG = typename _Tp::size_type; | ||
|
|
||
| template <class _Alloc, class _DiffType> | ||
| -using __size_type = __detected_or_t<__make_unsigned_t<_DiffType>, __size_type_member, _Alloc>; | ||
| +using __size_type _LIBCPP_NODEBUG = __detected_or_t<__make_unsigned_t<_DiffType>, __size_type_member, _Alloc>; | ||
|
|
||
| // __alloc_traits_difference_type | ||
| _LIBCPP_ALLOCATOR_TRAITS_HAS_XXX(__has_alloc_traits_difference_type, difference_type); | ||
| @@ -114,33 +114,37 @@ | ||
|
|
||
| // __propagate_on_container_copy_assignment | ||
| template <class _Tp> | ||
| -using __propagate_on_container_copy_assignment_member = typename _Tp::propagate_on_container_copy_assignment; | ||
| +using __propagate_on_container_copy_assignment_member _LIBCPP_NODEBUG = | ||
| + typename _Tp::propagate_on_container_copy_assignment; | ||
|
|
||
| template <class _Alloc> | ||
| -using __propagate_on_container_copy_assignment = | ||
| +using __propagate_on_container_copy_assignment _LIBCPP_NODEBUG = | ||
| __detected_or_t<false_type, __propagate_on_container_copy_assignment_member, _Alloc>; | ||
|
|
||
| // __propagate_on_container_move_assignment | ||
| template <class _Tp> | ||
| -using __propagate_on_container_move_assignment_member = typename _Tp::propagate_on_container_move_assignment; | ||
| +using __propagate_on_container_move_assignment_member _LIBCPP_NODEBUG = | ||
| + typename _Tp::propagate_on_container_move_assignment; | ||
|
|
||
| template <class _Alloc> | ||
| -using __propagate_on_container_move_assignment = | ||
| +using __propagate_on_container_move_assignment _LIBCPP_NODEBUG = | ||
| __detected_or_t<false_type, __propagate_on_container_move_assignment_member, _Alloc>; | ||
|
|
||
| // __propagate_on_container_swap | ||
| template <class _Tp> | ||
| -using __propagate_on_container_swap_member = typename _Tp::propagate_on_container_swap; | ||
| +using __propagate_on_container_swap_member _LIBCPP_NODEBUG = typename _Tp::propagate_on_container_swap; | ||
|
|
||
| template <class _Alloc> | ||
| -using __propagate_on_container_swap = __detected_or_t<false_type, __propagate_on_container_swap_member, _Alloc>; | ||
| +using __propagate_on_container_swap _LIBCPP_NODEBUG = | ||
| + __detected_or_t<false_type, __propagate_on_container_swap_member, _Alloc>; | ||
|
|
||
| // __is_always_equal | ||
| template <class _Tp> | ||
| -using __is_always_equal_member = typename _Tp::is_always_equal; | ||
| +using __is_always_equal_member _LIBCPP_NODEBUG = typename _Tp::is_always_equal; | ||
|
|
||
| template <class _Alloc> | ||
| -using __is_always_equal = __detected_or_t<typename is_empty<_Alloc>::type, __is_always_equal_member, _Alloc>; | ||
| +using __is_always_equal _LIBCPP_NODEBUG = | ||
| + __detected_or_t<typename is_empty<_Alloc>::type, __is_always_equal_member, _Alloc>; | ||
|
|
||
| // __allocator_traits_rebind | ||
| _LIBCPP_SUPPRESS_DEPRECATED_PUSH | ||
| @@ -165,7 +169,7 @@ | ||
| _LIBCPP_SUPPRESS_DEPRECATED_POP | ||
|
|
||
| template <class _Alloc, class _Tp> | ||
| -using __allocator_traits_rebind_t = typename __allocator_traits_rebind<_Alloc, _Tp>::type; | ||
| +using __allocator_traits_rebind_t _LIBCPP_NODEBUG = typename __allocator_traits_rebind<_Alloc, _Tp>::type; | ||
|
|
||
| _LIBCPP_SUPPRESS_DEPRECATED_PUSH | ||
|
|
||
| @@ -355,12 +359,12 @@ | ||
| using __rebind_alloc _LIBCPP_NODEBUG = typename _Traits::template rebind_alloc<_Tp>; | ||
| #else | ||
| template <class _Traits, class _Tp> | ||
| -using __rebind_alloc = typename _Traits::template rebind_alloc<_Tp>::other; | ||
| +using __rebind_alloc _LIBCPP_NODEBUG = typename _Traits::template rebind_alloc<_Tp>::other; | ||
| #endif | ||
|
|
||
| template <class _Alloc> | ||
| struct __check_valid_allocator : true_type { | ||
| - using _Traits = std::allocator_traits<_Alloc>; | ||
| + using _Traits _LIBCPP_NODEBUG = std::allocator_traits<_Alloc>; | ||
| static_assert(is_same<_Alloc, __rebind_alloc<_Traits, typename _Traits::value_type> >::value, | ||
| "[allocator.requirements] states that rebinding an allocator to the same type should result in the " | ||
| "original allocator"); | ||
| diff -ruN --strip-trailing-cr a/libcxx/include/__type_traits/detected_or.h b/libcxx/include/__type_traits/detected_or.h | ||
| --- a/libcxx/include/__type_traits/detected_or.h | ||
| +++ b/libcxx/include/__type_traits/detected_or.h | ||
| @@ -20,16 +20,16 @@ | ||
|
|
||
| template <class _Default, class _Void, template <class...> class _Op, class... _Args> | ||
| struct __detector { | ||
| - using type = _Default; | ||
| + using type _LIBCPP_NODEBUG = _Default; | ||
| }; | ||
|
|
||
| template <class _Default, template <class...> class _Op, class... _Args> | ||
| struct __detector<_Default, __void_t<_Op<_Args...> >, _Op, _Args...> { | ||
| - using type = _Op<_Args...>; | ||
| + using type _LIBCPP_NODEBUG = _Op<_Args...>; | ||
| }; | ||
|
|
||
| template <class _Default, template <class...> class _Op, class... _Args> | ||
| -using __detected_or_t = typename __detector<_Default, void, _Op, _Args...>::type; | ||
| +using __detected_or_t _LIBCPP_NODEBUG = typename __detector<_Default, void, _Op, _Args...>::type; | ||
|
|
||
| _LIBCPP_END_NAMESPACE_STD | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters