RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-02-10 06:25:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Modify the mapping from landing pad to call sites to accept more than one call

Browse Source 
site.

llvm-svn: 141226
This commit is contained in:
Bill Wendling 2011-10-05 22:24:35 +00:00
parent 94f80818c1
commit 7a40520a37
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
View File

@ -5250,7 +5250,7 @@ void SelectionDAGBuilder::LowerCallTo(ImmutableCallSite CS, SDValue Callee,
unsigned CallSiteIndex = MMI.getCurrentCallSite();
if (CallSiteIndex) {
MMI.setCallSiteBeginLabel(BeginLabel, CallSiteIndex);
LPadToCallSiteMap[LandingPad] = CallSiteIndex;
LPadToCallSiteMap[LandingPad].push_back(CallSiteIndex);
// Now that the call site is handled, stop tracking it.
MMI.setCurrentCallSite(0);

4
lib/CodeGen/SelectionDAG/SelectionDAGBuilder.h
View File

@ -320,8 +320,8 @@ public:
/// GFI - Garbage collection metadata for the function.
GCFunctionInfo *GFI;
/// LPadToBeginLabelMap - Map a landing pad to the begin label.
DenseMap<MachineBasicBlock*, unsigned> LPadToCallSiteMap;
/// LPadToCallSiteMap - Map a landing pad to the call site indexes.
DenseMap<MachineBasicBlock*, SmallVector<unsigned, 4> > LPadToCallSiteMap;
/// HasTailCall - This is set to true if a call in the current
/// block has been translated as a tail call. In this case,

3
lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
View File

@ -691,6 +691,9 @@ void SelectionDAGISel::PrepareEHLandingPad() {
// landing pad can thus be detected via the MachineModuleInfo.
MCSymbol *Label = MF->getMMI().addLandingPad(MBB);
// Assign the call site to the landing pad's begin label.
MF->getMMI().setCallSiteLandingPad(Label, SDB->LPadToCallSiteMap[MBB]);
const MCInstrDesc &II = TM.getInstrInfo()->get(TargetOpcode::EH_LABEL);
BuildMI(*MBB, FuncInfo->InsertPt, SDB->getCurDebugLoc(), II)
.addSym(Label);