[libc++] Prevent ADL on _Block_copy/_Block_release #179614
Open
Conversation
This file contains hidden or 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
Suppress ADL on Blocks runtime calls in std::function by wrapping function names in parentheses.
llvmbot
added
the
libc++
Member
|
@llvm/pr-subscribers-libcxx Author: Fady Farag (iidmsa) ChangesSuppress ADL on Blocks runtime calls in std::function by wrapping function names in parentheses. Full diff: https://github.com/llvm/llvm-project/pull/179614.diff 1 Files Affected:
diff --git a/libcxx/include/__functional/function.h b/libcxx/include/__functional/function.h
index 121417f90ff01..7576350fdea9e 100644
--- a/libcxx/include/__functional/function.h
+++ b/libcxx/include/__functional/function.h
@@ -540,7 +540,7 @@ class __func<_Rp1 (^)(_ArgTypes1...), _Rp(_ArgTypes...)> : public __base<_Rp(_Ar
# if __has_feature(objc_arc)
: __f_(__f)
# else
- : __f_(reinterpret_cast<__block_type>(__f ? _Block_copy(__f) : nullptr))
+ : __f_(reinterpret_cast<__block_type>(__f ? (_Block_copy)(__f) : nullptr))
# endif
{
}
@@ -563,7 +563,7 @@ class __func<_Rp1 (^)(_ArgTypes1...), _Rp(_ArgTypes...)> : public __base<_Rp(_Ar
_LIBCPP_HIDE_FROM_ABI_VIRTUAL virtual void destroy() _NOEXCEPT {
# if !__has_feature(objc_arc)
if (__f_)
- _Block_release(__f_);
+ (_Block_release)(__f_);
# endif
__f_ = 0;
}
|
| : __f_(__f) | ||
| # else | ||
| : __f_(reinterpret_cast<__block_type>(__f ? _Block_copy(__f) : nullptr)) | ||
| : __f_(reinterpret_cast<__block_type>(__f ? (_Block_copy)(__f) : nullptr)) |
Contributor
There was a problem hiding this comment.
Looks a bit weird to me. Can we use ::_Block_copy instead? Ditto below.
Also, I think we should add test for this which uses "ADL-bomb" types, e.g.
struct incomplete;
template <class T>
struct holder { T t; };
using adl_unfriendly_block = holder<incomplete>* (^)();
Contributor
Author
There was a problem hiding this comment.
I tried that first, but it didn't build. _Block_copy and _Block_release are declared with extern "C" inside namespace std.
Contributor
There was a problem hiding this comment.
Then we should be able to do std::_Block_copy.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Suppress ADL on Blocks runtime calls in std::function by wrapping function names in parentheses.