From a1a235f869cd1c7d2716ab20242f06589775442e Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Thu, 1 May 2014 04:19:59 +0000 Subject: [PATCH] ARM: fix memory leak, simplify WoA stack probing This fixes the memory leak introduced with the initial addition of support for WoA stack probing. Now that the pseudo-instruction expansion can handle an external symbol, use that to generate the load which simplifies the logic as well as avoids the memory leak. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@207737 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Target/ARM/ARMFrameLowering.cpp | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/lib/Target/ARM/ARMFrameLowering.cpp b/lib/Target/ARM/ARMFrameLowering.cpp index af4c97db684..c9000156960 100644 --- a/lib/Target/ARM/ARMFrameLowering.cpp +++ b/lib/Target/ARM/ARMFrameLowering.cpp @@ -25,7 +25,6 @@ #include "llvm/CodeGen/RegisterScavenging.h" #include "llvm/IR/CallingConv.h" #include "llvm/IR/Function.h" -#include "llvm/IR/Module.h" #include "llvm/MC/MCContext.h" #include "llvm/Support/CommandLine.h" #include "llvm/Target/TargetOptions.h" @@ -316,20 +315,15 @@ void ARMFrameLowering::emitPrologue(MachineFunction &MF) const { .addReg(ARM::R4, RegState::Implicit); break; case CodeModel::Large: - case CodeModel::JITDefault: { - LLVMContext &Ctx = MF.getMMI().getModule()->getContext(); - const GlobalValue *F = - Function::Create(FunctionType::get(Type::getVoidTy(Ctx), false), - GlobalValue::AvailableExternallyLinkage, "__chkstk"); - + case CodeModel::JITDefault: BuildMI(MBB, MBBI, dl, TII.get(ARM::t2MOVi32imm), ARM::R12) - .addGlobalAddress(F); + .addExternalSymbol("__chkstk"); + BuildMI(MBB, MBBI, dl, TII.get(ARM::BLX)) .addReg(ARM::R12, RegState::Kill) .addReg(ARM::R4, RegState::Implicit); break; } - } AddDefaultCC(AddDefaultPred(BuildMI(MBB, MBBI, dl, TII.get(ARM::t2SUBrr), ARM::SP)