Skip to content

Revert "[libc++] Remove workaround which allows setting _LIBCPP_OVERRIDABLE_FUNC_VIS externally (#113139)" #117779

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 26, 2024

Conversation

nico
Copy link
Contributor

@nico nico commented Nov 26, 2024

This reverts commit 2e686d6.

See #117571

@nico nico requested a review from a team as a code owner November 26, 2024 20:12
@llvmbot llvmbot added the libc++ libc++ C++ Standard Library. Not GNU libstdc++. Not libc++abi. label Nov 26, 2024
@llvmbot
Copy link
Member

llvmbot commented Nov 26, 2024

@llvm/pr-subscribers-libcxx

Author: Nico Weber (nico)

Changes

…IDABLE_FUNC_VIS externally (#113139)"

This reverts commit 2e686d6.

See #117571


Full diff: https://github.com/llvm/llvm-project/pull/117779.diff

1 Files Affected:

  • (modified) libcxx/include/__config (+5-1)
diff --git a/libcxx/include/__config b/libcxx/include/__config
index 9db00cd0c9fb93..fe01b58b8e6274 100644
--- a/libcxx/include/__config
+++ b/libcxx/include/__config
@@ -402,7 +402,11 @@ typedef __char32_t char32_t;
 #    define _LIBCPP_EXPORTED_FROM_ABI _LIBCPP_VISIBILITY("default")
 #    define _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS _LIBCPP_VISIBILITY("default")
 #    define _LIBCPP_CLASS_TEMPLATE_INSTANTIATION_VIS
-#    define _LIBCPP_OVERRIDABLE_FUNC_VIS _LIBCPP_VISIBILITY("default")
+
+// TODO: Make this a proper customization point or remove the option to override it.
+#    ifndef _LIBCPP_OVERRIDABLE_FUNC_VIS
+#      define _LIBCPP_OVERRIDABLE_FUNC_VIS _LIBCPP_VISIBILITY("default")
+#    endif
 
 #    if !defined(_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS)
 // The inline should be removed once PR32114 is resolved

@ldionne ldionne changed the title Revert "[libc++] Remove workaround which allows setting _LIBCPP_OVERR… Revert "[libc++] Remove workaround which allows setting _LIBCPP_OVERRIDABLE_FUNC_VIS externally (#113139)" Nov 26, 2024
Copy link
Member

@ldionne ldionne left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM but I'd like @philnik777 to stamp this as well. To unblock you, feel free to merge if @philnik777 hasn't seen this within the next 24h.

@nico nico merged commit a94cec5 into llvm:main Nov 26, 2024
63 checks passed
@nico nico deleted the libcxx-revert branch November 26, 2024 23:45
@nico
Copy link
Contributor Author

nico commented Nov 26, 2024

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
libc++ libc++ C++ Standard Library. Not GNU libstdc++. Not libc++abi.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants