change flags, but break clang

Author: EricWF

clang/include/clang/Basic/DiagnosticDriverKinds.td

@@ -823,5 +823,4 @@ def err_drv_contract_group_name_invalid : Error<
     "|cannot be empty"
     "|\"%2\" is an invalid value"
     "}0">;
-
 }

clang/include/clang/Driver/Options.td

@@ -1677,7 +1677,7 @@ def fcontract_evaluation_semantic_EQ : Joined<["-"], "fcontract-evaluation-seman
   NormalizedValues<["Ignore", "Enforce", "Observe", "QuickEnforce"]>,
   MarshallingInfoEnum<LangOpts<"ContractEvalSemantic">, "Enforce">;
 
-def fclang_contract_groups_EQ : CommaJoined<["-"], "fclang-contract-groups=">,
+def fcontract_group_evaluation_semantic_EQ : CommaJoined<["-"], "fcontract-group-evaluation-semantic=">,
   Visibility<[ClangOption, CC1Option]>,
   HelpText<"Clang extension. Enable or disable contracts by group. The argument is a comma-separated "
            "sequence of one or more group names, each prefixed by '+' or '-'.">;

clang/lib/Driver/ToolChains/Clang.cpp

@@ -7312,8 +7312,8 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
             Twine("-fcontract-evaluation-semantic=") + A->getValue()));
       }
       std::vector<std::string> ContractGroups =
-          Args.getAllArgValues(options::OPT_fclang_contract_groups_EQ);
-      CmdArgs.push_back(Args.MakeArgString(Twine("-fclang-contract-groups=") +
+          Args.getAllArgValues(options::OPT_fcontract_group_evaluation_semantic_EQ);
+      CmdArgs.push_back(Args.MakeArgString(Twine("-fcontract-group-evaluation-semantic=") +
                                            llvm::join(ContractGroups, ",")));
 
     }();

clang/lib/Frontend/CompilerInvocation.cpp

@@ -3475,9 +3475,11 @@ void CompilerInvocationBase::GenerateLangArgs(const LangOptions &Opts,
       GenerateArg(Consumer, OPT_pic_is_pie);
     for (StringRef Sanitizer : serializeSanitizerKinds(Opts.Sanitize))
       GenerateArg(Consumer, OPT_fsanitize_EQ, Sanitizer);
+
+
     for (StringRef ContractGroup :
          Opts.ContractOptions.serializeContractGroupArgs())
-      GenerateArg(Consumer, OPT_fclang_contract_groups_EQ, ContractGroup);
+      GenerateArg(Consumer, OPT_fcontract_group_evaluation_semantic_EQ, ContractGroup);
     return;
   }
 
@@ -3752,7 +3754,7 @@ void CompilerInvocationBase::GenerateLangArgs(const LangOptions &Opts,
 
   for (StringRef ContractGroup :
        Opts.ContractOptions.serializeContractGroupArgs())
-    GenerateArg(Consumer, OPT_fclang_contract_groups_EQ, ContractGroup);
+    GenerateArg(Consumer, OPT_fcontract_group_evaluation_semantic_EQ, ContractGroup);
 }
 
 bool CompilerInvocation::ParseLangArgs(LangOptions &Opts, ArgList &Args,
@@ -4389,7 +4391,7 @@ bool CompilerInvocation::ParseLangArgs(LangOptions &Opts, ArgList &Args,
   };
 
   std::vector<std::string> ContractGroupValues =
-      Args.getAllArgValues(options::OPT_fclang_contract_groups_EQ);
+      Args.getAllArgValues(options::OPT_fcontract_group_evaluation_semantic_EQ);
   Opts.ContractOptions.parseContractGroups(ContractGroupValues,
                                            EmitContractDiag);
 

libcxx/include/contracts

@@ -56,7 +56,7 @@ public:
         unsigned __line_;
     };
 
-  contract_violation(_Info __info) noexcept
+  explicit contract_violation(_Info __info) noexcept
       : __info_(__info) {}
 
 
@@ -70,13 +70,13 @@ _LIBCPP_EXPORTED_FROM_ABI void invoke_default_contract_violation_handler(const c
 
 } // namespace std::contracts
 
-_LIBCPP_WEAK void handle_contract_violation(const std::contracts::contract_violation&) noexcept;
+_LIBCPP_WEAK void handle_contract_violation(const std::contracts::contract_violation&);
 
 
 extern "C" {
 _LIBCPP_EXPORTED_FROM_ABI
 void __handle_contract_violation(unsigned kind, unsigned eval_semantic,
-unsigned detection_mode, const char* comment, const char* file, unsigned line);
+                                  unsigned detection_mode, const char* comment, const char* file, unsigned line);
 }
 
 

libcxx/src/contracts.cpp

@@ -9,7 +9,6 @@
 namespace std::contracts {
 
 void invoke_default_contract_violation_handler(const contract_violation& violation) noexcept {
-
   ::handle_contract_violation(violation);
 }