[llvm-commits] [llvm] r94097 - in /llvm/trunk: include/llvm/CodeGen/MachineModuleInfo.h include/llvm/Function.h lib/CodeGen/AsmPrinter/DwarfException.cpp lib/CodeGen/MachineModuleInfo.cpp lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp lib/CodeGen/SjLjEHPrepare.cpp
Jim Grosbach
grosbach at apple.com
Thu Jan 21 12:10:23 PST 2010
Author: grosbach
Date: Thu Jan 21 14:10:22 2010
New Revision: 94097
URL: http://llvm.org/viewvc/llvm-project?rev=94097&view=rev
Log:
back this out for now. Growing Function is not good.
Modified:
llvm/trunk/include/llvm/CodeGen/MachineModuleInfo.h
llvm/trunk/include/llvm/Function.h
llvm/trunk/lib/CodeGen/AsmPrinter/DwarfException.cpp
llvm/trunk/lib/CodeGen/MachineModuleInfo.cpp
llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
llvm/trunk/lib/CodeGen/SjLjEHPrepare.cpp
Modified: llvm/trunk/include/llvm/CodeGen/MachineModuleInfo.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/MachineModuleInfo.h?rev=94097&r1=94096&r2=94097&view=diff
==============================================================================
--- llvm/trunk/include/llvm/CodeGen/MachineModuleInfo.h (original)
+++ llvm/trunk/include/llvm/CodeGen/MachineModuleInfo.h Thu Jan 21 14:10:22 2010
@@ -113,11 +113,7 @@
// LandingPads - List of LandingPadInfo describing the landing pad information
// in the current function.
std::vector<LandingPadInfo> LandingPads;
-
- // Map of invoke call site index values to associated begin EH_LABEL for
- // the current function.
- DenseMap<unsigned, unsigned> CallSiteMap;
-
+
// TypeInfos - List of C++ TypeInfo used in the current function.
//
std::vector<GlobalVariable *> TypeInfos;
@@ -302,19 +298,7 @@
const std::vector<LandingPadInfo> &getLandingPads() const {
return LandingPads;
}
-
- /// setCallSiteBeginLabel - Map the begin label for a call site
- void setCallSiteBeginLabel(unsigned BeginLabel, unsigned Site) {
- CallSiteMap[BeginLabel] = Site;
- }
-
- /// getCallSiteBeginLabel - Get the call site number for a begin label
- unsigned getCallSiteBeginLabel(unsigned BeginLabel) {
- assert(CallSiteMap.count(BeginLabel) &&
- "Missing call site number for EH_LABEL!");
- return CallSiteMap[BeginLabel];
- }
-
+
/// getTypeInfos - Return a reference to the C++ typeinfo for the current
/// function.
const std::vector<GlobalVariable *> &getTypeInfos() const {
Modified: llvm/trunk/include/llvm/Function.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Function.h?rev=94097&r1=94096&r2=94097&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Function.h (original)
+++ llvm/trunk/include/llvm/Function.h Thu Jan 21 14:10:22 2010
@@ -24,7 +24,6 @@
#include "llvm/Argument.h"
#include "llvm/Attributes.h"
#include "llvm/Support/Compiler.h"
-#include "llvm/ADT/DenseMap.h"
namespace llvm {
@@ -87,8 +86,6 @@
mutable ArgumentListType ArgumentList; ///< The formal arguments
ValueSymbolTable *SymTab; ///< Symbol table of args/instructions
AttrListPtr AttributeList; ///< Parameter attributes
- DenseMap<Instruction*, unsigned>
- CallSiteNumbering; ///< SjLj EH call site numbering
// HasLazyArguments is stored in Value::SubclassData.
/*bool HasLazyArguments;*/
@@ -168,19 +165,7 @@
setValueSubclassData((getSubclassDataFromValue() & 1) |
(static_cast<unsigned>(CC) << 1));
}
-
- /// setCallSiteNumber - Set the call site number mapping for an invoke
- /// in the function
- void setCallSiteNumber(Instruction *II, unsigned Num) {
- CallSiteNumbering[II] = Num;
- }
-
- /// getCallSiteNumber - Get the call site number for an invoke instruction
- unsigned getCallSiteNumber(Instruction *II) {
- if (CallSiteNumbering.count(II) == 0) return 0;
- return CallSiteNumbering[II];
- }
-
+
/// getAttributes - Return the attribute list for this Function.
///
const AttrListPtr &getAttributes() const { return AttributeList; }
Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfException.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfException.cpp?rev=94097&r1=94096&r2=94097&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfException.cpp (original)
+++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfException.cpp Thu Jan 21 14:10:22 2010
@@ -590,16 +590,7 @@
}
// Otherwise, create a new call-site.
- if (MAI->getExceptionHandlingType() == ExceptionHandling::Dwarf)
- CallSites.push_back(Site);
- else {
- // SjLj EH must maintain the call sites in the order assigned
- // to them by the SjLjPrepare pass.
- unsigned SiteNo = MMI->getCallSiteBeginLabel(BeginLabel);
- if (CallSites.size() < SiteNo)
- CallSites.resize(SiteNo);
- CallSites[SiteNo - 1] = Site;
- }
+ CallSites.push_back(Site);
PreviousIsInvoke = true;
} else {
// Create a gap.
Modified: llvm/trunk/lib/CodeGen/MachineModuleInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/MachineModuleInfo.cpp?rev=94097&r1=94096&r2=94097&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/MachineModuleInfo.cpp (original)
+++ llvm/trunk/lib/CodeGen/MachineModuleInfo.cpp Thu Jan 21 14:10:22 2010
@@ -71,7 +71,6 @@
// Clean up exception info.
LandingPads.clear();
- CallSiteMap.clear();
TypeInfos.clear();
FilterIds.clear();
FilterEnds.clear();
Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp?rev=94097&r1=94096&r2=94097&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp Thu Jan 21 14:10:22 2010
@@ -5049,12 +5049,6 @@
// used to detect deletion of the invoke via the MachineModuleInfo.
BeginLabel = MMI->NextLabelID();
- // Keep track of which landing pads go with which invokes. SjLj uses
- // this to maintain the ordering of pads in the LSDA. Dwarf ignores it.
- Function *F = LandingPad->getParent()->getFunction();
- MMI->setCallSiteBeginLabel(BeginLabel,
- F->getCallSiteNumber(CS.getInstruction()));
-
// Both PendingLoads and PendingExports must be flushed here;
// this call might not return.
(void)getRoot();
Modified: llvm/trunk/lib/CodeGen/SjLjEHPrepare.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SjLjEHPrepare.cpp?rev=94097&r1=94096&r2=94097&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/SjLjEHPrepare.cpp (original)
+++ llvm/trunk/lib/CodeGen/SjLjEHPrepare.cpp Thu Jan 21 14:10:22 2010
@@ -474,10 +474,8 @@
// At this point, we are all set up, update the invoke instructions
// to mark their call_site values, and fill in the dispatch switch
// accordingly.
- for (unsigned i = 0, e = Invokes.size(); i != e; ++i) {
- F.setCallSiteNumber(Invokes[i], i+1);
+ for (unsigned i = 0, e = Invokes.size(); i != e; ++i)
markInvokeCallSite(Invokes[i], i+1, CallSite, DispatchSwitch);
- }
// The front end has likely added calls to _Unwind_Resume. We need
// to find those calls and mark the call_site as -1 immediately prior.
More information about the llvm-commits
mailing list