This is an archive of the discontinued LLVM Phabricator instance.

[libc++] Fix _LIBCPP_EXPORTED_FROM_ABI when visibility annotations are disabled
ClosedPublic

Authored by thomasanderson on Dec 13 2018, 11:55 AM.

Download Raw Diff

Details

Reviewers

EricWF
ldionne

Commits

rG1cffc3848596: [libc++] Fix _LIBCPP_EXPORTED_FROM_ABI when visibility annotations are disabled
rL349080: [libc++] Fix _LIBCPP_EXPORTED_FROM_ABI when visibility annotations are disabled
rCXX349080: [libc++] Fix _LIBCPP_EXPORTED_FROM_ABI when visibility annotations are disabled

Summary

Fixes a bug where functions would get exported when building with
-fvisibility=hidden and defining _LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS. No
visibility annotations should be added in this case.

The new logic for _LIBCPP_EXPORTED_FROM_ABI matches that of the other visibility
annotations around it.

Diff Detail

Repository: rCXX libc++

Event Timeline

thomasanderson created this revision.Dec 13 2018, 11:55 AM

Adding @ldionne for visibility.

Otherwise, this LGTM. Feel free to commit it.

This revision is now accepted and ready to land.Dec 13 2018, 12:06 PM

thomasanderson edited the summary of this revision. (Show Details)Dec 13 2018, 12:08 PM

Closed by commit rCXX349080: [libc++] Fix _LIBCPP_EXPORTED_FROM_ABI when visibility annotations are disabled (authored by thomasanderson). · Explain WhyDec 13 2018, 12:09 PM

This revision was automatically updated to reflect the committed changes.

Herald added a subscriber: libcxx-commits. · View Herald TranscriptDec 13 2018, 12:09 PM

I'm late in the game, but the fix is obviously correct. Thanks.

Revision Contents

Path

Size

include/

__config

6 lines

Diff 178114

include/__config

	Show First 20 Lines • Show All 709 Lines • ▼ Show 20 Lines
	# define _LIBCPP_TEMPLATE_VIS __attribute__ ((__visibility__("default")))			# define _LIBCPP_TEMPLATE_VIS __attribute__ ((__visibility__("default")))
	# endif			# endif
	# else			# else
	# define _LIBCPP_TEMPLATE_VIS			# define _LIBCPP_TEMPLATE_VIS
	# endif			# endif
	#endif			#endif

	#ifndef _LIBCPP_EXPORTED_FROM_ABI			#ifndef _LIBCPP_EXPORTED_FROM_ABI
				# if !defined(_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS)
	# define _LIBCPP_EXPORTED_FROM_ABI __attribute__((__visibility__("default")))			# define _LIBCPP_EXPORTED_FROM_ABI __attribute__((__visibility__("default")))
				# else
				# define _LIBCPP_EXPORTED_FROM_ABI
				# endif
	#endif			#endif

	#ifndef _LIBCPP_OVERRIDABLE_FUNC_VIS			#ifndef _LIBCPP_OVERRIDABLE_FUNC_VIS
	#define _LIBCPP_OVERRIDABLE_FUNC_VIS _LIBCPP_FUNC_VIS			#define _LIBCPP_OVERRIDABLE_FUNC_VIS _LIBCPP_FUNC_VIS
	#endif			#endif

	#ifndef _LIBCPP_EXCEPTION_ABI			#ifndef _LIBCPP_EXCEPTION_ABI
	# if !defined(_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS)			# if !defined(_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS)
	▲ Show 20 Lines • Show All 699 Lines • Show Last 20 Lines