Revert "[X86] Support the "ms-hotpatch" attribute."

This reverts commit r278048. Something changed between the last time I
built this--it takes awhile on my ridiculously slow and ancient
computer--and now that broke this.

llvm-svn: 278053

8 files changed, 21 insertions, 83 deletions

diff --git a/llvm/lib/Analysis/TargetTransformInfo.cpp b/llvm/lib/Analysis/TargetTransformInfo.cpp
index e131a5ccc4c..c4aea355a3d 100644
--- a/llvm/lib/Analysis/TargetTransformInfo.cpp
+++ b/llvm/lib/Analysis/TargetTransformInfo.cpp
@@ -106,12 +106,6 @@ void TargetTransformInfo::getUnrollingPreferences(
   return TTIImpl->getUnrollingPreferences(L, UP);
 }
 
-void TargetTransformInfo::emitPatchableOp(
-    StringRef PatchType, MachineBasicBlock &MBB,
-    MachineBasicBlock::iterator &MBBI) const {
-  return TTIImpl->emitPatchableOp(PatchType, MBB, MBBI);
-}
-
 bool TargetTransformInfo::isLegalAddImmediate(int64_t Imm) const {
   return TTIImpl->isLegalAddImmediate(Imm);
 }
diff --git a/llvm/lib/CodeGen/PatchableFunction.cpp b/llvm/lib/CodeGen/PatchableFunction.cpp
index c94307df62b..32468c90b86 100644
--- a/llvm/lib/CodeGen/PatchableFunction.cpp
+++ b/llvm/lib/CodeGen/PatchableFunction.cpp
@@ -13,11 +13,12 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/CodeGen/Passes.h"
-#include "llvm/Analysis/TargetTransformInfo.h"
-#include "llvm/CodeGen/Analysis.h"
 #include "llvm/CodeGen/MachineFunction.h"
 #include "llvm/CodeGen/MachineFunctionPass.h"
+#include "llvm/CodeGen/MachineInstrBuilder.h"
 #include "llvm/Target/TargetFrameLowering.h"
+#include "llvm/Target/TargetInstrInfo.h"
+#include "llvm/Target/TargetSubtargetInfo.h"
 
 using namespace llvm;
 
@@ -28,9 +29,8 @@ struct PatchableFunction : public MachineFunctionPass {
     initializePatchableFunctionPass(*PassRegistry::getPassRegistry());
   }
 
-  void getAnalysisUsage(AnalysisUsage &AU) const override;
   bool runOnMachineFunction(MachineFunction &F) override;
-  MachineFunctionProperties getRequiredProperties() const override {
+   MachineFunctionProperties getRequiredProperties() const override {
     return MachineFunctionProperties().set(
         MachineFunctionProperties::Property::AllVRegsAllocated);
   }
@@ -53,29 +53,31 @@ static bool doesNotGeneratecode(const MachineInstr &MI) {
   }
 }
 
-void PatchableFunction::getAnalysisUsage(AnalysisUsage &AU) const {
-  MachineFunctionPass::getAnalysisUsage(AU);
-  AU.addRequired<TargetTransformInfoWrapperPass>();
-}
-
 bool PatchableFunction::runOnMachineFunction(MachineFunction &MF) {
   if (!MF.getFunction()->hasFnAttribute("patchable-function"))
     return false;
 
+#ifndef NDEBUG
   Attribute PatchAttr = MF.getFunction()->getFnAttribute("patchable-function");
   StringRef PatchType = PatchAttr.getValueAsString();
-  assert((PatchType == "prologue-short-redirect" ||
-          PatchType == "ms-hotpatch") && "Only possibilities today!");
+  assert(PatchType == "prologue-short-redirect" && "Only possibility today!");
+#endif
 
   auto &FirstMBB = *MF.begin();
   MachineBasicBlock::iterator FirstActualI = FirstMBB.begin();
   for (; doesNotGeneratecode(*FirstActualI); ++FirstActualI)
     assert(FirstActualI != FirstMBB.end());
 
-  const TargetTransformInfo &TTI =
-      getAnalysis<TargetTransformInfoWrapperPass>().getTTI(*MF.getFunction());
-  TTI.emitPatchableOp(PatchType, FirstMBB, FirstActualI);
+  auto *TII = MF.getSubtarget().getInstrInfo();
+  auto MIB = BuildMI(FirstMBB, FirstActualI, FirstActualI->getDebugLoc(),
+                     TII->get(TargetOpcode::PATCHABLE_OP))
+                 .addImm(2)
+                 .addImm(FirstActualI->getOpcode());
+
+  for (auto &MO : FirstActualI->operands())
+    MIB.addOperand(MO);
 
+  FirstActualI->eraseFromParent();
   MF.ensureAlignment(4);
   return true;
 }
