diff options
| author | Tanya Lattner <tonic@nondot.org> | 2009-02-04 23:20:50 +0000 |
|---|---|---|
| committer | Tanya Lattner <tonic@nondot.org> | 2009-02-04 23:20:50 +0000 |
| commit | ee9a19c189d19700a4b06b6975a3b10472d619fc (patch) | |
| tree | 8d3aec45a04c1060f6e8f36c69fd96ee38bb1da4 | |
| parent | 2097f1b25c42f6c3426d846c19340d69613dac3f (diff) | |
Merge from mainline.
First initialize DAG otherwise dwarf writer is used uninitialized.
Duncan spotted this. Thanks!
git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_25@63793 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/CodeGen/SelectionDAG/SelectionDAG.cpp | 2 | ||||
| -rw-r--r-- | lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/CodeGen/SelectionDAG/SelectionDAG.cpp b/lib/CodeGen/SelectionDAG/SelectionDAG.cpp index c34211505a..82cc3263ed 100644 --- a/lib/CodeGen/SelectionDAG/SelectionDAG.cpp +++ b/lib/CodeGen/SelectionDAG/SelectionDAG.cpp @@ -787,7 +787,7 @@ unsigned SelectionDAG::getMVTAlignment(MVT VT) const { } SelectionDAG::SelectionDAG(TargetLowering &tli, FunctionLoweringInfo &fli) - : TLI(tli), FLI(fli), + : TLI(tli), FLI(fli), DW(0), EntryNode(ISD::EntryToken, getVTList(MVT::Other)), Root(getEntryNode()) { AllNodes.push_back(&EntryNode); diff --git a/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp b/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp index 9c53fc9362..9d480e68b5 100644 --- a/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp +++ b/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp @@ -313,10 +313,10 @@ bool SelectionDAGISel::runOnFunction(Function &Fn) { RegInfo = &MF->getRegInfo(); DOUT << "\n\n\n=== " << Fn.getName() << "\n"; - FuncInfo->set(Fn, *MF, *CurDAG, EnableFastISel); MachineModuleInfo *MMI = getAnalysisIfAvailable<MachineModuleInfo>(); DwarfWriter *DW = getAnalysisIfAvailable<DwarfWriter>(); CurDAG->init(*MF, MMI, DW); + FuncInfo->set(Fn, *MF, *CurDAG, EnableFastISel); SDL->init(GFI, *AA); for (Function::iterator I = Fn.begin(), E = Fn.end(); I != E; ++I) |