summaryrefslogtreecommitdiffstats
path: root/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
diff options
context:
space:
mode:
authorKrasimir Georgiev <krasimir@google.com>2018-10-16 18:50:09 +0000
committerKrasimir Georgiev <krasimir@google.com>2018-10-16 18:50:09 +0000
commit547d824da661fedaeeda3a4bcb83a3464fa1b7b9 (patch)
tree008630b0dc9e8141304feb83e81695e22d98b5fe /llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
parentae4e75fd6e89cb7706b218f54ea16a0bbdb9a0c2 (diff)
downloadbcm5719-llvm-547d824da661fedaeeda3a4bcb83a3464fa1b7b9.tar.gz
bcm5719-llvm-547d824da661fedaeeda3a4bcb83a3464fa1b7b9.zip
Revert "[WebAssembly] LSDA info generation"
This reverts commit r344575. Newly introduced test eh-lsda.ll.test fails with use-after-free under ASAN build. llvm-svn: 344639
Diffstat (limited to 'llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp')
-rw-r--r--llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
index 2e0456edef7..be4a219efe5 100644
--- a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
+++ b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
@@ -6288,12 +6288,12 @@ SelectionDAGBuilder::visitIntrinsicCall(const CallInst &I, unsigned Intrinsic) {
return nullptr;
}
- case Intrinsic::wasm_landingpad_index:
- // Information this intrinsic contained has been transferred to
- // MachineFunction in SelectionDAGISel::PrepareEHLandingPad. We can safely
- // delete it now.
+ case Intrinsic::wasm_landingpad_index: {
+ // TODO store landing pad index in a map, which will be used when generating
+ // LSDA information
return nullptr;
}
+ }
}
void SelectionDAGBuilder::visitConstrainedFPIntrinsic(
@@ -6450,7 +6450,7 @@ SelectionDAGBuilder::lowerInvokable(TargetLowering::CallLoweringInfo &CLI,
WinEHFuncInfo *EHInfo = DAG.getMachineFunction().getWinEHFuncInfo();
EHInfo->addIPToStateRange(cast<InvokeInst>(CLI.CS.getInstruction()),
BeginLabel, EndLabel);
- } else if (!isScopedEHPersonality(Pers)) {
+ } else {
MF.addInvoke(FuncInfo.MBBMap[EHPadBB], BeginLabel, EndLabel);
}
}
OpenPOWER on IntegriCloud