[llvm-branch-commits] [llvm-tag] r103098 - in /llvm/tags/Apple/llvmCore-2328.4: ./ lib/Analysis/DebugInfo.cpp lib/CodeGen/AsmPrinter/DwarfDebug.cpp lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp lib/Target/ARM/Thumb1RegisterInfo.cpp test/DebugInfo/2010-05-03-DisableFramePtr.ll test/DebugInfo/2010-05-03-OriginDIE.ll
Bill Wendling
isanbard at gmail.com
Wed May 5 11:05:13 PDT 2010
Author: void
Date: Wed May 5 13:05:13 2010
New Revision: 103098
URL: http://llvm.org/viewvc/llvm-project?rev=103098&view=rev
Log:
llvmCore-2328.3 + r103002, r102993, r102980, r102992.
Added:
llvm/tags/Apple/llvmCore-2328.4/ (props changed)
- copied from r103095, llvm/tags/Apple/llvmCore-2328.3/
llvm/tags/Apple/llvmCore-2328.4/test/DebugInfo/2010-05-03-DisableFramePtr.ll
- copied unchanged from r103002, llvm/branches/Apple/Morbo/test/DebugInfo/2010-05-03-DisableFramePtr.ll
llvm/tags/Apple/llvmCore-2328.4/test/DebugInfo/2010-05-03-OriginDIE.ll
- copied unchanged from r102992, llvm/branches/Apple/Morbo/test/DebugInfo/2010-05-03-OriginDIE.ll
Modified:
llvm/tags/Apple/llvmCore-2328.4/lib/Analysis/DebugInfo.cpp
llvm/tags/Apple/llvmCore-2328.4/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
llvm/tags/Apple/llvmCore-2328.4/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
llvm/tags/Apple/llvmCore-2328.4/lib/Target/ARM/Thumb1RegisterInfo.cpp
Propchange: llvm/tags/Apple/llvmCore-2328.4/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed May 5 13:05:13 2010
@@ -0,0 +1,22 @@
+Debug
+Release
+Release-Asserts
+mklib
+Makefile.config
+config.log
+config.status
+cvs.out
+autom4te.cache
+configure.out
+LLVM-*
+_distcheckdir
+llvm.spec
+svn-commit.*
+*.patch
+*.patch.raw
+cscope.*
+Debug+Coverage-Asserts
+Release+Coverage-Asserts
+Debug+Coverage
+Release+Coverage
+Debug+Checks
Propchange: llvm/tags/Apple/llvmCore-2328.4/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed May 5 13:05:13 2010
@@ -0,0 +1,3 @@
+/llvm/branches/Apple/Hermes:96832,96835,96858,96870,96876,96879
+/llvm/branches/Apple/Morbo:102992,103002
+/llvm/trunk:98602,98604,98612,98615-98616,98675,98686,98743-98744,98768,98773,98778,98780,98810,98835,98839,98845,98855,98862,98881,98920,98977,99032-99033,99043,99196,99223,99263,99282-99284,99306,99319-99321,99324,99336,99378,99418,99423,99429,99440,99455,99463,99465,99469,99484,99490,99492-99494,99507,99524,99537,99539-99540,99544,99570,99575,99598,99620,99629-99630,99636,99671,99692,99695,99697,99699,99722,99816,99835-99836,99845-99846,99848,99850,99855,99879,99881-99883,99895,99899,99910,99916,99919,99952-99954,99957,99959,99974-99975,99982,99984-99986,99988,99992-99993,99995,99997-99999,100016,100035,100037-100038,100042,100044,100056,100072,100074,100078,100081-100090,100092,100094-100095,100116,100134,100184,100209,100214-100218,100220-100221,100223-100225,100231,100250,100252,100257,100261,100304,100332,100353,100384,100454-100455,100457,100466,100478,100480,100487,100494,100497,100505,100521,100553,100568,100584,100592,100609-100610,100636,100710,100736,100742,1007
51,100768-100769,100771,100781,100797,100804,100837,100867,100892,100936-100937,101011,101023,101075,101077,101079,101081,101085,101154,101158,101162,101165,101181,101190,101202,101282,101303,101314-101315,101317,101331,101343,101383,101392,101420,101453,101604,101615,101629,101684-101686,101805,101845,101847,101851,101855,101870,101879,101897,101925,101930,101965,102120,102225,102358,102394,102405,102421,102454,102463,102468,102470,102481,102486,102504-102505,102508-102510,102513,102519,102524,102526,102531,102646,102672,102980,102993,103001
Modified: llvm/tags/Apple/llvmCore-2328.4/lib/Analysis/DebugInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/tags/Apple/llvmCore-2328.4/lib/Analysis/DebugInfo.cpp?rev=103098&r1=103095&r2=103098&view=diff
==============================================================================
--- llvm/tags/Apple/llvmCore-2328.4/lib/Analysis/DebugInfo.cpp (original)
+++ llvm/tags/Apple/llvmCore-2328.4/lib/Analysis/DebugInfo.cpp Wed May 5 13:05:13 2010
@@ -1150,10 +1150,8 @@
for (Function::iterator FI = (*I).begin(), FE = (*I).end(); FI != FE; ++FI)
for (BasicBlock::iterator BI = (*FI).begin(), BE = (*FI).end(); BI != BE;
++BI) {
- if (DbgDeclareInst *DDI = dyn_cast<DbgDeclareInst>(BI)) {
+ if (DbgDeclareInst *DDI = dyn_cast<DbgDeclareInst>(BI))
processDeclare(DDI);
- continue;
- }
DebugLoc Loc = BI->getDebugLoc();
if (Loc.isUnknown())
Modified: llvm/tags/Apple/llvmCore-2328.4/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/tags/Apple/llvmCore-2328.4/lib/CodeGen/AsmPrinter/DwarfDebug.cpp?rev=103098&r1=103095&r2=103098&view=diff
==============================================================================
--- llvm/tags/Apple/llvmCore-2328.4/lib/CodeGen/AsmPrinter/DwarfDebug.cpp (original)
+++ llvm/tags/Apple/llvmCore-2328.4/lib/CodeGen/AsmPrinter/DwarfDebug.cpp Wed May 5 13:05:13 2010
@@ -1305,9 +1305,6 @@
// DW_TAG_inlined_subroutine may refer to this DIE.
ModuleCU->insertDIE(SP.getNode(), SPDie);
- if (!DisableFramePointerElim(*Asm->MF))
- addUInt(SPDie, dwarf::DW_AT_APPLE_omit_frame_ptr, dwarf::DW_FORM_flag, 1);
-
return SPDie;
}
@@ -2507,8 +2504,12 @@
AE = AbstractScopesList.end(); AI != AE; ++AI)
constructScopeDIE(*AI);
- constructScopeDIE(CurrentFnDbgScope);
+ DIE *CurFnDIE = constructScopeDIE(CurrentFnDbgScope);
+ if (!DisableFramePointerElim(*MF))
+ addUInt(CurFnDIE, dwarf::DW_AT_APPLE_omit_frame_ptr,
+ dwarf::DW_FORM_flag, 1);
+
DebugFrames.push_back(FunctionDebugFrameInfo(SubprogramCount,
MMI->getFrameMoves()));
}
Modified: llvm/tags/Apple/llvmCore-2328.4/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/tags/Apple/llvmCore-2328.4/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp?rev=103098&r1=103095&r2=103098&view=diff
==============================================================================
--- llvm/tags/Apple/llvmCore-2328.4/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp (original)
+++ llvm/tags/Apple/llvmCore-2328.4/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp Wed May 5 13:05:13 2010
@@ -368,7 +368,8 @@
else {
MachineInstr *Def = RegInfo->getVRegDef(Reg);
MachineBasicBlock::iterator InsertPos = Def;
- EntryMBB->insert(llvm::next(InsertPos), MI);
+ // FIXME: VR def may not be in entry block.
+ Def->getParent()->insert(llvm::next(InsertPos), MI);
}
}
Modified: llvm/tags/Apple/llvmCore-2328.4/lib/Target/ARM/Thumb1RegisterInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/tags/Apple/llvmCore-2328.4/lib/Target/ARM/Thumb1RegisterInfo.cpp?rev=103098&r1=103095&r2=103098&view=diff
==============================================================================
--- llvm/tags/Apple/llvmCore-2328.4/lib/Target/ARM/Thumb1RegisterInfo.cpp (original)
+++ llvm/tags/Apple/llvmCore-2328.4/lib/Target/ARM/Thumb1RegisterInfo.cpp Wed May 5 13:05:13 2010
@@ -461,6 +461,13 @@
Offset -= AFI->getFramePtrSpillOffset();
}
+ // Special handling of dbg_value instructions.
+ if (MI.isDebugValue()) {
+ MI.getOperand(i). ChangeToRegister(FrameReg, false /*isDef*/);
+ MI.getOperand(i+1).ChangeToImmediate(Offset);
+ return 0;
+ }
+
unsigned Opcode = MI.getOpcode();
const TargetInstrDesc &Desc = MI.getDesc();
unsigned AddrMode = (Desc.TSFlags & ARMII::AddrModeMask);
More information about the llvm-branch-commits
mailing list