<html><head><meta http-equiv="Content-Type" content="text/html charset=us-ascii"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;" class=""><div class="">This constructor is never executed and just there because the INITIALIZE_PASS stuff is used incrorrectly throughout CodeGen. But I did not want to fix that in the same commit...</div><br class=""><div><blockquote type="cite" class=""><div class="">On Aug 23, 2016, at 3:16 PM, Richard Smith <<a href="mailto:richard@metafoo.co.uk" class="">richard@metafoo.co.uk</a>> wrote:</div><br class="Apple-interchange-newline"><div class=""><div dir="ltr" class="">Reverted in r279580.</div><div class="gmail_extra"><br class=""><div class="gmail_quote">On Tue, Aug 23, 2016 at 3:07 PM, Richard Smith <span dir="ltr" class=""><<a href="mailto:richard@metafoo.co.uk" target="_blank" class="">richard@metafoo.co.uk</a>></span> wrote:<br class=""><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr" class=""><br class=""><div class="gmail_extra"><br class=""><div class="gmail_quote"><div class=""><div class="h5">On Tue, Aug 23, 2016 at 1:58 PM, Matthias Braun via llvm-commits <span dir="ltr" class=""><<a href="mailto:llvm-commits@lists.llvm.org" target="_blank" class="">llvm-commits@lists.llvm.org</a>></span> wrote:<br class=""><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: matze<br class="">
Date: Tue Aug 23 15:58:29 2016<br class="">
New Revision: 279564<br class="">
<br class="">
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=279564&view=rev" rel="noreferrer" target="_blank" class="">http://llvm.org/viewvc/llvm-pr<wbr class="">oject?rev=279564&view=rev</a><br class="">
Log:<br class="">
CodeGen: Remove MachineFunctionAnalysis => Enable (Machine)ModulePasses<br class="">
<br class="">
Re-apply this commit with the deletion of a MachineFunction delegated to<br class="">
a separate pass to avoid use after free when doing this directly in<br class="">
AsmPrinter.<br class="">
<br class="">
This patch removes the MachineFunctionAnalysis. Instead we keep a<br class="">
map from IR Function to MachineFunction in the MachineModuleInfo.<br class="">
<br class="">
This allows the insertion of ModulePasses into the codegen pipeline<br class="">
without breaking it because the MachineFunctionAnalysis gets dropped<br class="">
before a module pass.<br class="">
<br class="">
Peak memory should stay unchanged without a ModulePass in the codegen<br class="">
pipeline: Previously the MachineFunction was freed at the end of a codegen<br class="">
function pipeline because the MachineFunctionAnalysis was dropped; With<br class="">
this patch the MachineFunction is freed after the AsmPrinter has<br class="">
finished.<br class="">
<br class="">
Differential Revision: <a href="http://reviews.llvm.org/D23736" rel="noreferrer" target="_blank" class="">http://reviews.llvm.org/D23736</a><br class="">
<br class="">
Removed:<br class="">
llvm/trunk/include/llvm/CodeGe<wbr class="">n/MachineFunctionAnalysis.h<br class="">
llvm/trunk/lib/CodeGen/Machine<wbr class="">FunctionAnalysis.cpp<br class="">
Modified:<br class="">
llvm/trunk/include/llvm/CodeGe<wbr class="">n/MachineModuleInfo.h<br class="">
llvm/trunk/include/llvm/CodeGe<wbr class="">n/Passes.h<br class="">
llvm/trunk/include/llvm/Target<wbr class="">/TargetMachine.h<br class="">
llvm/trunk/lib/CodeGen/AsmPrin<wbr class="">ter/AsmPrinter.cpp<br class="">
llvm/trunk/lib/CodeGen/CMakeLi<wbr class="">sts.txt<br class="">
llvm/trunk/lib/CodeGen/LLVMTar<wbr class="">getMachine.cpp<br class="">
llvm/trunk/lib/CodeGen/Machine<wbr class="">FunctionPass.cpp<br class="">
llvm/trunk/lib/CodeGen/Machine<wbr class="">ModuleInfo.cpp<br class="">
llvm/trunk/lib/CodeGen/StackMa<wbr class="">pLivenessAnalysis.cpp<br class="">
llvm/trunk/lib/Target/AMDGPU/A<wbr class="">MDILCFGStructurizer.cpp<br class="">
llvm/trunk/lib/Target/Hexagon/<wbr class="">HexagonCommonGEP.cpp<br class="">
llvm/trunk/lib/Target/Hexagon/<wbr class="">HexagonGenExtract.cpp<br class="">
llvm/trunk/lib/Target/Hexagon/<wbr class="">HexagonNewValueJump.cpp<br class="">
llvm/trunk/lib/Target/Hexagon/<wbr class="">HexagonOptimizeSZextends.cpp<br class="">
llvm/trunk/lib/Target/Hexagon/<wbr class="">HexagonVLIWPacketizer.cpp<br class="">
llvm/trunk/lib/Target/NVPTX/NV<wbr class="">PTXAllocaHoisting.cpp<br class="">
llvm/trunk/lib/Target/NVPTX/NV<wbr class="">PTXGenericToNVVM.cpp<br class="">
llvm/trunk/lib/Target/NVPTX/NV<wbr class="">PTXLowerAggrCopies.cpp<br class="">
llvm/trunk/lib/Target/NVPTX/NV<wbr class="">PTXTargetMachine.cpp<br class="">
llvm/trunk/test/CodeGen/Generi<wbr class="">c/stop-after.ll<br class="">
llvm/trunk/test/CodeGen/X86/hi<wbr class="">dden-vis-pic.ll<br class="">
llvm/trunk/tools/llc/llc.cpp<br class="">
llvm/trunk/unittests/MI/LiveIn<wbr class="">tervalTest.cpp<br class="">
<br class="">
Removed: llvm/trunk/include/llvm/CodeGe<wbr class="">n/MachineFunctionAnalysis.h<br class="">
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/MachineFunctionAnalysis.h?rev=279563&view=auto" rel="noreferrer" target="_blank" class="">http://llvm.org/viewvc/llvm-pr<wbr class="">oject/llvm/trunk/include/llvm/<wbr class="">CodeGen/MachineFunctionAnalysi<wbr class="">s.h?rev=279563&view=auto</a><br class="">
==============================<wbr class="">==============================<wbr class="">==================<br class="">
--- llvm/trunk/include/llvm/CodeGe<wbr class="">n/MachineFunctionAnalysis.h (original)<br class="">
+++ llvm/trunk/include/llvm/CodeGe<wbr class="">n/MachineFunctionAnalysis.h (removed)<br class="">
@@ -1,55 +0,0 @@<br class="">
-//===-- MachineFunctionAnalysis.h - Owner of MachineFunctions ----*-C++ -*-===//<br class="">
-//<br class="">
-// The LLVM Compiler Infrastructure<br class="">
-//<br class="">
-// This file is distributed under the University of Illinois Open Source<br class="">
-// License. See LICENSE.TXT for details.<br class="">
-//<br class="">
-//===------------------------<wbr class="">------------------------------<wbr class="">----------------===//<br class="">
-//<br class="">
-// This file declares the MachineFunctionAnalysis class.<br class="">
-//<br class="">
-//===------------------------<wbr class="">------------------------------<wbr class="">----------------===//<br class="">
-<br class="">
-#ifndef LLVM_CODEGEN_MACHINEFUNCTIONAN<wbr class="">ALYSIS_H<br class="">
-#define LLVM_CODEGEN_MACHINEFUNCTIONAN<wbr class="">ALYSIS_H<br class="">
-<br class="">
-#include "llvm/Pass.h"<br class="">
-<br class="">
-namespace llvm {<br class="">
-<br class="">
-class MachineFunction;<br class="">
-class MachineFunctionInitializer;<br class="">
-class TargetMachine;<br class="">
-<br class="">
-/// MachineFunctionAnalysis - This class is a Pass that manages a<br class="">
-/// MachineFunction object.<br class="">
-struct MachineFunctionAnalysis : public FunctionPass {<br class="">
-private:<br class="">
- const TargetMachine &TM;<br class="">
- MachineFunction *MF;<br class="">
- unsigned NextFnNum;<br class="">
- MachineFunctionInitializer *MFInitializer;<br class="">
-<br class="">
-public:<br class="">
- static char ID;<br class="">
- explicit MachineFunctionAnalysis(const TargetMachine &tm,<br class="">
- MachineFunctionInitializer *MFInitializer);<br class="">
- ~MachineFunctionAnalysis() override;<br class="">
-<br class="">
- MachineFunction &getMF() const { return *MF; }<br class="">
-<br class="">
- const char* getPassName() const override {<br class="">
- return "Machine Function Analysis";<br class="">
- }<br class="">
-<br class="">
-private:<br class="">
- bool doInitialization(Module &M) override;<br class="">
- bool runOnFunction(Function &F) override;<br class="">
- void releaseMemory() override;<br class="">
- void getAnalysisUsage(AnalysisUsage &AU) const override;<br class="">
-};<br class="">
-<br class="">
-} // End llvm namespace<br class="">
-<br class="">
-#endif<br class="">
<br class="">
Modified: llvm/trunk/include/llvm/CodeGe<wbr class="">n/MachineModuleInfo.h<br class="">
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/MachineModuleInfo.h?rev=279564&r1=279563&r2=279564&view=diff" rel="noreferrer" target="_blank" class="">http://llvm.org/viewvc/llvm-pr<wbr class="">oject/llvm/trunk/include/llvm/<wbr class="">CodeGen/MachineModuleInfo.h?<wbr class="">rev=279564&r1=279563&r2=<wbr class="">279564&view=diff</a><br class="">
==============================<wbr class="">==============================<wbr class="">==================<br class="">
--- llvm/trunk/include/llvm/CodeGe<wbr class="">n/MachineModuleInfo.h (original)<br class="">
+++ llvm/trunk/include/llvm/CodeGe<wbr class="">n/MachineModuleInfo.h Tue Aug 23 15:58:29 2016<br class="">
@@ -54,6 +54,7 @@ class BlockAddress;<br class="">
class MDNode;<br class="">
class MMIAddrLabelMap;<br class="">
class MachineBasicBlock;<br class="">
+class MachineFunctionInitializer;<br class="">
class MachineFunction;<br class="">
class Module;<br class="">
class PointerType;<br class="">
@@ -107,6 +108,8 @@ protected:<br class="">
/// schemes and reformated for specific use.<br class="">
///<br class="">
class MachineModuleInfo : public ImmutablePass {<br class="">
+ const TargetMachine &TM;<br class="">
+<br class="">
/// Context - This is the MCContext used for the entire code generator.<br class="">
MCContext Context;<br class="">
<br class="">
@@ -184,6 +187,14 @@ class MachineModuleInfo : public Immutab<br class="">
<br class="">
EHPersonality PersonalityTypeCache;<br class="">
<br class="">
+ MachineFunctionInitializer *MFInitializer;<br class="">
+ /// Maps IR Functions to their corresponding MachineFunctions.<br class="">
+ DenseMap<const Function*, std::unique_ptr<MachineFunctio<wbr class="">n>> MachineFunctions;<br class="">
+ /// Next unique number available for a MachineFunction.<br class="">
+ unsigned NextFnNum = 0;<br class="">
+ const Function *LastRequest = nullptr; ///< Used for shortcut/cache.<br class="">
+ MachineFunction *LastResult = nullptr; ///< Used for shortcut/cache.<br class="">
+<br class="">
public:<br class="">
static char ID; // Pass identification, replacement for typeid<br class="">
<br class="">
@@ -202,8 +213,9 @@ public:<br class="">
<br class="">
MachineModuleInfo(); // DUMMY CONSTRUCTOR, DO NOT CALL.<br class="">
// Real constructor.<br class="">
- MachineModuleInfo(const MCAsmInfo &MAI, const MCRegisterInfo &MRI,<br class="">
- const MCObjectFileInfo *MOFI);<br class="">
+ MachineModuleInfo(const TargetMachine &TM, const MCAsmInfo &MAI,<br class="">
+ const MCRegisterInfo &MRI, const MCObjectFileInfo *MOFI,<br class="">
+ MachineFunctionInitializer *MFInitializer = nullptr);<br class="">
~MachineModuleInfo() override;<br class="">
<br class="">
// Initialization and Finalization<br class="">
@@ -220,6 +232,15 @@ public:<br class="">
void setModule(const Module *M) { TheModule = M; }<br class="">
const Module *getModule() const { return TheModule; }<br class="">
<br class="">
+ /// Returns the MachineFunction constructed for the IR function \p F.<br class="">
+ /// Creates a new MachineFunction and runs the MachineFunctionInitializer<br class="">
+ /// if none exists yet.<br class="">
+ MachineFunction &getMachineFunction(const Function &F);<br class="">
+<br class="">
+ /// \brief Delete the MachineFunction \p MF and reset the link in the IR<br class="">
+ /// Function to Machine Function map.<br class="">
+ void deleteMachineFunctionFor(Funct<wbr class="">ion &F);<br class="">
+<br class="">
/// getInfo - Keep track of various per-function pieces of information for<br class="">
/// backends that would like to do so.<br class="">
///<br class="">
<br class="">
Modified: llvm/trunk/include/llvm/CodeGe<wbr class="">n/Passes.h<br class="">
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/Passes.h?rev=279564&r1=279563&r2=279564&view=diff" rel="noreferrer" target="_blank" class="">http://llvm.org/viewvc/llvm-pr<wbr class="">oject/llvm/trunk/include/llvm/<wbr class="">CodeGen/Passes.h?rev=279564&<wbr class="">r1=279563&r2=279564&view=diff</a><br class="">
==============================<wbr class="">==============================<wbr class="">==================<br class="">
--- llvm/trunk/include/llvm/CodeGe<wbr class="">n/Passes.h (original)<br class="">
+++ llvm/trunk/include/llvm/CodeGe<wbr class="">n/Passes.h Tue Aug 23 15:58:29 2016<br class="">
@@ -377,6 +377,9 @@ namespace llvm {<br class="">
<br class="">
/// This pass performs software pipelining on machine instructions.<br class="">
extern char &MachinePipelinerID;<br class="">
+<br class="">
+ /// This pass frees the memory occupied by the MachineFunction.<br class="">
+ FunctionPass *createFreeMachineFunctionPass<wbr class="">();<br class="">
} // End llvm namespace<br class="">
<br class="">
/// Target machine pass initializer for passes with dependencies. Use with<br class="">
<br class="">
Modified: llvm/trunk/include/llvm/Target<wbr class="">/TargetMachine.h<br class="">
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/TargetMachine.h?rev=279564&r1=279563&r2=279564&view=diff" rel="noreferrer" target="_blank" class="">http://llvm.org/viewvc/llvm-pr<wbr class="">oject/llvm/trunk/include/llvm/<wbr class="">Target/TargetMachine.h?rev=<wbr class="">279564&r1=279563&r2=279564&<wbr class="">view=diff</a><br class="">
==============================<wbr class="">==============================<wbr class="">==================<br class="">
--- llvm/trunk/include/llvm/Target<wbr class="">/TargetMachine.h (original)<br class="">
+++ llvm/trunk/include/llvm/Target<wbr class="">/TargetMachine.h Tue Aug 23 15:58:29 2016<br class="">
@@ -314,11 +314,8 @@ public:<br class="">
bool DisableVerify = true) override;<br class="">
<br class="">
/// Add MachineModuleInfo pass to pass manager.<br class="">
- MachineModuleInfo &addMachineModuleInfo(PassMana<wbr class="">gerBase &PM) const;<br class="">
-<br class="">
- /// Add MachineFunctionAnalysis pass to pass manager.<br class="">
- void addMachineFunctionAnalysis(Pas<wbr class="">sManagerBase &PM,<br class="">
- MachineFunctionInitializer *MFInitializer) const;<br class="">
+ MachineModuleInfo &addMachineModuleInfo(PassMana<wbr class="">gerBase &PM,<br class="">
+ MachineFunctionInitializer *MFI = nullptr) const;<br class="">
};<br class="">
<br class="">
} // End llvm namespace<br class="">
<br class="">
Modified: llvm/trunk/lib/CodeGen/AsmPrin<wbr class="">ter/AsmPrinter.cpp<br class="">
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp?rev=279564&r1=279563&r2=279564&view=diff" rel="noreferrer" target="_blank" class="">http://llvm.org/viewvc/llvm-pr<wbr class="">oject/llvm/trunk/lib/CodeGen/<wbr class="">AsmPrinter/AsmPrinter.cpp?rev=<wbr class="">279564&r1=279563&r2=279564&<wbr class="">view=diff</a><br class="">
==============================<wbr class="">==============================<wbr class="">==================<br class="">
--- llvm/trunk/lib/CodeGen/AsmPrin<wbr class="">ter/AsmPrinter.cpp (original)<br class="">
+++ llvm/trunk/lib/CodeGen/AsmPrin<wbr class="">ter/AsmPrinter.cpp Tue Aug 23 15:58:29 2016<br class="">
@@ -2571,8 +2571,6 @@ isBlockOnlyReachableByFallthro<wbr class="">ugh(const<br class="">
return true;<br class="">
}<br class="">
<br class="">
-<br class="">
-<br class="">
GCMetadataPrinter *AsmPrinter::GetOrCreateGCPrin<wbr class="">ter(GCStrategy &S) {<br class="">
if (!S.usesMetadata())<br class="">
return nullptr;<br class="">
<br class="">
Modified: llvm/trunk/lib/CodeGen/CMakeLi<wbr class="">sts.txt<br class="">
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/CMakeLists.txt?rev=279564&r1=279563&r2=279564&view=diff" rel="noreferrer" target="_blank" class="">http://llvm.org/viewvc/llvm-pr<wbr class="">oject/llvm/trunk/lib/CodeGen/<wbr class="">CMakeLists.txt?rev=279564&r1=<wbr class="">279563&r2=279564&view=diff</a><br class="">
==============================<wbr class="">==============================<wbr class="">==================<br class="">
--- llvm/trunk/lib/CodeGen/CMakeLi<wbr class="">sts.txt (original)<br class="">
+++ llvm/trunk/lib/CodeGen/CMakeLi<wbr class="">sts.txt Tue Aug 23 15:58:29 2016<br class="">
@@ -59,7 +59,6 @@ add_llvm_library(LLVMCodeGen<br class="">
MachineCSE.cpp<br class="">
MachineDominanceFrontier.cpp<br class="">
MachineDominators.cpp<br class="">
- MachineFunctionAnalysis.cpp<br class="">
MachineFunction.cpp<br class="">
MachineFunctionPass.cpp<br class="">
MachineFunctionPrinterPass.<wbr class="">cpp<br class="">
<br class="">
Modified: llvm/trunk/lib/CodeGen/LLVMTar<wbr class="">getMachine.cpp<br class="">
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/LLVMTargetMachine.cpp?rev=279564&r1=279563&r2=279564&view=diff" rel="noreferrer" target="_blank" class="">http://llvm.org/viewvc/llvm-pr<wbr class="">oject/llvm/trunk/lib/CodeGen/<wbr class="">LLVMTargetMachine.cpp?rev=<wbr class="">279564&r1=279563&r2=279564&<wbr class="">view=diff</a><br class="">
==============================<wbr class="">==============================<wbr class="">==================<br class="">
--- llvm/trunk/lib/CodeGen/LLVMTar<wbr class="">getMachine.cpp (original)<br class="">
+++ llvm/trunk/lib/CodeGen/LLVMTar<wbr class="">getMachine.cpp Tue Aug 23 15:58:29 2016<br class="">
@@ -15,7 +15,6 @@<br class="">
#include "llvm/Analysis/Passes.h"<br class="">
#include "llvm/CodeGen/AsmPrinter.h"<br class="">
#include "llvm/CodeGen/BasicTTIImpl.h"<br class="">
-#include "llvm/CodeGen/MachineFunctionA<wbr class="">nalysis.h"<br class="">
#include "llvm/CodeGen/MachineModuleInf<wbr class="">o.h"<br class="">
#include "llvm/CodeGen/Passes.h"<br class="">
#include "llvm/CodeGen/TargetPassConfig<wbr class="">.h"<br class="">
@@ -103,19 +102,15 @@ TargetIRAnalysis LLVMTargetMachine::getT<br class="">
}<br class="">
<br class="">
MachineModuleInfo &<br class="">
-LLVMTargetMachine::addMachine<wbr class="">ModuleInfo(PassManagerBase &PM) const {<br class="">
- MachineModuleInfo *MMI = new MachineModuleInfo(*getMCAsmInf<wbr class="">o(),<br class="">
+LLVMTargetMachine::addMachine<wbr class="">ModuleInfo(PassManagerBase &PM,<br class="">
+ MachineFunctionInitializer *MFI) const {<br class="">
+ MachineModuleInfo *MMI = new MachineModuleInfo(*this, *getMCAsmInfo(),<br class="">
*getMCRegisterInfo(),<br class="">
- getObjFileLowering());<br class="">
+ getObjFileLowering(), MFI);<br class="">
PM.add(MMI);<br class="">
return *MMI;<br class="">
}<br class="">
<br class="">
-void LLVMTargetMachine::addMachineF<wbr class="">unctionAnalysis(PassManagerBas<wbr class="">e &PM,<br class="">
- MachineFunctionInitializer *MFInitializer) const {<br class="">
- PM.add(new MachineFunctionAnalysis(*this, MFInitializer));<br class="">
-}<br class="">
-<br class="">
/// addPassesToX helper drives creation and initialization of TargetPassConfig.<br class="">
static MCContext *<br class="">
addPassesToGenerateCode(LLVMT<wbr class="">argetMachine *TM, PassManagerBase &PM,<br class="">
@@ -150,8 +145,7 @@ addPassesToGenerateCode(LLVMTa<wbr class="">rgetMachin<br class="">
<br class="">
PassConfig->addISelPrepare();<br class="">
<br class="">
- MachineModuleInfo &MMI = TM->addMachineModuleInfo(PM);<br class="">
- TM->addMachineFunctionAnalysis<wbr class="">(PM, MFInitializer);<br class="">
+ MachineModuleInfo &MMI = TM->addMachineModuleInfo(PM, MFInitializer);<br class="">
<br class="">
// Enable FastISel with -fast, but allow that to be overridden.<br class="">
TM->setO0WantsFastISel(Enable<wbr class="">FastISelOption != cl::BOU_FALSE);<br class="">
@@ -273,6 +267,7 @@ bool LLVMTargetMachine::addPassesTo<wbr class="">EmitF<br class="">
return true;<br class="">
<br class="">
PM.add(Printer);<br class="">
+ PM.add(createFreeMachineFuncti<wbr class="">onPass());<br class="">
<br class="">
return false;<br class="">
}<br class="">
@@ -319,6 +314,7 @@ bool LLVMTargetMachine::addPassesTo<wbr class="">EmitM<br class="">
return true;<br class="">
<br class="">
PM.add(Printer);<br class="">
+ PM.add(createFreeMachineFuncti<wbr class="">onPass());<br class="">
<br class="">
return false; // success!<br class="">
}<br class="">
<br class="">
Removed: llvm/trunk/lib/CodeGen/Machine<wbr class="">FunctionAnalysis.cpp<br class="">
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/MachineFunctionAnalysis.cpp?rev=279563&view=auto" rel="noreferrer" target="_blank" class="">http://llvm.org/viewvc/llvm-pr<wbr class="">oject/llvm/trunk/lib/CodeGen/M<wbr class="">achineFunctionAnalysis.cpp?rev<wbr class="">=279563&view=auto</a><br class="">
==============================<wbr class="">==============================<wbr class="">==================<br class="">
--- llvm/trunk/lib/CodeGen/Machine<wbr class="">FunctionAnalysis.cpp (original)<br class="">
+++ llvm/trunk/lib/CodeGen/Machine<wbr class="">FunctionAnalysis.cpp (removed)<br class="">
@@ -1,62 +0,0 @@<br class="">
-//===-- MachineFunctionAnalysis.cpp ------------------------------<wbr class="">---------===//<br class="">
-//<br class="">
-// The LLVM Compiler Infrastructure<br class="">
-//<br class="">
-// This file is distributed under the University of Illinois Open Source<br class="">
-// License. See LICENSE.TXT for details.<br class="">
-//<br class="">
-//===------------------------<wbr class="">------------------------------<wbr class="">----------------===//<br class="">
-//<br class="">
-// This file contains the definitions of the MachineFunctionAnalysis members.<br class="">
-//<br class="">
-//===------------------------<wbr class="">------------------------------<wbr class="">----------------===//<br class="">
-<br class="">
-#include "llvm/CodeGen/MachineFunctionA<wbr class="">nalysis.h"<br class="">
-#include "llvm/CodeGen/GCMetadata.h"<br class="">
-#include "llvm/CodeGen/MachineFunction.<wbr class="">h"<br class="">
-#include "llvm/CodeGen/MachineModuleInf<wbr class="">o.h"<br class="">
-#include "llvm/CodeGen/MachineFunctionI<wbr class="">nitializer.h"<br class="">
-using namespace llvm;<br class="">
-<br class="">
-char MachineFunctionAnalysis::ID = 0;<br class="">
-<br class="">
-MachineFunctionAnalysis::Mach<wbr class="">ineFunctionAnalysis(<br class="">
- const TargetMachine &tm, MachineFunctionInitializer *MFInitializer)<br class="">
- : FunctionPass(ID), TM(tm), MF(nullptr), MFInitializer(MFInitializer) {<br class="">
- initializeMachineModuleInfoPas<wbr class="">s(*PassRegistry::getPassRegist<wbr class="">ry());<br class="">
-}<br class="">
-<br class="">
-MachineFunctionAnalysis::~Mac<wbr class="">hineFunctionAnalysis() {<br class="">
- releaseMemory();<br class="">
- assert(!MF && "MachineFunctionAnalysis left initialized!");<br class="">
-}<br class="">
-<br class="">
-void MachineFunctionAnalysis::getAn<wbr class="">alysisUsage(AnalysisUsage &AU) const {<br class="">
- AU.setPreservesAll();<br class="">
- AU.addRequired<MachineModuleIn<wbr class="">fo>();<br class="">
-}<br class="">
-<br class="">
-bool MachineFunctionAnalysis::doIni<wbr class="">tialization(Module &M) {<br class="">
- MachineModuleInfo *MMI = getAnalysisIfAvailable<Machine<wbr class="">ModuleInfo>();<br class="">
- assert(MMI && "MMI not around yet??");<br class="">
- MMI->setModule(&M);<br class="">
- NextFnNum = 0;<br class="">
- return false;<br class="">
-}<br class="">
-<br class="">
-<br class="">
-bool MachineFunctionAnalysis::runOn<wbr class="">Function(Function &F) {<br class="">
- assert(!MF && "MachineFunctionAnalysis already initialized!");<br class="">
- MF = new MachineFunction(&F, TM, NextFnNum++,<br class="">
- getAnalysis<<wbr class="">MachineModuleInfo>());<br class="">
- if (MFInitializer) {<br class="">
- if (MFInitializer->initializeMach<wbr class="">ineFunction(*MF))<br class="">
- report_fatal_error("Unable to initialize machine function");<br class="">
- }<br class="">
- return false;<br class="">
-}<br class="">
-<br class="">
-void MachineFunctionAnalysis::relea<wbr class="">seMemory() {<br class="">
- delete MF;<br class="">
- MF = nullptr;<br class="">
-}<br class="">
<br class="">
Modified: llvm/trunk/lib/CodeGen/Machine<wbr class="">FunctionPass.cpp<br class="">
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/MachineFunctionPass.cpp?rev=279564&r1=279563&r2=279564&view=diff" rel="noreferrer" target="_blank" class="">http://llvm.org/viewvc/llvm-pr<wbr class="">oject/llvm/trunk/lib/CodeGen/<wbr class="">MachineFunctionPass.cpp?rev=<wbr class="">279564&r1=279563&r2=279564&<wbr class="">view=diff</a><br class="">
==============================<wbr class="">==============================<wbr class="">==================<br class="">
--- llvm/trunk/lib/CodeGen/Machine<wbr class="">FunctionPass.cpp (original)<br class="">
+++ llvm/trunk/lib/CodeGen/Machine<wbr class="">FunctionPass.cpp Tue Aug 23 15:58:29 2016<br class="">
@@ -22,7 +22,7 @@<br class="">
#include "llvm/Analysis/ScalarEvolution<wbr class="">.h"<br class="">
#include "llvm/Analysis/ScalarEvolution<wbr class="">AliasAnalysis.h"<br class="">
#include "llvm/CodeGen/MachineFunction.<wbr class="">h"<br class="">
-#include "llvm/CodeGen/MachineFunctionA<wbr class="">nalysis.h"<br class="">
+#include "llvm/CodeGen/MachineModuleInf<wbr class="">o.h"<br class="">
#include "llvm/CodeGen/Passes.h"<br class="">
#include "llvm/CodeGen/StackProtector.h<wbr class="">"<br class="">
#include "llvm/IR/Dominators.h"<br class="">
@@ -41,7 +41,9 @@ bool MachineFunctionPass::runOnFunc<wbr class="">tion(<br class="">
if (F.hasAvailableExternallyLinka<wbr class="">ge())<br class="">
return false;<br class="">
<br class="">
- MachineFunction &MF = getAnalysis<MachineFunctionAna<wbr class="">lysis>().getMF();<br class="">
+ MachineModuleInfo &MMI = getAnalysis<MachineModuleInfo><wbr class="">();<br class="">
+ MachineFunction &MF = MMI.getMachineFunction(F);<br class="">
+<br class="">
MachineFunctionProperties &MFProps = MF.getProperties();<br class="">
<br class="">
#ifndef NDEBUG<br class="">
@@ -65,8 +67,8 @@ bool MachineFunctionPass::runOnFunc<wbr class="">tion(<br class="">
}<br class="">
<br class="">
void MachineFunctionPass::getAnalys<wbr class="">isUsage(AnalysisUsage &AU) const {<br class="">
- AU.addRequired<MachineFunction<wbr class="">Analysis>();<br class="">
- AU.addPreserved<MachineFunctio<wbr class="">nAnalysis>();<br class="">
+ AU.addRequired<MachineModuleIn<wbr class="">fo>();<br class="">
+ AU.addPreserved<MachineModuleI<wbr class="">nfo>();<br class="">
<br class="">
// MachineFunctionPass preserves all LLVM IR passes, but there's no<br class="">
// high-level way to express this. Instead, just list a bunch of<br class="">
<br class="">
Modified: llvm/trunk/lib/CodeGen/Machine<wbr class="">ModuleInfo.cpp<br class="">
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/MachineModuleInfo.cpp?rev=279564&r1=279563&r2=279564&view=diff" rel="noreferrer" target="_blank" class="">http://llvm.org/viewvc/llvm-pr<wbr class="">oject/llvm/trunk/lib/CodeGen/<wbr class="">MachineModuleInfo.cpp?rev=<wbr class="">279564&r1=279563&r2=279564&<wbr class="">view=diff</a><br class="">
==============================<wbr class="">==============================<wbr class="">==================<br class="">
--- llvm/trunk/lib/CodeGen/Machine<wbr class="">ModuleInfo.cpp (original)<br class="">
+++ llvm/trunk/lib/CodeGen/Machine<wbr class="">ModuleInfo.cpp Tue Aug 23 15:58:29 2016<br class="">
@@ -13,6 +13,7 @@<br class="">
#include "llvm/Analysis/EHPersonalities<wbr class="">.h"<br class="">
#include "llvm/Analysis/ValueTracking.h<wbr class="">"<br class="">
#include "llvm/CodeGen/MachineFunction.<wbr class="">h"<br class="">
+#include "llvm/CodeGen/MachineFunctionI<wbr class="">nitializer.h"<br class="">
#include "llvm/CodeGen/MachineFunctionP<wbr class="">ass.h"<br class="">
#include "llvm/CodeGen/Passes.h"<br class="">
#include "llvm/IR/Constants.h"<br class="">
@@ -186,15 +187,19 @@ void MMIAddrLabelMapCallbackPtr::al<wbr class="">lUses<br class="">
<br class="">
//===------------------------<wbr class="">------------------------------<wbr class="">----------------===//<br class="">
<br class="">
-MachineModuleInfo::MachineMod<wbr class="">uleInfo(const MCAsmInfo &MAI,<br class="">
+MachineModuleInfo::MachineMod<wbr class="">uleInfo(const TargetMachine &TM,<br class="">
+ const MCAsmInfo &MAI,<br class="">
const MCRegisterInfo &MRI,<br class="">
- const MCObjectFileInfo *MOFI)<br class="">
- : ImmutablePass(ID), Context(&MAI, &MRI, MOFI, nullptr, false) {<br class="">
+ const MCObjectFileInfo *MOFI,<br class="">
+ MachineFunctionInitializer *MFI)<br class="">
+ : ImmutablePass(ID), TM(TM), Context(&MAI, &MRI, MOFI, nullptr, false),<br class="">
+ MFInitializer(MFI) {<br class="">
<wbr class="">initializeMachineModuleInfoPas<wbr class="">s(*PassRegistry::getPassRegist<wbr class="">ry());<br class="">
}<br class="">
<br class="">
MachineModuleInfo::MachineMod<wbr class="">uleInfo()<br class="">
- : ImmutablePass(ID), Context(nullptr, nullptr, nullptr) {<br class="">
+ : ImmutablePass(ID), TM(*((TargetMachine*)nullptr))<wbr class="">,<br class=""></blockquote><div class=""><br class=""></div></div></div><div class="">This (binding a reference to a dereferenced null pointer) is not OK; it breaks -Werror builds, and LLVM will optimize on the assumption that this is undefined behavior.</div><div class=""><div class="h5"><div class=""> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
+ Context(nullptr, nullptr, nullptr) {<br class="">
llvm_unreachable("This MachineModuleInfo constructor should never be called, "<br class="">
"MMI should always be explicitly constructed by "<br class="">
"LLVMTargetMachine");<br class="">
@@ -213,7 +218,7 @@ bool MachineModuleInfo::doInitializ<wbr class="">ation<br class="">
DbgInfoAvailable = UsesVAFloatArgument = UsesMorestackAddr = false;<br class="">
PersonalityTypeCache = EHPersonality::Unknown;<br class="">
AddrLabelSymbols = nullptr;<br class="">
- TheModule = nullptr;<br class="">
+ TheModule = &M;<br class="">
<br class="">
return false;<br class="">
}<br class="">
@@ -461,3 +466,63 @@ try_next:;<br class="">
FilterIds.push_back(0); // terminator<br class="">
return FilterID;<br class="">
}<br class="">
+<br class="">
+MachineFunction &MachineModuleInfo::getMachine<wbr class="">Function(const Function &F) {<br class="">
+ // Shortcut for the common case where a sequence of MachineFunctionPasses<br class="">
+ // all query for the same Function.<br class="">
+ if (LastRequest == &F)<br class="">
+ return *LastResult;<br class="">
+<br class="">
+ auto I = MachineFunctions.insert(<br class="">
+ std::make_pair(&F, std::unique_ptr<MachineFunctio<wbr class="">n>()));<br class="">
+ MachineFunction *MF;<br class="">
+ if (I.second) {<br class="">
+ // No pre-existing machine function, create a new one.<br class="">
+ MF = new MachineFunction(&F, TM, NextFnNum++, *this);<br class="">
+ // Update the set entry.<br class="">
+ I.first->second.reset(MF);<br class="">
+<br class="">
+ if (MFInitializer)<br class="">
+ if (MFInitializer->initializeMach<wbr class="">ineFunction(*MF))<br class="">
+ report_fatal_error("Unable to initialize machine function");<br class="">
+ } else {<br class="">
+ MF = I.first->second.get();<br class="">
+ }<br class="">
+<br class="">
+ LastRequest = &F;<br class="">
+ LastResult = MF;<br class="">
+ return *MF;<br class="">
+}<br class="">
+<br class="">
+void MachineModuleInfo::deleteMachi<wbr class="">neFunctionFor(Function &F) {<br class="">
+ MachineFunctions.erase(&F);<br class="">
+ LastRequest = nullptr;<br class="">
+ LastResult = nullptr;<br class="">
+}<br class="">
+<br class="">
+namespace {<br class="">
+/// This pass frees the MachineFunction object associated with a Function.<br class="">
+class FreeMachineFunction : public FunctionPass {<br class="">
+public:<br class="">
+ static char ID;<br class="">
+ FreeMachineFunction() : FunctionPass(ID) {}<br class="">
+<br class="">
+ void getAnalysisUsage(AnalysisUsage &AU) const override {<br class="">
+ AU.addRequired<MachineModuleIn<wbr class="">fo>();<br class="">
+ AU.addPreserved<MachineModuleI<wbr class="">nfo>();<br class="">
+ }<br class="">
+<br class="">
+ bool runOnFunction(Function &F) override {<br class="">
+ MachineModuleInfo &MMI = getAnalysis<MachineModuleInfo><wbr class="">();<br class="">
+ MMI.deleteMachineFunctionFor(F<wbr class="">);<br class="">
+ return true;<br class="">
+ }<br class="">
+};<br class="">
+char FreeMachineFunction::ID;<br class="">
+} // end anonymous namespace<br class="">
+<br class="">
+namespace llvm {<br class="">
+FunctionPass *createFreeMachineFunctionPass<wbr class="">() {<br class="">
+ return new FreeMachineFunction();<br class="">
+}<br class="">
+} // end namespace llvm<br class="">
<br class="">
Modified: llvm/trunk/lib/CodeGen/StackMa<wbr class="">pLivenessAnalysis.cpp<br class="">
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/StackMapLivenessAnalysis.cpp?rev=279564&r1=279563&r2=279564&view=diff" rel="noreferrer" target="_blank" class="">http://llvm.org/viewvc/llvm-pr<wbr class="">oject/llvm/trunk/lib/CodeGen/S<wbr class="">tackMapLivenessAnalysis.cpp?re<wbr class="">v=279564&r1=279563&r2=279564&<wbr class="">view=diff</a><br class="">
==============================<wbr class="">==============================<wbr class="">==================<br class="">
--- llvm/trunk/lib/CodeGen/StackMa<wbr class="">pLivenessAnalysis.cpp (original)<br class="">
+++ llvm/trunk/lib/CodeGen/StackMa<wbr class="">pLivenessAnalysis.cpp Tue Aug 23 15:58:29 2016<br class="">
@@ -17,7 +17,6 @@<br class="">
#include "llvm/CodeGen/LivePhysRegs.h"<br class="">
#include "llvm/CodeGen/MachineFrameInfo<wbr class="">.h"<br class="">
#include "llvm/CodeGen/MachineFunction.<wbr class="">h"<br class="">
-#include "llvm/CodeGen/MachineFunctionA<wbr class="">nalysis.h"<br class="">
#include "llvm/CodeGen/MachineFunctionP<wbr class="">ass.h"<br class="">
#include "llvm/CodeGen/Passes.h"<br class="">
#include "llvm/Support/CommandLine.h"<br class="">
<br class="">
Modified: llvm/trunk/lib/Target/AMDGPU/A<wbr class="">MDILCFGStructurizer.cpp<br class="">
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AMDGPU/AMDILCFGStructurizer.cpp?rev=279564&r1=279563&r2=279564&view=diff" rel="noreferrer" target="_blank" class="">http://llvm.org/viewvc/llvm-pr<wbr class="">oject/llvm/trunk/lib/Target/AM<wbr class="">DGPU/AMDILCFGStructurizer.cpp?<wbr class="">rev=279564&r1=279563&r2=279564<wbr class="">&view=diff</a><br class="">
==============================<wbr class="">==============================<wbr class="">==================<br class="">
--- llvm/trunk/lib/Target/AMDGPU/A<wbr class="">MDILCFGStructurizer.cpp (original)<br class="">
+++ llvm/trunk/lib/Target/AMDGPU/A<wbr class="">MDILCFGStructurizer.cpp Tue Aug 23 15:58:29 2016<br class="">
@@ -18,7 +18,6 @@<br class="">
#include "llvm/ADT/Statistic.h"<br class="">
#include "llvm/CodeGen/MachineDominator<wbr class="">s.h"<br class="">
#include "llvm/CodeGen/MachineFunction.<wbr class="">h"<br class="">
-#include "llvm/CodeGen/MachineFunctionA<wbr class="">nalysis.h"<br class="">
#include "llvm/CodeGen/MachineFunctionP<wbr class="">ass.h"<br class="">
#include "llvm/CodeGen/MachineInstrBuil<wbr class="">der.h"<br class="">
#include "llvm/CodeGen/MachineJumpTable<wbr class="">Info.h"<br class="">
@@ -144,11 +143,10 @@ public:<br class="">
}<br class="">
<br class="">
void getAnalysisUsage(AnalysisUsage &AU) const override {<br class="">
- AU.addPreserved<MachineFunctio<wbr class="">nAnalysis>();<br class="">
- AU.addRequired<MachineFunction<wbr class="">Analysis>();<br class="">
AU.addRequired<MachineDominat<wbr class="">orTree>();<br class="">
AU.addRequired<MachinePostDom<wbr class="">inatorTree>();<br class="">
AU.addRequired<MachineLoopInf<wbr class="">o>();<br class="">
+ MachineFunctionPass::getAnalys<wbr class="">isUsage(AU);<br class="">
}<br class="">
<br class="">
/// Perform the CFG structurization<br class="">
<br class="">
Modified: llvm/trunk/lib/Target/Hexagon/<wbr class="">HexagonCommonGEP.cpp<br class="">
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Hexagon/HexagonCommonGEP.cpp?rev=279564&r1=279563&r2=279564&view=diff" rel="noreferrer" target="_blank" class="">http://llvm.org/viewvc/llvm-pr<wbr class="">oject/llvm/trunk/lib/Target/He<wbr class="">xagon/HexagonCommonGEP.cpp?rev<wbr class="">=279564&r1=279563&r2=279564&<wbr class="">view=diff</a><br class="">
==============================<wbr class="">==============================<wbr class="">==================<br class="">
--- llvm/trunk/lib/Target/Hexagon/<wbr class="">HexagonCommonGEP.cpp (original)<br class="">
+++ llvm/trunk/lib/Target/Hexagon/<wbr class="">HexagonCommonGEP.cpp Tue Aug 23 15:58:29 2016<br class="">
@@ -14,7 +14,6 @@<br class="">
#include "llvm/ADT/STLExtras.h"<br class="">
#include "llvm/Analysis/LoopInfo.h"<br class="">
#include "llvm/Analysis/PostDominators.<wbr class="">h"<br class="">
-#include "llvm/CodeGen/MachineFunctionA<wbr class="">nalysis.h"<br class="">
#include "llvm/IR/Constants.h"<br class="">
#include "llvm/IR/Dominators.h"<br class="">
#include "llvm/IR/Function.h"<br class="">
<br class="">
Modified: llvm/trunk/lib/Target/Hexagon/<wbr class="">HexagonGenExtract.cpp<br class="">
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Hexagon/HexagonGenExtract.cpp?rev=279564&r1=279563&r2=279564&view=diff" rel="noreferrer" target="_blank" class="">http://llvm.org/viewvc/llvm-pr<wbr class="">oject/llvm/trunk/lib/Target/He<wbr class="">xagon/HexagonGenExtract.cpp?re<wbr class="">v=279564&r1=279563&r2=279564&<wbr class="">view=diff</a><br class="">
==============================<wbr class="">==============================<wbr class="">==================<br class="">
--- llvm/trunk/lib/Target/Hexagon/<wbr class="">HexagonGenExtract.cpp (original)<br class="">
+++ llvm/trunk/lib/Target/Hexagon/<wbr class="">HexagonGenExtract.cpp Tue Aug 23 15:58:29 2016<br class="">
@@ -8,7 +8,6 @@<br class="">
//===------------------------<wbr class="">------------------------------<wbr class="">----------------===//<br class="">
<br class="">
#include "llvm/ADT/STLExtras.h"<br class="">
-#include "llvm/CodeGen/MachineFunctionA<wbr class="">nalysis.h"<br class="">
#include "llvm/IR/Constants.h"<br class="">
#include "llvm/IR/Dominators.h"<br class="">
#include "llvm/IR/Function.h"<br class="">
@@ -60,7 +59,6 @@ namespace {<br class="">
virtual void getAnalysisUsage(AnalysisUsage &AU) const override {<br class="">
AU.addRequired<DominatorTreeW<wbr class="">rapperPass>();<br class="">
AU.addPreserved<DominatorTree<wbr class="">WrapperPass>();<br class="">
- AU.addPreserved<MachineFunctio<wbr class="">nAnalysis>();<br class="">
FunctionPass::getAnalysisUsag<wbr class="">e(AU);<br class="">
}<br class="">
private:<br class="">
<br class="">
Modified: llvm/trunk/lib/Target/Hexagon/<wbr class="">HexagonNewValueJump.cpp<br class="">
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Hexagon/HexagonNewValueJump.cpp?rev=279564&r1=279563&r2=279564&view=diff" rel="noreferrer" target="_blank" class="">http://llvm.org/viewvc/llvm-pr<wbr class="">oject/llvm/trunk/lib/Target/He<wbr class="">xagon/HexagonNewValueJump.cpp?<wbr class="">rev=279564&r1=279563&r2=279564<wbr class="">&view=diff</a><br class="">
==============================<wbr class="">==============================<wbr class="">==================<br class="">
--- llvm/trunk/lib/Target/Hexagon/<wbr class="">HexagonNewValueJump.cpp (original)<br class="">
+++ llvm/trunk/lib/Target/Hexagon/<wbr class="">HexagonNewValueJump.cpp Tue Aug 23 15:58:29 2016<br class="">
@@ -29,7 +29,6 @@<br class="">
#include "HexagonTargetMachine.h"<br class="">
#include "llvm/ADT/Statistic.h"<br class="">
#include "llvm/CodeGen/LiveVariables.h"<br class="">
-#include "llvm/CodeGen/MachineFunctionA<wbr class="">nalysis.h"<br class="">
#include "llvm/CodeGen/MachineFunctionP<wbr class="">ass.h"<br class="">
#include "llvm/CodeGen/MachineInstrBuil<wbr class="">der.h"<br class="">
#include "llvm/CodeGen/MachineRegisterI<wbr class="">nfo.h"<br class="">
<br class="">
Modified: llvm/trunk/lib/Target/Hexagon/<wbr class="">HexagonOptimizeSZextends.cpp<br class="">
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Hexagon/HexagonOptimizeSZextends.cpp?rev=279564&r1=279563&r2=279564&view=diff" rel="noreferrer" target="_blank" class="">http://llvm.org/viewvc/llvm-pr<wbr class="">oject/llvm/trunk/lib/Target/He<wbr class="">xagon/HexagonOptimizeSZextends<wbr class="">.cpp?rev=279564&r1=279563&r2=2<wbr class="">79564&view=diff</a><br class="">
==============================<wbr class="">==============================<wbr class="">==================<br class="">
--- llvm/trunk/lib/Target/Hexagon/<wbr class="">HexagonOptimizeSZextends.cpp (original)<br class="">
+++ llvm/trunk/lib/Target/Hexagon/<wbr class="">HexagonOptimizeSZextends.cpp Tue Aug 23 15:58:29 2016<br class="">
@@ -12,7 +12,6 @@<br class="">
//<br class="">
//===------------------------<wbr class="">------------------------------<wbr class="">----------------===//<br class="">
<br class="">
-#include "llvm/CodeGen/MachineFunctionA<wbr class="">nalysis.h"<br class="">
#include "llvm/CodeGen/StackProtector.h<wbr class="">"<br class="">
#include "llvm/IR/Function.h"<br class="">
#include "llvm/IR/Instructions.h"<br class="">
@@ -43,8 +42,6 @@ namespace {<br class="">
}<br class="">
<br class="">
void getAnalysisUsage(AnalysisUsage &AU) const override {<br class="">
- AU.addRequired<MachineFunction<wbr class="">Analysis>();<br class="">
- AU.addPreserved<MachineFunctio<wbr class="">nAnalysis>();<br class="">
AU.addPreserved<StackProtecto<wbr class="">r>();<br class="">
FunctionPass::getAnalysisUsag<wbr class="">e(AU);<br class="">
}<br class="">
<br class="">
Modified: llvm/trunk/lib/Target/Hexagon/<wbr class="">HexagonVLIWPacketizer.cpp<br class="">
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Hexagon/HexagonVLIWPacketizer.cpp?rev=279564&r1=279563&r2=279564&view=diff" rel="noreferrer" target="_blank" class="">http://llvm.org/viewvc/llvm-pr<wbr class="">oject/llvm/trunk/lib/Target/He<wbr class="">xagon/HexagonVLIWPacketizer.cp<wbr class="">p?rev=279564&r1=279563&r2=2795<wbr class="">64&view=diff</a><br class="">
==============================<wbr class="">==============================<wbr class="">==================<br class="">
--- llvm/trunk/lib/Target/Hexagon/<wbr class="">HexagonVLIWPacketizer.cpp (original)<br class="">
+++ llvm/trunk/lib/Target/Hexagon/<wbr class="">HexagonVLIWPacketizer.cpp Tue Aug 23 15:58:29 2016<br class="">
@@ -22,7 +22,6 @@<br class="">
#include "HexagonVLIWPacketizer.h"<br class="">
#include "llvm/Analysis/AliasAnalysis.h<wbr class="">"<br class="">
#include "llvm/CodeGen/MachineDominator<wbr class="">s.h"<br class="">
-#include "llvm/CodeGen/MachineFunctionA<wbr class="">nalysis.h"<br class="">
#include "llvm/CodeGen/MachineFunctionP<wbr class="">ass.h"<br class="">
#include "llvm/CodeGen/MachineLoopInfo.<wbr class="">h"<br class="">
#include "llvm/CodeGen/MachineRegisterI<wbr class="">nfo.h"<br class="">
<br class="">
Modified: llvm/trunk/lib/Target/NVPTX/NV<wbr class="">PTXAllocaHoisting.cpp<br class="">
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/NVPTX/NVPTXAllocaHoisting.cpp?rev=279564&r1=279563&r2=279564&view=diff" rel="noreferrer" target="_blank" class="">http://llvm.org/viewvc/llvm-pr<wbr class="">oject/llvm/trunk/lib/Target/NV<wbr class="">PTX/NVPTXAllocaHoisting.cpp?re<wbr class="">v=279564&r1=279563&r2=279564&<wbr class="">view=diff</a><br class="">
==============================<wbr class="">==============================<wbr class="">==================<br class="">
--- llvm/trunk/lib/Target/NVPTX/NV<wbr class="">PTXAllocaHoisting.cpp (original)<br class="">
+++ llvm/trunk/lib/Target/NVPTX/NV<wbr class="">PTXAllocaHoisting.cpp Tue Aug 23 15:58:29 2016<br class="">
@@ -12,7 +12,6 @@<br class="">
//===------------------------<wbr class="">------------------------------<wbr class="">----------------===//<br class="">
<br class="">
#include "NVPTXAllocaHoisting.h"<br class="">
-#include "llvm/CodeGen/MachineFunctionA<wbr class="">nalysis.h"<br class="">
#include "llvm/CodeGen/StackProtector.h<wbr class="">"<br class="">
#include "llvm/IR/Constants.h"<br class="">
#include "llvm/IR/Function.h"<br class="">
@@ -28,7 +27,6 @@ public:<br class="">
NVPTXAllocaHoisting() : FunctionPass(ID) {}<br class="">
<br class="">
void getAnalysisUsage(AnalysisUsage &AU) const override {<br class="">
- AU.addPreserved<MachineFunctio<wbr class="">nAnalysis>();<br class="">
AU.addPreserved<StackProtecto<wbr class="">r>();<br class="">
}<br class="">
<br class="">
<br class="">
Modified: llvm/trunk/lib/Target/NVPTX/NV<wbr class="">PTXGenericToNVVM.cpp<br class="">
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/NVPTX/NVPTXGenericToNVVM.cpp?rev=279564&r1=279563&r2=279564&view=diff" rel="noreferrer" target="_blank" class="">http://llvm.org/viewvc/llvm-pr<wbr class="">oject/llvm/trunk/lib/Target/NV<wbr class="">PTX/NVPTXGenericToNVVM.cpp?rev<wbr class="">=279564&r1=279563&r2=279564&<wbr class="">view=diff</a><br class="">
==============================<wbr class="">==============================<wbr class="">==================<br class="">
--- llvm/trunk/lib/Target/NVPTX/NV<wbr class="">PTXGenericToNVVM.cpp (original)<br class="">
+++ llvm/trunk/lib/Target/NVPTX/NV<wbr class="">PTXGenericToNVVM.cpp Tue Aug 23 15:58:29 2016<br class="">
@@ -15,7 +15,6 @@<br class="">
#include "NVPTX.h"<br class="">
#include "MCTargetDesc/NVPTXBaseInfo.h"<br class="">
#include "NVPTXUtilities.h"<br class="">
-#include "llvm/CodeGen/MachineFunctionA<wbr class="">nalysis.h"<br class="">
#include "llvm/CodeGen/ValueTypes.h"<br class="">
#include "llvm/IR/Constants.h"<br class="">
#include "llvm/IR/DerivedTypes.h"<br class="">
<br class="">
Modified: llvm/trunk/lib/Target/NVPTX/NV<wbr class="">PTXLowerAggrCopies.cpp<br class="">
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/NVPTX/NVPTXLowerAggrCopies.cpp?rev=279564&r1=279563&r2=279564&view=diff" rel="noreferrer" target="_blank" class="">http://llvm.org/viewvc/llvm-pr<wbr class="">oject/llvm/trunk/lib/Target/NV<wbr class="">PTX/NVPTXLowerAggrCopies.cpp?<wbr class="">rev=279564&r1=279563&r2=279564<wbr class="">&view=diff</a><br class="">
==============================<wbr class="">==============================<wbr class="">==================<br class="">
--- llvm/trunk/lib/Target/NVPTX/NV<wbr class="">PTXLowerAggrCopies.cpp (original)<br class="">
+++ llvm/trunk/lib/Target/NVPTX/NV<wbr class="">PTXLowerAggrCopies.cpp Tue Aug 23 15:58:29 2016<br class="">
@@ -14,7 +14,6 @@<br class="">
//===------------------------<wbr class="">------------------------------<wbr class="">----------------===//<br class="">
<br class="">
#include "NVPTXLowerAggrCopies.h"<br class="">
-#include "llvm/CodeGen/MachineFunctionA<wbr class="">nalysis.h"<br class="">
#include "llvm/CodeGen/StackProtector.h<wbr class="">"<br class="">
#include "llvm/IR/Constants.h"<br class="">
#include "llvm/IR/DataLayout.h"<br class="">
@@ -41,7 +40,6 @@ struct NVPTXLowerAggrCopies : public Fun<br class="">
NVPTXLowerAggrCopies() : FunctionPass(ID) {}<br class="">
<br class="">
void getAnalysisUsage(AnalysisUsage &AU) const override {<br class="">
- AU.addPreserved<MachineFunctio<wbr class="">nAnalysis>();<br class="">
AU.addPreserved<StackProtecto<wbr class="">r>();<br class="">
}<br class="">
<br class="">
<br class="">
Modified: llvm/trunk/lib/Target/NVPTX/NV<wbr class="">PTXTargetMachine.cpp<br class="">
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/NVPTX/NVPTXTargetMachine.cpp?rev=279564&r1=279563&r2=279564&view=diff" rel="noreferrer" target="_blank" class="">http://llvm.org/viewvc/llvm-pr<wbr class="">oject/llvm/trunk/lib/Target/NV<wbr class="">PTX/NVPTXTargetMachine.cpp?rev<wbr class="">=279564&r1=279563&r2=279564&<wbr class="">view=diff</a><br class="">
==============================<wbr class="">==============================<wbr class="">==================<br class="">
--- llvm/trunk/lib/Target/NVPTX/NV<wbr class="">PTXTargetMachine.cpp (original)<br class="">
+++ llvm/trunk/lib/Target/NVPTX/NV<wbr class="">PTXTargetMachine.cpp Tue Aug 23 15:58:29 2016<br class="">
@@ -20,7 +20,6 @@<br class="">
#include "NVPTXTargetTransformInfo.h"<br class="">
#include "llvm/Analysis/Passes.h"<br class="">
#include "llvm/CodeGen/AsmPrinter.h"<br class="">
-#include "llvm/CodeGen/MachineFunctionA<wbr class="">nalysis.h"<br class="">
#include "llvm/CodeGen/MachineModuleInf<wbr class="">o.h"<br class="">
#include "llvm/CodeGen/Passes.h"<br class="">
#include "llvm/CodeGen/TargetPassConfig<wbr class="">.h"<br class="">
<br class="">
Modified: llvm/trunk/test/CodeGen/Generi<wbr class="">c/stop-after.ll<br class="">
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Generic/stop-after.ll?rev=279564&r1=279563&r2=279564&view=diff" rel="noreferrer" target="_blank" class="">http://llvm.org/viewvc/llvm-pr<wbr class="">oject/llvm/trunk/test/CodeGen/<wbr class="">Generic/stop-after.ll?rev=<wbr class="">279564&r1=279563&r2=279564&<wbr class="">view=diff</a><br class="">
==============================<wbr class="">==============================<wbr class="">==================<br class="">
--- llvm/trunk/test/CodeGen/Generi<wbr class="">c/stop-after.ll (original)<br class="">
+++ llvm/trunk/test/CodeGen/Generi<wbr class="">c/stop-after.ll Tue Aug 23 15:58:29 2016<br class="">
@@ -3,7 +3,6 @@<br class="">
<br class="">
; STOP: -loop-reduce<br class="">
; STOP: Loop Strength Reduction<br class="">
-; STOP-NEXT: Machine Function Analysis<br class="">
; STOP-NEXT: MIR Printing Pass<br class="">
<br class="">
; START: -machine-branch-prob -pre-isel-intrinsic-lowering<br class="">
<br class="">
Modified: llvm/trunk/test/CodeGen/X86/hi<wbr class="">dden-vis-pic.ll<br class="">
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/hidden-vis-pic.ll?rev=279564&r1=279563&r2=279564&view=diff" rel="noreferrer" target="_blank" class="">http://llvm.org/viewvc/llvm-pr<wbr class="">oject/llvm/trunk/test/CodeGen/<wbr class="">X86/hidden-vis-pic.ll?rev=<wbr class="">279564&r1=279563&r2=279564&<wbr class="">view=diff</a><br class="">
==============================<wbr class="">==============================<wbr class="">==================<br class="">
--- llvm/trunk/test/CodeGen/X86/hi<wbr class="">dden-vis-pic.ll (original)<br class="">
+++ llvm/trunk/test/CodeGen/X86/hi<wbr class="">dden-vis-pic.ll Tue Aug 23 15:58:29 2016<br class="">
@@ -17,7 +17,7 @@ entry:<br class="">
<br class="">
; This must use movl of the stub, not an lea, since the function isn't being<br class="">
; emitted here.<br class="">
-; CHECK: movl L__ZNSbIcED1Ev$non_lazy_ptr-L1<wbr class="">$pb(<br class="">
+; CHECK: movl L__ZNSbIcED1Ev$non_lazy_ptr-L0<wbr class="">$pb(<br class="">
<br class="">
<br class="">
<br class="">
<br class="">
Modified: llvm/trunk/tools/llc/llc.cpp<br class="">
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llc/llc.cpp?rev=279564&r1=279563&r2=279564&view=diff" rel="noreferrer" target="_blank" class="">http://llvm.org/viewvc/llvm-pr<wbr class="">oject/llvm/trunk/tools/llc/llc<wbr class="">.cpp?rev=279564&r1=279563&r2=<wbr class="">279564&view=diff</a><br class="">
==============================<wbr class="">==============================<wbr class="">==================<br class="">
--- llvm/trunk/tools/llc/llc.cpp (original)<br class="">
+++ llvm/trunk/tools/llc/llc.cpp Tue Aug 23 15:58:29 2016<br class="">
@@ -450,8 +450,7 @@ static int compileModule(char **argv, LL<br class="">
LLVMTargetMachine &LLVMTM = static_cast<LLVMTargetMachine&<wbr class="">>(*Target);<br class="">
TargetPassConfig &TPC = *LLVMTM.createPassConfig(PM);<br class="">
PM.add(&TPC);<br class="">
- LLVMTM.addMachineModuleInfo(PM<wbr class="">);<br class="">
- LLVMTM.addMachineFunctionAnaly<wbr class="">sis(PM, MIR.get());<br class="">
+ LLVMTM.addMachineModuleInfo(PM<wbr class="">, MIR.get());<br class="">
TPC.printAndVerify("");<br class="">
<br class="">
for (const std::string &RunPassName : *RunPassNames) {<br class="">
<br class="">
Modified: llvm/trunk/unittests/MI/LiveIn<wbr class="">tervalTest.cpp<br class="">
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/MI/LiveIntervalTest.cpp?rev=279564&r1=279563&r2=279564&view=diff" rel="noreferrer" target="_blank" class="">http://llvm.org/viewvc/llvm-pr<wbr class="">oject/llvm/trunk/unittests/MI/<wbr class="">LiveIntervalTest.cpp?rev=27956<wbr class="">4&r1=279563&r2=279564&view=<wbr class="">diff</a><br class="">
==============================<wbr class="">==============================<wbr class="">==================<br class="">
--- llvm/trunk/unittests/MI/LiveIn<wbr class="">tervalTest.cpp (original)<br class="">
+++ llvm/trunk/unittests/MI/LiveIn<wbr class="">tervalTest.cpp Tue Aug 23 15:58:29 2016<br class="">
@@ -70,8 +70,7 @@ std::unique_ptr<Module> parseMIR(LLVMCon<br class="">
return nullptr;<br class="">
<br class="">
const LLVMTargetMachine &LLVMTM = static_cast<const LLVMTargetMachine&>(TM);<br class="">
- LLVMTM.addMachineModuleInfo(PM<wbr class="">);<br class="">
- LLVMTM.addMachineFunctionAnaly<wbr class="">sis(PM, MIR.get());<br class="">
+ LLVMTM.addMachineModuleInfo(PM<wbr class="">, MIR.get());<br class="">
<br class="">
return M;<br class="">
}<br class="">
<br class="">
<br class="">
______________________________<wbr class="">_________________<br class="">
llvm-commits mailing list<br class="">
<a href="mailto:llvm-commits@lists.llvm.org" target="_blank" class="">llvm-commits@lists.llvm.org</a><br class="">
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank" class="">http://lists.llvm.org/cgi-bin/<wbr class="">mailman/listinfo/llvm-commits</a><br class="">
</blockquote></div></div></div><br class=""></div></div>
</blockquote></div><br class=""></div>
</div></blockquote></div><br class=""></body></html>