diff --git a/llvm/lib/Target/X86/X86AsmPrinter.cpp b/llvm/lib/Target/X86/X86AsmPrinter.cpp
index 76241dae069..67e51f1e919 100644
--- a/llvm/lib/Target/X86/X86AsmPrinter.cpp
+++ b/llvm/lib/Target/X86/X86AsmPrinter.cpp
@@ -76,31 +76,6 @@ bool X86AsmPrinter::runOnMachineFunction(MachineFunction &MF) {
   return false;
 }
 
-void X86AsmPrinter::EmitConstantPool() {
-  if (MF) {
-    // If an MS hotpatch function, we need to ensure 64 (32-bit) or 128 (64-bit)
-    // bytes of padding precede the label.  This is the scratch space used
-    // by the hotpatching mechanism to insert the patch code.  The movl %edi,
-    // %edi instruction emitted as the very first instruction of a hotpatch
-    // function is usually overwritten with a short jump instruction when the
-    // patch is installed, so it will jump directly into this space.  (But
-    // don't add the space when targeting MSVC.  There, the /FUNCTIONPADMIN
-    // option to link.exe is expected to be used.)
-    const Function *Fn = MF->getFunction();
-    if (!Subtarget->isTargetKnownWindowsMSVC() &&
-        Fn->hasFnAttribute("patchable-function") &&
-        Fn->getFnAttribute("patchable-function").getValueAsString() ==
-            "ms-hotpatch") {
-      // Emit INT3 instructions instead of NOPs. If a patch runs off the end,
-      // best to let the patcher know with a crash/debug break than to silently
-      // continue, only to run into the jump back into the patch.
-      OutStreamer->emitFill(Subtarget->is64Bit() ? 128 : 64, 0xcc);
-    }
-  }
-
-  AsmPrinter::EmitConstantPool();
-}
-
 /// printSymbolOperand - Print a raw symbol reference operand.  This handles
 /// jump tables, constant pools, global address and external symbols, all of
 /// which print to a label with various suffixes for relocation types etc.
diff --git a/llvm/lib/Target/X86/X86AsmPrinter.h b/llvm/lib/Target/X86/X86AsmPrinter.h
index 7fc15cfd603..dcb7b5a3466 100644
--- a/llvm/lib/Target/X86/X86AsmPrinter.h
+++ b/llvm/lib/Target/X86/X86AsmPrinter.h
@@ -140,8 +140,6 @@ public:
     SMShadowTracker.emitShadowPadding(*OutStreamer, getSubtargetInfo());
   }
 
-  void EmitConstantPool() override;
-
   bool PrintAsmOperand(const MachineInstr *MI, unsigned OpNo,
                        unsigned AsmVariant, const char *ExtraCode,
                        raw_ostream &OS) override;
