From e6999295076e1bf7c89bcd962db998cf410f677e Mon Sep 17 00:00:00 2001 From: Tim Northover Date: Wed, 19 Oct 2016 15:56:12 +0000 Subject: [PATCH] Revert r284604. A.K.A. "TMP" Committed by mistake. llvm-svn: 284606 --- .../include/llvm/CodeGen/GlobalISel/IRTranslator.h | 2 -- llvm/lib/CodeGen/GlobalISel/IRTranslator.cpp | 33 ---------------------- 2 files changed, 35 deletions(-) diff --git a/llvm/include/llvm/CodeGen/GlobalISel/IRTranslator.h b/llvm/include/llvm/CodeGen/GlobalISel/IRTranslator.h index ad76cf8..0bed9d1 100644 --- a/llvm/include/llvm/CodeGen/GlobalISel/IRTranslator.h +++ b/llvm/include/llvm/CodeGen/GlobalISel/IRTranslator.h @@ -120,8 +120,6 @@ private: bool translateMemcpy(const CallInst &CI); - void getStackGuard(unsigned DstReg); - bool translateKnownIntrinsic(const CallInst &CI, Intrinsic::ID ID); /// Translate call instruction. diff --git a/llvm/lib/CodeGen/GlobalISel/IRTranslator.cpp b/llvm/lib/CodeGen/GlobalISel/IRTranslator.cpp index 94ef967..2a66251 100644 --- a/llvm/lib/CodeGen/GlobalISel/IRTranslator.cpp +++ b/llvm/lib/CodeGen/GlobalISel/IRTranslator.cpp @@ -382,26 +382,6 @@ bool IRTranslator::translateMemcpy(const CallInst &CI) { CallLowering::ArgInfo(0, CI.getType()), Args); } -void IRTranslator::getStackGuard(unsigned DstReg) { - auto MIB = MIRBuilder.buildInstr(TargetOpcode::LOAD_STACK_GUARD); - MIB.addDef(DstReg); - - auto &MF = MIRBuilder.getMF(); - auto &TLI = *MF.getSubtarget().getTargetLowering(); - Value *Global = TLI.getSDagStackGuard(*MF.getFunction()->getParent()); - if (!Global) - return; - - MachinePointerInfo MPInfo(Global); - MachineInstr::mmo_iterator MemRefs = MF.allocateMemRefsArray(1); - auto Flags = MachineMemOperand::MOLoad | MachineMemOperand::MOInvariant | - MachineMemOperand::MODereferenceable; - *MemRefs = - MF.getMachineMemOperand(MPInfo, Flags, DL->getPointerSizeInBits() / 8, - DL->getPointerABIAlignment() / 8); - MIB.setMemRefs(MemRefs, MemRefs + 1); -} - bool IRTranslator::translateKnownIntrinsic(const CallInst &CI, Intrinsic::ID ID) { unsigned Op = 0; @@ -422,19 +402,6 @@ bool IRTranslator::translateKnownIntrinsic(const CallInst &CI, MIRBuilder.buildConstant(getOrCreateVReg(CI), Min->isZero() ? -1ULL : 0); return true; } - case Intrinsic::stackguard: - getStackGuard(getOrCreateVReg(CI)); - return true; - case Intrinsic::stackprotector: { - // LLT PtrTy{*CI.getArgOperand(0).getType(), *DL}; - // unsigned GuardVal = MRI->createGenericVirtualRegister(PtrTy); - // getStackGuard(GuardVal); - - // AllocaInst *Slot = cast(I.getArgOperand(1)); - // unsigned StackSlot = MIRBuilder.buildFrameIndex(FrameReg, FI); - // MIRBuilder.buildStore(GuardVal, StackSlot); - return true; - } } LLT Ty{*CI.getOperand(0)->getType(), *DL}; -- 2.7.4