[llvm-branch-commits] [llvm-branch] r79273 - in /llvm/branches/Apple/Leela: docs/ExceptionHandling.html include/llvm/CodeGen/MachineFunction.h include/llvm/Intrinsics.td lib/CodeGen/AsmPrinter/DwarfException.cpp lib/CodeGen/MachineFunction.cpp lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp
Bill Wendling
isanbard at gmail.com
Mon Aug 17 13:31:06 PDT 2009
Author: void
Date: Mon Aug 17 15:31:06 2009
New Revision: 79273
URL: http://llvm.org/viewvc/llvm-project?rev=79273&view=rev
Log:
$ svn merge -c 79272 https://llvm.org/svn/llvm-project/llvm/trunk
--- Merging r79272 into '.':
U include/llvm/Intrinsics.td
U include/llvm/CodeGen/MachineFunction.h
U docs/ExceptionHandling.html
U lib/CodeGen/AsmPrinter/DwarfException.cpp
U lib/CodeGen/MachineFunction.cpp
U lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp
Modified:
llvm/branches/Apple/Leela/docs/ExceptionHandling.html
llvm/branches/Apple/Leela/include/llvm/CodeGen/MachineFunction.h
llvm/branches/Apple/Leela/include/llvm/Intrinsics.td
llvm/branches/Apple/Leela/lib/CodeGen/AsmPrinter/DwarfException.cpp
llvm/branches/Apple/Leela/lib/CodeGen/MachineFunction.cpp
llvm/branches/Apple/Leela/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp
Modified: llvm/branches/Apple/Leela/docs/ExceptionHandling.html
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Leela/docs/ExceptionHandling.html?rev=79273&r1=79272&r2=79273&view=diff
==============================================================================
--- llvm/branches/Apple/Leela/docs/ExceptionHandling.html (original)
+++ llvm/branches/Apple/Leela/docs/ExceptionHandling.html Mon Aug 17 15:31:06 2009
@@ -34,7 +34,6 @@
<li><a href="#llvm_eh_sjlj_setjmp"><tt>llvm.eh.sjlj.setjmp</tt></a></li>
<li><a href="#llvm_eh_sjlj_longjmp"><tt>llvm.eh.sjlj.longjmp</tt></a></li>
<li><a href="#llvm_eh_sjlj_lsda"><tt>llvm.eh.sjlj.lsda</tt></a></li>
- <li><a href="#llvm_eh_sjlj_callsite"><tt>llvm.eh.sjlj.callsite</tt></a></li>
</ol></li>
<li><a href="#asm">Asm Table Formats</a>
<ol>
@@ -449,23 +448,6 @@
</div>
<!-- ======================================================================= -->
-<div class="doc_subsubsection">
- <a name="llvm_eh_sjlj_callsite">llvm.eh.sjlj.callsite</a>
-</div>
-
-<div class="doc_text">
-<pre>
- void %<a href="#llvm_eh_sjlj_callsite">llvm.eh.sjlj.callsite</a>(i32)
-</pre>
-
-<p>The SJLJ front-end allocates call site indices for invoke instrucitons.
-These values are passed to the back-end via the
-<a href="#llvm_eh_sjlj_callsite"><tt>llvm.eh.sjlj.callsite</tt></a>
-intrinsic, where they are used to build the LSDA call-site table.</p>
-
-</div>
-
-<!-- ======================================================================= -->
<div class="doc_section">
<a name="asm">Asm Table Formats</a>
</div>
Modified: llvm/branches/Apple/Leela/include/llvm/CodeGen/MachineFunction.h
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Leela/include/llvm/CodeGen/MachineFunction.h?rev=79273&r1=79272&r2=79273&view=diff
==============================================================================
--- llvm/branches/Apple/Leela/include/llvm/CodeGen/MachineFunction.h (original)
+++ llvm/branches/Apple/Leela/include/llvm/CodeGen/MachineFunction.h Mon Aug 17 15:31:06 2009
@@ -115,15 +115,6 @@
// The alignment of the function.
unsigned Alignment;
- // The currently active call_site value
- unsigned CallSiteIndex;
-
- // The largest call_site value encountered
- unsigned MaxCallSiteIndex;
-
- // Call sites mapped to corresponding landing pads
- std::map<MachineBasicBlock*, unsigned> LandingPadCallSiteIndexMap;
-
public:
MachineFunction(Function *Fn, const TargetMachine &TM);
~MachineFunction();
@@ -169,41 +160,6 @@
///
void setAlignment(unsigned A) { Alignment = A; }
- /// getCallSiteIndex() - Get the current call site index
- ///
- unsigned getCallSiteIndex() { return CallSiteIndex; }
-
- /// setCallSiteIndex() - Set the current call site index
- ///
- void setCallSiteIndex(unsigned Idx) {
- CallSiteIndex = Idx;
- if (CallSiteIndex > MaxCallSiteIndex)
- MaxCallSiteIndex = CallSiteIndex;
- }
-
- /// getMaxCallSiteIndex() - Get the largest call site index issued
- ///
- unsigned getMaxCallSiteIndex() { return MaxCallSiteIndex; }
-
- /// setCallSiteIndexLandingPad() - Map the call site to a landing pad
- ///
- void setLandingPadCallSiteIndex(MachineBasicBlock *LandingPad,
- unsigned CallSite) {
- LandingPadCallSiteIndexMap[LandingPad] = CallSite;
- }
-
- /// getCallSiteIndexLandingPad() - Get landing pad for the call site index
- ///
- unsigned getLandingPadCallSiteIndex(MachineBasicBlock *LandingPad) {
- return LandingPadCallSiteIndexMap[LandingPad];
- }
-
- /// getCallSiteCount() - Get the count of call site entries
- ///
- unsigned getCallSiteCount() {
- return LandingPadCallSiteIndexMap.size();
- }
-
/// MachineFunctionInfo - Keep track of various per-function pieces of
/// information for backends that would like to do so.
///
Modified: llvm/branches/Apple/Leela/include/llvm/Intrinsics.td
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Leela/include/llvm/Intrinsics.td?rev=79273&r1=79272&r2=79273&view=diff
==============================================================================
--- llvm/branches/Apple/Leela/include/llvm/Intrinsics.td (original)
+++ llvm/branches/Apple/Leela/include/llvm/Intrinsics.td Mon Aug 17 15:31:06 2009
@@ -309,7 +309,6 @@
def int_eh_sjlj_setjmp : Intrinsic<[llvm_i32_ty], [llvm_ptr_ty]>;
def int_eh_sjlj_longjmp : Intrinsic<[llvm_void_ty], [llvm_ptr_ty]>;
def int_eh_sjlj_lsda : Intrinsic<[llvm_ptr_ty]>;
- def int_eh_sjlj_callsite: Intrinsic<[llvm_void_ty], [llvm_i32_ty]>;
}
//===---------------- Generic Variable Attribute Intrinsics----------------===//
Modified: llvm/branches/Apple/Leela/lib/CodeGen/AsmPrinter/DwarfException.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Leela/lib/CodeGen/AsmPrinter/DwarfException.cpp?rev=79273&r1=79272&r2=79273&view=diff
==============================================================================
--- llvm/branches/Apple/Leela/lib/CodeGen/AsmPrinter/DwarfException.cpp (original)
+++ llvm/branches/Apple/Leela/lib/CodeGen/AsmPrinter/DwarfException.cpp Mon Aug 17 15:31:06 2009
@@ -640,9 +640,6 @@
Asm->EmitULEB128Bytes(SizeSites);
Asm->EOL("Call-site table length");
-
- assert(MF->getCallSiteCount() == CallSites.size());
-
// Emit the landing pad site information.
unsigned idx = 0;
for (SmallVectorImpl<CallSiteEntry>::const_iterator
Modified: llvm/branches/Apple/Leela/lib/CodeGen/MachineFunction.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Leela/lib/CodeGen/MachineFunction.cpp?rev=79273&r1=79272&r2=79273&view=diff
==============================================================================
--- llvm/branches/Apple/Leela/lib/CodeGen/MachineFunction.cpp (original)
+++ llvm/branches/Apple/Leela/lib/CodeGen/MachineFunction.cpp Mon Aug 17 15:31:06 2009
@@ -93,9 +93,6 @@
MachineConstantPool(TM.getTargetData());
Alignment = TM.getTargetLowering()->getFunctionAlignment(F);
- CallSiteIndex = 0;
- MaxCallSiteIndex = 0;
-
// Set up jump table.
const TargetData &TD = *TM.getTargetData();
bool IsPic = TM.getRelocationModel() == Reloc::PIC_;
Modified: llvm/branches/Apple/Leela/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Leela/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp?rev=79273&r1=79272&r2=79273&view=diff
==============================================================================
--- llvm/branches/Apple/Leela/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp (original)
+++ llvm/branches/Apple/Leela/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp Mon Aug 17 15:31:06 2009
@@ -4086,11 +4086,6 @@
Offset));
return 0;
}
- case Intrinsic::eh_sjlj_callsite: {
- MachineFunction &MF = DAG.getMachineFunction();
- MF.setCallSiteIndex(cast<ConstantSDNode>(getValue(I.getOperand(1)))->getZExtValue());
- return 0;
- }
case Intrinsic::convertff:
case Intrinsic::convertfsi:
case Intrinsic::convertfui:
@@ -4454,14 +4449,10 @@
}
if (LandingPad && MMI) {
- MachineFunction &MF = DAG.getMachineFunction();
// Insert a label before the invoke call to mark the try range. This can be
// used to detect deletion of the invoke via the MachineModuleInfo.
BeginLabel = MMI->NextLabelID();
- // Map this landing pad to the current call site entry
- MF.setLandingPadCallSiteIndex(LandingPad, MF.getCallSiteIndex());
-
// Both PendingLoads and PendingExports must be flushed here;
// this call might not return.
(void)getRoot();
More information about the llvm-branch-commits
mailing list