diff --git a/llvm/lib/Target/X86/X86FrameLowering.cpp b/llvm/lib/Target/X86/X86FrameLowering.cpp
index a3f4d294421..850a67a30e0 100644
--- a/llvm/lib/Target/X86/X86FrameLowering.cpp
+++ b/llvm/lib/Target/X86/X86FrameLowering.cpp
@@ -928,10 +928,6 @@ void X86FrameLowering::emitPrologue(MachineFunction &MF,
   bool NeedsWinCFI = IsWin64Prologue && Fn->needsUnwindTableEntry();
   bool NeedsDwarfCFI =
       !IsWin64Prologue && (MMI.hasDebugInfo() || Fn->needsUnwindTableEntry());
-  bool IsMSHotpatch =
-      Fn->hasFnAttribute("patchable-function") &&
-      Fn->getFnAttribute("patchable-function").getValueAsString() ==
-          "ms-hotpatch";
   unsigned FramePtr = TRI->getFrameRegister(MF);
   const unsigned MachineFramePtr =
       STI.isTarget64BitILP32()
@@ -1073,9 +1069,7 @@ void X86FrameLowering::emitPrologue(MachineFunction &MF,
     if (!IsWin64Prologue && !IsFunclet) {
       // Update EBP with the new base value.
       BuildMI(MBB, MBBI, DL,
-              TII.get(IsMSHotpatch ?
-                      (Uses64BitFramePtr ? X86::MOV64rr_REV : X86::MOV32rr_REV):
-                      (Uses64BitFramePtr ? X86::MOV64rr : X86::MOV32rr)),
+              TII.get(Uses64BitFramePtr ? X86::MOV64rr : X86::MOV32rr),
               FramePtr)
           .addReg(StackPtr)
           .setMIFlag(MachineInstr::FrameSetup);
diff --git a/llvm/lib/Target/X86/X86ISelLowering.cpp b/llvm/lib/Target/X86/X86ISelLowering.cpp
index 2c6bd64dbb9..c09d76d4845 100644
--- a/llvm/lib/Target/X86/X86ISelLowering.cpp
+++ b/llvm/lib/Target/X86/X86ISelLowering.cpp
@@ -2576,13 +2576,10 @@ SDValue X86TargetLowering::LowerFormalArguments(
   X86MachineFunctionInfo *FuncInfo = MF.getInfo<X86MachineFunctionInfo>();
   const TargetFrameLowering &TFI = *Subtarget.getFrameLowering();
 
-  const Function* Fn = MF.getFunction();
-  if ((Fn->hasExternalLinkage() &&
-       Subtarget.isTargetCygMing() &&
-       Fn->getName() == "main") ||
-      (!Subtarget.is64Bit() && Fn->hasFnAttribute("patchable-function") &&
-       Fn->getFnAttribute("patchable-function").getValueAsString() ==
-           "ms-hotpatch"))
+  const Function *Fn = MF.getFunction();
+  if (Fn->hasExternalLinkage() &&
+      Subtarget.isTargetCygMing() &&
+      Fn->getName() == "main")
     FuncInfo->setForceFramePointer(true);
 
   MachineFrameInfo &MFI = MF.getFrameInfo();
diff --git a/llvm/lib/Target/X86/X86TargetTransformInfo.cpp b/llvm/lib/Target/X86/X86TargetTransformInfo.cpp
index 453afc00e9f..657a0451719 100644
--- a/llvm/lib/Target/X86/X86TargetTransformInfo.cpp
+++ b/llvm/lib/Target/X86/X86TargetTransformInfo.cpp
@@ -1681,18 +1681,3 @@ bool X86TTIImpl::areInlineCompatible(const Function *Caller,
   // correct.
   return (CallerBits & CalleeBits) == CalleeBits;
 }
-
-void X86TTIImpl::emitPatchableOp(StringRef PatchType,
-                                 MachineBasicBlock &MBB,
-                                 MachineBasicBlock::iterator &MBBI) const {
-  if (PatchType != "ms-hotpatch" || !ST->is32Bit()) {
-    BaseT::emitPatchableOp(PatchType, MBB, MBBI);
-    return;
-  }
-
-  auto &TII = *MBB.getParent()->getSubtarget().getInstrInfo();
-  BuildMI(MBB, MBBI, MBBI->getDebugLoc(),
-          TII.get(X86::MOV32rr_REV), X86::EDI)
-      .addReg(X86::EDI)
-      .setMIFlag(MachineInstr::FrameSetup);
-}
diff --git a/llvm/lib/Target/X86/X86TargetTransformInfo.h b/llvm/lib/Target/X86/X86TargetTransformInfo.h
index e8856c77296..ab8046bb9fd 100644
--- a/llvm/lib/Target/X86/X86TargetTransformInfo.h
+++ b/llvm/lib/Target/X86/X86TargetTransformInfo.h
@@ -50,13 +50,6 @@ public:
       : BaseT(std::move(static_cast<BaseT &>(Arg))), ST(std::move(Arg.ST)),
         TLI(std::move(Arg.TLI)) {}
 
-  /// \name Generic TTI Implementations
-  /// @{
-  void emitPatchableOp(StringRef PatchType, MachineBasicBlock &MBB,
-                       MachineBasicBlock::iterator &MBBI) const;
-
-  /// @}
-
   /// \name Scalar TTI Implementations
   /// @{
   TTI::PopcntSupportKind getPopcntSupport(unsigned TyWidth);