Commit b6ca36f4 authored by Tanya Lattner's avatar Tanya Lattner
Browse files

Merge from mainline. 

First initialize DAG otherwise dwarf writer is used uninitialized.
Duncan spotted this. Thanks!

llvm-svn: 63793
parent f9b2580a

llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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);

llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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)