diff --git a/include/clang/Driver/Options.h b/include/clang/Driver/Options.h index 1186c84..e172a42 100644 --- a/include/clang/Driver/Options.h +++ b/include/clang/Driver/Options.h @@ -29,7 +29,9 @@ enum ClangFlags { NoForward = (1 << 7), Unsupported = (1 << 8), CC1Option = (1 << 9), - NoDriverOption = (1 << 10) + NoDriverOption = (1 << 10), + ClangOption = (1 << 11), + CLOption = (1 << 12) }; enum ID { diff --git a/include/clang/Driver/Options.td b/include/clang/Driver/Options.td index 3e97b4b..6e4f3e1 100644 --- a/include/clang/Driver/Options.td +++ b/include/clang/Driver/Options.td @@ -42,6 +42,13 @@ def CC1Option : OptionFlag; // NoDriverOption - This option should not be accepted by the driver. def NoDriverOption : OptionFlag; +// Def ClangOption - This is a core clang option, available in both gcc and +// cl.exe compatibility modes. +def ClangOption : OptionFlag; + +// CLOption - This is a cl.exe compatibility option. +def CLOption : OptionFlag; + ///////// // Groups @@ -111,7 +118,7 @@ def ccc_driver_Group : OptionGroup<"">, def ccc_debug_Group : OptionGroup<"">, Group, HelpText<"DEBUG/DEVELOPMENT OPTIONS">; -class CCCDriverOpt : Group, Flags<[DriverOption, HelpHidden]>; +class CCCDriverOpt : Group, Flags<[DriverOption, HelpHidden, ClangOption]>; def driver_mode : Joined<["--"], "driver-mode=">, CCCDriverOpt, HelpText<"Set the driver mode to either 'gcc', 'g++' or 'cpp'">; def ccc_gcc_name : Separate<["-"], "ccc-gcc-name">, CCCDriverOpt, @@ -125,7 +132,7 @@ def ccc_pch_is_pch : Flag<["-"], "ccc-pch-is-pch">, CCCDriverOpt, def ccc_pch_is_pth : Flag<["-"], "ccc-pch-is-pth">, CCCDriverOpt, HelpText<"Use pretokenized headers for precompiled headers">; -class CCCDebugOpt : Group, Flags<[DriverOption, HelpHidden]>; +class CCCDebugOpt : Group, Flags<[DriverOption, HelpHidden, ClangOption]>; def ccc_install_dir : Separate<["-"], "ccc-install-dir">, CCCDebugOpt, HelpText<"Simulate installation in the given directory">; def ccc_print_options : Flag<["-"], "ccc-print-options">, CCCDebugOpt, @@ -165,7 +172,7 @@ def ccc_ : Joined<["-"], "ccc-">, Group, Flags<[Unsupported]>; // Standard Options -def _HASH_HASH_HASH : Flag<["-"], "###">, Flags<[DriverOption]>, +def _HASH_HASH_HASH : Flag<["-"], "###">, Flags<[DriverOption, ClangOption]>, HelpText<"Print the commands to run for this compilation">; // The '--' option is here for the sake of compatibility with gcc, but is // being ignored by the driver. @@ -252,7 +259,7 @@ def Xassembler : Separate<["-"], "Xassembler">, HelpText<"Pass to the assembler">, MetaVarName<"">; def Xclang : Separate<["-"], "Xclang">, HelpText<"Pass to the clang compiler">, MetaVarName<"">, - Flags<[NoForward]>; + Flags<[NoForward, ClangOption]>; def Xlinker : Separate<["-"], "Xlinker">, Flags<[LinkerInput, RenderAsInput]>, HelpText<"Pass to the linker">, MetaVarName<"">; def Xpreprocessor : Separate<["-"], "Xpreprocessor">, @@ -305,9 +312,9 @@ def dynamiclib : Flag<["-"], "dynamiclib">; def dynamic : Flag<["-"], "dynamic">, Flags<[NoArgumentUnused]>; def d_Flag : Flag<["-"], "d">, Group; def d_Joined : Joined<["-"], "d">, Group; -def emit_ast : Flag<["-"], "emit-ast">, +def emit_ast : Flag<["-"], "emit-ast">, Flags<[ClangOption]>, HelpText<"Emit Clang AST files for source inputs">; -def emit_llvm : Flag<["-"], "emit-llvm">, Flags<[CC1Option]>, Group, +def emit_llvm : Flag<["-"], "emit-llvm">, Flags<[CC1Option, ClangOption]>, Group, HelpText<"Use the LLVM representation for assembler and object files">; def exported__symbols__list : Separate<["-"], "exported_symbols_list">; def e : JoinedOrSeparate<["-"], "e">; @@ -355,11 +362,11 @@ def fbounds_checking_EQ : Joined<["-"], "fbounds-checking=">, Flags<[CC1Option]> def fbuiltin_strcat : Flag<["-"], "fbuiltin-strcat">, Group; def fbuiltin_strcpy : Flag<["-"], "fbuiltin-strcpy">, Group; def fbuiltin : Flag<["-"], "fbuiltin">, Group; -def fcaret_diagnostics : Flag<["-"], "fcaret-diagnostics">, Group; +def fcaret_diagnostics : Flag<["-"], "fcaret-diagnostics">, Flags<[ClangOption]>, Group; def fcatch_undefined_behavior : Flag<["-"], "fcatch-undefined-behavior">, Group; def fclasspath_EQ : Joined<["-"], "fclasspath=">, Group; -def fcolor_diagnostics : Flag<["-"], "fcolor-diagnostics">, Group, Flags<[CC1Option]>, - HelpText<"Use colors in diagnostics">; +def fcolor_diagnostics : Flag<["-"], "fcolor-diagnostics">, Group, + Flags<[CC1Option, ClangOption]>, HelpText<"Use colors in diagnostics">; def fdiagnostics_color : Flag<["-"], "fdiagnostics-color">, Group; def fdiagnostics_color_EQ : Joined<["-"], "fdiagnostics-color=">, Group; def fcomment_block_commands : CommaJoined<["-"], "fcomment-block-commands=">, Group, Flags<[CC1Option]>, @@ -374,29 +381,29 @@ def fconstexpr_depth_EQ : Joined<["-"], "fconstexpr-depth=">, Group; def fconstexpr_steps_EQ : Joined<["-"], "fconstexpr-steps=">, Group; def fconstexpr_backtrace_limit_EQ : Joined<["-"], "fconstexpr-backtrace-limit=">, Group; -def fno_crash_diagnostics : Flag<["-"], "fno-crash-diagnostics">, Group, Flags<[NoArgumentUnused]>; +def fno_crash_diagnostics : Flag<["-"], "fno-crash-diagnostics">, Group, Flags<[NoArgumentUnused, ClangOption]>; def fcreate_profile : Flag<["-"], "fcreate-profile">, Group; def fcxx_exceptions: Flag<["-"], "fcxx-exceptions">, Group, HelpText<"Enable C++ exceptions">, Flags<[CC1Option]>; def fcxx_modules : Flag <["-"], "fcxx-modules">, Group, Flags<[NoForward]>; def fdebug_pass_arguments : Flag<["-"], "fdebug-pass-arguments">, Group; def fdebug_pass_structure : Flag<["-"], "fdebug-pass-structure">, Group; -def fdiagnostics_fixit_info : Flag<["-"], "fdiagnostics-fixit-info">, Group; +def fdiagnostics_fixit_info : Flag<["-"], "fdiagnostics-fixit-info">, Flags<[ClangOption]>, Group; def fdiagnostics_parseable_fixits : Flag<["-"], "fdiagnostics-parseable-fixits">, Group, - Flags<[CC1Option]>, HelpText<"Print fix-its in machine parseable form">; + Flags<[CC1Option, ClangOption]>, HelpText<"Print fix-its in machine parseable form">; def fdiagnostics_print_source_range_info : Flag<["-"], "fdiagnostics-print-source-range-info">, - Group, Flags<[CC1Option]>, + Group, Flags<[CC1Option, ClangOption]>, HelpText<"Print source range spans in numeric form">; def fdiagnostics_show_option : Flag<["-"], "fdiagnostics-show-option">, Group, - Flags<[CC1Option]>, HelpText<"Print option name with mappable diagnostics">; + Flags<[CC1Option, ClangOption]>, HelpText<"Print option name with mappable diagnostics">; def fdiagnostics_show_name : Flag<["-"], "fdiagnostics-show-name">, Group, - Flags<[CC1Option]>, HelpText<"Print diagnostic name">; + Flags<[CC1Option, ClangOption]>, HelpText<"Print diagnostic name">; def fdiagnostics_show_note_include_stack : Flag<["-"], "fdiagnostics-show-note-include-stack">, - Group, Flags<[CC1Option]>, HelpText<"Display include stacks for diagnostic notes">; -def fdiagnostics_format_EQ : Joined<["-"], "fdiagnostics-format=">, Group; -def fdiagnostics_show_category_EQ : Joined<["-"], "fdiagnostics-show-category=">, Group; + Group, Flags<[CC1Option, ClangOption]>, HelpText<"Display include stacks for diagnostic notes">; +def fdiagnostics_format_EQ : Joined<["-"], "fdiagnostics-format=">, Flags<[ClangOption]>, Group; +def fdiagnostics_show_category_EQ : Joined<["-"], "fdiagnostics-show-category=">, Flags<[ClangOption]>, Group; def fdiagnostics_show_template_tree : Flag<["-"], "fdiagnostics-show-template-tree">, - Group, Flags<[CC1Option]>, + Group, Flags<[CC1Option, ClangOption]>, HelpText<"Print a template comparison tree for differing templates">; def fdollars_in_identifiers : Flag<["-"], "fdollars-in-identifiers">, Group, HelpText<"Allow '$' in identifiers">, Flags<[CC1Option]>; @@ -406,13 +413,13 @@ def fdwarf_directory_asm : Flag<["-"], "fdwarf-directory-asm">, Group; def fno_dwarf_directory_asm : Flag<["-"], "fno-dwarf-directory-asm">, Group, Flags<[CC1Option]>; def felide_constructors : Flag<["-"], "felide-constructors">, Group; def fno_elide_type : Flag<["-"], "fno-elide-type">, Group, - Flags<[CC1Option]>, + Flags<[CC1Option, ClangOption]>, HelpText<"Do not elide types when printing diagnostics">; def feliminate_unused_debug_symbols : Flag<["-"], "feliminate-unused-debug-symbols">, Group; def femit_all_decls : Flag<["-"], "femit-all-decls">, Group, Flags<[CC1Option]>, HelpText<"Emit all declarations, even if unused">; def fencoding_EQ : Joined<["-"], "fencoding=">, Group; -def ferror_limit_EQ : Joined<["-"], "ferror-limit=">, Group; +def ferror_limit_EQ : Joined<["-"], "ferror-limit=">, Group, Flags<[ClangOption]>; def fexceptions : Flag<["-"], "fexceptions">, Group, Flags<[CC1Option]>, HelpText<"Enable support for exception handling">; def fextdirs_EQ : Joined<["-"], "fextdirs=">, Group; @@ -570,7 +577,7 @@ def fno_math_builtin : Flag<["-"], "fno-math-builtin">, Group, Flags<[C HelpText<"Disable implicit builtin knowledge of math functions">; def fno_caret_diagnostics : Flag<["-"], "fno-caret-diagnostics">, Group, Flags<[CC1Option]>; -def fno_color_diagnostics : Flag<["-"], "fno-color-diagnostics">, Group; +def fno_color_diagnostics : Flag<["-"], "fno-color-diagnostics">, Flags<[ClangOption]>, Group; def fno_diagnostics_color : Flag<["-"], "fno-diagnostics-color">, Group; def fno_common : Flag<["-"], "fno-common">, Group, Flags<[CC1Option]>, HelpText<"Compile common globals like normal definitions">; @@ -580,11 +587,11 @@ def fno_constant_cfstrings : Flag<["-"], "fno-constant-cfstrings">, Group, Group; def fno_cxx_modules : Flag <["-"], "fno-cxx-modules">, Group, Flags<[NoForward]>; def fno_diagnostics_fixit_info : Flag<["-"], "fno-diagnostics-fixit-info">, Group, - Flags<[CC1Option]>, HelpText<"Do not include fixit information in diagnostics">; -def fno_diagnostics_show_name : Flag<["-"], "fno-diagnostics-show-name">, Group; -def fno_diagnostics_show_option : Flag<["-"], "fno-diagnostics-show-option">, Group; + Flags<[CC1Option, ClangOption]>, HelpText<"Do not include fixit information in diagnostics">; +def fno_diagnostics_show_name : Flag<["-"], "fno-diagnostics-show-name">, Flags<[ClangOption]>, Group; +def fno_diagnostics_show_option : Flag<["-"], "fno-diagnostics-show-option">, Flags<[ClangOption]>, Group; def fno_diagnostics_show_note_include_stack : Flag<["-"], "fno-diagnostics-show-note-include-stack">, - Flags<[CC1Option]>, Group; + Flags<[CC1Option, ClangOption]>, Group; def fno_dollars_in_identifiers : Flag<["-"], "fno-dollars-in-identifiers">, Group, HelpText<"Disallow '$' in identifiers">, Flags<[CC1Option]>; def fno_elide_constructors : Flag<["-"], "fno-elide-constructors">, Group, @@ -620,7 +627,7 @@ def fno_show_column : Flag<["-"], "fno-show-column">, Group, Flags<[CC1 def fno_show_source_location : Flag<["-"], "fno-show-source-location">, Group, Flags<[CC1Option]>, HelpText<"Do not include source location information with diagnostics">; def fno_spell_checking : Flag<["-"], "fno-spell-checking">, Group, - Flags<[CC1Option]>, HelpText<"Disable spell-checking">; + Flags<[CC1Option, ClangOption]>, HelpText<"Disable spell-checking">; def fno_stack_protector : Flag<["-"], "fno-stack-protector">, Group; def fno_strict_aliasing : Flag<["-"], "fno-strict-aliasing">, Group; def fstruct_path_tbaa : Flag<["-"], "fstruct-path-tbaa">, Group; @@ -713,7 +720,7 @@ def fshow_overloads_EQ : Joined<["-"], "fshow-overloads=">, Group, Flag "best|all; defaults to all">; def fshow_column : Flag<["-"], "fshow-column">, Group, Flags<[CC1Option]>; def fshow_source_location : Flag<["-"], "fshow-source-location">, Group; -def fspell_checking : Flag<["-"], "fspell-checking">, Group; +def fspell_checking : Flag<["-"], "fspell-checking">, Flags<[ClangOption]>, Group; def fsigned_bitfields : Flag<["-"], "fsigned-bitfields">, Group; def fsigned_char : Flag<["-"], "fsigned-char">, Group; def fsplit_stack : Flag<["-"], "fsplit-stack">, Group; @@ -758,7 +765,7 @@ def Wframe_larger_than_EQ : Joined<["-"], "Wframe-larger-than=">, Alias, Alias; def fthreadsafe_statics : Flag<["-"], "fthreadsafe-statics">, Group; -def ftime_report : Flag<["-"], "ftime-report">, Group, Flags<[CC1Option]>; +def ftime_report : Flag<["-"], "ftime-report">, Group, Flags<[CC1Option, ClangOption]>; def ftlsmodel_EQ : Joined<["-"], "ftls-model=">, Group, Flags<[CC1Option]>; def ftrapv : Flag<["-"], "ftrapv">, Group, Flags<[CC1Option]>, HelpText<"Trap on integer overflow">; @@ -849,7 +856,7 @@ def include_pch : Separate<["-"], "include-pch">, Group, Flags<[C HelpText<"Include precompiled header file">, MetaVarName<"">; def init : Separate<["-"], "init">; def install__name : Separate<["-"], "install_name">; -def integrated_as : Flag<["-"], "integrated-as">, Flags<[DriverOption]>; +def integrated_as : Flag<["-"], "integrated-as">, Flags<[DriverOption, ClangOption]>; def iprefix : JoinedOrSeparate<["-"], "iprefix">, Group, Flags<[CC1Option]>, HelpText<"Set the -iwithprefix/-iwithprefixbefore prefix">, MetaVarName<"">; def iquote : JoinedOrSeparate<["-"], "iquote">, Group, Flags<[CC1Option]>, @@ -907,7 +914,7 @@ def mios_version_min_EQ : Joined<["-"], "mios-version-min=">, Alias, Group; def mlinker_version_EQ : Joined<["-"], "mlinker-version=">, Flags<[NoForward]>; -def mllvm : Separate<["-"], "mllvm">, Flags<[CC1Option]>, +def mllvm : Separate<["-"], "mllvm">, Flags<[CC1Option, ClangOption]>, HelpText<"Additional arguments to forward to LLVM's option processing">; def mmacosx_version_min_EQ : Joined<["-"], "mmacosx-version-min=">, Group; def mms_bitfields : Flag<["-"], "mms-bitfields">, Group, Flags<[CC1Option]>, @@ -1038,7 +1045,7 @@ def m_Joined : Joined<["-"], "m">, Group; def no_canonical_prefixes : Flag<["-"], "no-canonical-prefixes">, Flags<[HelpHidden]>, HelpText<"Use relative instead of canonical paths">; def no_cpp_precomp : Flag<["-"], "no-cpp-precomp">, Group; -def no_integrated_as : Flag<["-"], "no-integrated-as">, Flags<[DriverOption]>; +def no_integrated_as : Flag<["-"], "no-integrated-as">, Flags<[DriverOption, ClangOption]>; def no_integrated_cpp : Flag<["-", "--"], "no-integrated-cpp">, Flags<[DriverOption]>; def no_pedantic : Flag<["-", "--"], "no-pedantic">, Group; def no__dead__strip__inits__and__terms : Flag<["-"], "no_dead_strip_inits_and_terms">; @@ -1309,4 +1316,16 @@ def Z_reserved_lib_stdcxx : Flag<["-"], "Z-reserved-lib-stdc++">, def Z_reserved_lib_cckext : Flag<["-"], "Z-reserved-lib-cckext">, Flags<[LinkerInput, NoArgumentUnused, Unsupported]>, Group; + +// clang-cl options. +def cl_Group : OptionGroup<"">, + HelpText<"CL.EXE COMPATIBILITY OPTIONS">; + +class CLFlag : Option<["/", "-"], name, KIND_FLAG>, + Group, Flags<[CLOption]>; + +def _QUESTION : CLFlag<"?">, Alias, HelpText<"Display available options">; +def cl_help : CLFlag<"help">, Alias, HelpText<"Display available options">; + + include "CC1Options.td" diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp index 91b6bc1..64757de 100644 --- a/lib/Driver/Driver.cpp +++ b/lib/Driver/Driver.cpp @@ -108,9 +108,21 @@ void Driver::ParseDriverMode(ArrayRef Args) { InputArgList *Driver::ParseArgStrings(ArrayRef ArgList) { llvm::PrettyStackTraceString CrashInfo("Command line argument parsing"); + + unsigned FlagsToInclude = 0; + unsigned FlagsToExclude = 0; + + if (Mode == CLMode) { + // In CL mode, only allow core Clang options and CL options. + FlagsToInclude = options::ClangOption | options::CLOption; + } else { + FlagsToExclude |= options::CLOption; + } + unsigned MissingArgIndex, MissingArgCount; InputArgList *Args = getOpts().ParseArgs(ArgList.begin(), ArgList.end(), - MissingArgIndex, MissingArgCount); + MissingArgIndex, MissingArgCount, + FlagsToInclude, FlagsToExclude); // Check for missing argument error. if (MissingArgCount) @@ -607,9 +619,21 @@ void Driver::PrintOptions(const ArgList &Args) const { } void Driver::PrintHelp(bool ShowHidden) const { - getOpts().PrintHelp( - llvm::outs(), Name.c_str(), DriverTitle.c_str(), /*Include*/ 0, - /*Exclude*/ options::NoDriverOption | (ShowHidden ? 0 : HelpHidden)); + unsigned FlagsToInclude = 0; + unsigned FlagsToExclude = options::NoDriverOption; + + if (!ShowHidden) + FlagsToExclude |= HelpHidden; + + if (Mode == CLMode) { + // In CL mode, only allow core Clang options and CL options. + FlagsToInclude = options::ClangOption | options::CLOption; + } else { + FlagsToExclude |= options::CLOption; + } + + getOpts().PrintHelp(llvm::outs(), Name.c_str(), DriverTitle.c_str(), + FlagsToInclude, FlagsToExclude); } void Driver::PrintVersion(const Compilation &C, raw_ostream &OS) const { diff --git a/test/Driver/cl.c b/test/Driver/cl.c index c527313..2ffac59 100644 --- a/test/Driver/cl.c +++ b/test/Driver/cl.c @@ -1,3 +1,23 @@ -// RUN: %clang_cl -fsyntax-only -c %s +// Check that clang-cl options are not available by default. +// RUN: %clang -help | FileCheck %s -check-prefix=DEFAULT +// DEFAULT-NOT: CL.EXE COMPATIBILITY OPTIONS +// DEFAULT-NOT: {{/[?]}} +// DEFAULT-NOT: /help +// RUN: not %clang /? +// RUN: not %clang -? +// RUN: not %clang /help -void f(); + +// Check that /? and /help are available as clang-cl options. +// RUN: %clang_cl /? | FileCheck %s -check-prefix=CL +// RUN: %clang_cl /help | FileCheck %s -check-prefix=CL +// RUN: %clang_cl -help | FileCheck %s -check-prefix=CL +// CL: CL.EXE COMPATIBILITY OPTIONS +// CL: {{/[?]}} +// CL: /help + + +// Options available in clang that are not whitelisted are not +// available in clang-cl. +// DEFAULT: -fapple-kext +// CL-NOT: -fapple-kext