[llvm-commits] [llvm] r63793 - in /llvm/branches/release_25/lib/CodeGen/SelectionDAG: SelectionDAG.cpp SelectionDAGISel.cpp

[Tanya Lattner]

Author: tbrethou
Date: Wed Feb  4 17:20:50 2009
New Revision: 63793

URL: http://llvm.org/viewvc/llvm-project?rev=63793&view=rev
Log:
Merge from mainline.
First initialize DAG otherwise dwarf writer is used uninitialized.
Duncan spotted this. Thanks!

Modified:
    llvm/branches/release_25/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
    llvm/branches/release_25/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp

Modified: llvm/branches/release_25/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_25/lib/CodeGen/SelectionDAG/SelectionDAG.cpp?rev=63793&r1=63792&r2=63793&view=diff

==============================================================================
--- llvm/branches/release_25/lib/CodeGen/SelectionDAG/SelectionDAG.cpp (original)
+++ llvm/branches/release_25/lib/CodeGen/SelectionDAG/SelectionDAG.cpp Wed Feb  4 17:20:50 2009
@@ -787,7 +787,7 @@
 }
 
 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);

Modified: llvm/branches/release_25/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_25/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp?rev=63793&r1=63792&r2=63793&view=diff

==============================================================================
--- llvm/branches/release_25/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp (original)
+++ llvm/branches/release_25/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp Wed Feb  4 17:20:50 2009
@@ -313,10 +313,10 @@
   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)