Author: Yi Kong Date: 2021-06-03T17:07:53+08:00 New Revision: dcd7664f92d30f93a4c7d48314d653e044093784
URL: https://github.com/llvm/llvm-project/commit/dcd7664f92d30f93a4c7d48314d653e044093784 DIFF: https://github.com/llvm/llvm-project/commit/dcd7664f92d30f93a4c7d48314d653e044093784.diff LOG: Add -fno-visibility-inlines-hidden option This allows overriding -fvisibility-inlines-hidden. Differential Revision: https://reviews.llvm.org/D103537 Added: clang/test/Driver/visibility-inlines-hidden.cpp Modified: clang/include/clang/Driver/Options.td clang/lib/Driver/ToolChains/Clang.cpp Removed: ################################################################################ diff --git a/clang/include/clang/Driver/Options.td b/clang/include/clang/Driver/Options.td index 076ce3f85fa8e..4945538ec0f01 100644 --- a/clang/include/clang/Driver/Options.td +++ b/clang/include/clang/Driver/Options.td @@ -2675,9 +2675,10 @@ def fvisibility_externs_nodllstorageclass_EQ : Joined<["-"], "fvisibility-extern ShouldParseIf<fvisibility_from_dllstorageclass.KeyPath>; def fvisibility_EQ : Joined<["-"], "fvisibility=">, Group<f_Group>, HelpText<"Set the default symbol visibility for all global declarations">, Values<"hidden,default">; -def fvisibility_inlines_hidden : Flag<["-"], "fvisibility-inlines-hidden">, Group<f_Group>, - HelpText<"Give inline C++ member functions hidden visibility by default">, - Flags<[CC1Option]>, MarshallingInfoFlag<LangOpts<"InlineVisibilityHidden">>; +defm visibility_inlines_hidden : BoolFOption<"visibility-inlines-hidden", + LangOpts<"InlineVisibilityHidden">, DefaultFalse, + PosFlag<SetTrue, [CC1Option], "Give inline C++ member functions hidden visibility by default">, + NegFlag<SetFalse>>; defm visibility_inlines_hidden_static_local_var : BoolFOption<"visibility-inlines-hidden-static-local-var", LangOpts<"VisibilityInlinesHiddenStaticLocalVar">, DefaultFalse, PosFlag<SetTrue, [CC1Option], "When -fvisibility-inlines-hidden is enabled, static variables in" diff --git a/clang/lib/Driver/ToolChains/Clang.cpp b/clang/lib/Driver/ToolChains/Clang.cpp index 0177f7fd80be8..dea4ade683ef8 100644 --- a/clang/lib/Driver/ToolChains/Clang.cpp +++ b/clang/lib/Driver/ToolChains/Clang.cpp @@ -5644,7 +5644,11 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA, << A->getAsString(Args) << TripleStr; } - Args.AddLastArg(CmdArgs, options::OPT_fvisibility_inlines_hidden); + + if (Args.hasFlag(options::OPT_fvisibility_inlines_hidden, + options::OPT_fno_visibility_inlines_hidden, false)) + CmdArgs.push_back("-fvisibility-inlines-hidden"); + Args.AddLastArg(CmdArgs, options::OPT_fvisibility_inlines_hidden_static_local_var, options::OPT_fno_visibility_inlines_hidden_static_local_var); Args.AddLastArg(CmdArgs, options::OPT_fvisibility_global_new_delete_hidden); diff --git a/clang/test/Driver/visibility-inlines-hidden.cpp b/clang/test/Driver/visibility-inlines-hidden.cpp new file mode 100644 index 0000000000000..643618c673393 --- /dev/null +++ b/clang/test/Driver/visibility-inlines-hidden.cpp @@ -0,0 +1,7 @@ +// RUN: %clang -### -S -fno-visibility-inlines-hidden -fvisibility-inlines-hidden %s 2>&1 | \ +// RUN: FileCheck -check-prefix=CHECK-1 %s +// CHECK-1: "-fvisibility-inlines-hidden" + +// RUN: %clang -### -S -fvisibility-inlines-hidden -fno-visibility-inlines-hidden %s 2>&1 | \ +// RUN: FileCheck -check-prefix=CHECK-2 %s +// CHECK-2-NOT: "-fvisibility-inlines-hidden" _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
