Merge commit '4b4782bc868b' from llvm.org/main into next

Author: git apple-llvm automerger

clang/include/clang/Basic/CodeGenOptions.h

@@ -497,13 +497,6 @@ class CodeGenOptions : public CodeGenOptionsBase {
 
   /// A list of functions that are replacable by the loader.
   std::vector<std::string> LoaderReplaceableFunctionNames;
-  /// The name of a file that contains functions which will be compiled for
-  /// hotpatching. See -fms-secure-hotpatch-functions-file.
-  std::string MSSecureHotPatchFunctionsFile;
-
-  /// A list of functions which will be compiled for hotpatching.
-  /// See -fms-secure-hotpatch-functions-list.
-  std::vector<std::string> MSSecureHotPatchFunctionsList;
 
 public:
   // Define accessors/mutators for code generation options of enumeration type.

clang/include/clang/Driver/Options.td

@@ -3946,24 +3946,6 @@ def fms_hotpatch : Flag<["-"], "fms-hotpatch">, Group<f_Group>,
   Visibility<[ClangOption, CC1Option, CLOption]>,
   HelpText<"Ensure that all functions can be hotpatched at runtime">,
   MarshallingInfoFlag<CodeGenOpts<"HotPatch">>;
-
-// See llvm/lib/CodeGen/WindowsSecureHotPatching.cpp
-def fms_secure_hotpatch_functions_file
-    : Joined<["-"], "fms-secure-hotpatch-functions-file=">,
-      Group<f_Group>,
-      Visibility<[ClangOption, CC1Option, CLOption]>,
-      MarshallingInfoString<CodeGenOpts<"MSSecureHotPatchFunctionsFile">>,
-      HelpText<"Path to a file that contains a list of mangled names of "
-               "functions that should be hot-patched for Windows Secure "
-               "Hot-Patching">;
-def fms_secure_hotpatch_functions_list
-    : CommaJoined<["-"], "fms-secure-hotpatch-functions-list=">,
-      Group<f_Group>,
-      Visibility<[ClangOption, CC1Option, CLOption]>,
-      MarshallingInfoStringVector<CodeGenOpts<"MSSecureHotPatchFunctionsList">>,
-      HelpText<"List of mangled symbol names of functions that should be "
-               "hot-patched for Windows Secure Hot-Patching">;
-
 def fpcc_struct_return : Flag<["-"], "fpcc-struct-return">, Group<f_Group>,
   Visibility<[ClangOption, CC1Option]>,
   HelpText<"Override the default ABI to return all structs on the stack">;

clang/lib/CodeGen/CGCall.cpp

@@ -2668,13 +2668,6 @@ void CodeGenModule::ConstructAttributeList(StringRef Name,
     // CPU/feature overrides.  addDefaultFunctionDefinitionAttributes
     // handles these separately to set them based on the global defaults.
     GetCPUAndFeaturesAttributes(CalleeInfo.getCalleeDecl(), FuncAttrs);
-
-    // Windows hotpatching support
-    if (!MSHotPatchFunctions.empty()) {
-      bool IsHotPatched = llvm::binary_search(MSHotPatchFunctions, Name);
-      if (IsHotPatched)
-        FuncAttrs.addAttribute("marked_for_windows_hot_patching");
-    }
   }
 
   // Mark functions that are replaceable by the loader.

clang/lib/CodeGen/CodeGenModule.cpp

@@ -460,35 +460,6 @@ CodeGenModule::CodeGenModule(ASTContext &C,
   if (Context.getTargetInfo().getTriple().getArch() == llvm::Triple::x86)
     getModule().addModuleFlag(llvm::Module::Error, "NumRegisterParameters",
                               CodeGenOpts.NumRegisterParameters);
-
-  // If there are any functions that are marked for Windows secure hot-patching,
-  // then build the list of functions now.
-  if (!CGO.MSSecureHotPatchFunctionsFile.empty() ||
-      !CGO.MSSecureHotPatchFunctionsList.empty()) {
-    if (!CGO.MSSecureHotPatchFunctionsFile.empty()) {
-      auto BufOrErr =
-          llvm::MemoryBuffer::getFile(CGO.MSSecureHotPatchFunctionsFile);
-      if (BufOrErr) {
-        const llvm::MemoryBuffer &FileBuffer = **BufOrErr;
-        for (llvm::line_iterator I(FileBuffer.getMemBufferRef(), true), E;
-             I != E; ++I)
-          this->MSHotPatchFunctions.push_back(std::string{*I});
-      } else {
-        auto &DE = Context.getDiagnostics();
-        unsigned DiagID =
-            DE.getCustomDiagID(DiagnosticsEngine::Error,
-                               "failed to open hotpatch functions file "
-                               "(-fms-hotpatch-functions-file): %0 : %1");
-        DE.Report(DiagID) << CGO.MSSecureHotPatchFunctionsFile
-                          << BufOrErr.getError().message();
-      }
-    }
-
-    for (const auto &FuncName : CGO.MSSecureHotPatchFunctionsList)
-      this->MSHotPatchFunctions.push_back(FuncName);
-
-    llvm::sort(this->MSHotPatchFunctions);
-  }
 }
 
 CodeGenModule::~CodeGenModule() {

clang/lib/CodeGen/CodeGenModule.h

@@ -686,11 +686,6 @@ class CodeGenModule : public CodeGenTypeCache {
 
   AtomicOptions AtomicOpts;
 
-  // A set of functions which should be hot-patched; see
-  // -fms-hotpatch-functions-file (and -list). This will nearly always be empty.
-  // The list is sorted for binary-searching.
-  std::vector<std::string> MSHotPatchFunctions;
-
 public:
   CodeGenModule(ASTContext &C, IntrusiveRefCntPtr<llvm::vfs::FileSystem> FS,
                 const HeaderSearchOptions &headersearchopts,

clang/lib/Driver/ToolChains/Clang.cpp

@@ -7002,14 +7002,6 @@ void Clang::ConstructJob(Compilation &C, const JobAction &Job,
 
   Args.AddLastArg(CmdArgs, options::OPT_fms_hotpatch);
 
-  if (Arg *A = Args.getLastArg(options::OPT_fms_secure_hotpatch_functions_file))
-    Args.AddLastArg(CmdArgs, options::OPT_fms_secure_hotpatch_functions_file);
-
-  for (const auto &A :
-       Args.getAllArgValues(options::OPT_fms_secure_hotpatch_functions_list))
-    CmdArgs.push_back(
-        Args.MakeArgString("-fms-secure-hotpatch-functions-list=" + Twine(A)));
-
   if (TC.SupportsProfiling()) {
     Args.AddLastArg(CmdArgs, options::OPT_pg);