Revert 49006 for the moment.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@49046 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/DwarfWriter.cpp b/lib/CodeGen/DwarfWriter.cpp
index 3296e11..e72ff07 100644
--- a/lib/CodeGen/DwarfWriter.cpp
+++ b/lib/CodeGen/DwarfWriter.cpp
@@ -2778,13 +2778,9 @@
std::vector<FunctionEHFrameInfo> EHFrames;
- /// shouldEmit - Per-function flag to indicate if EH information should
- /// be emitted.
+ /// shouldEmit - Flag to indicate if debug information should be emitted.
+ ///
bool shouldEmit;
-
- /// shouldEmitModule - Per-module flag to indicate if EH information should
- /// be emitted.
- bool shouldEmitModule;
/// EmitCommonEHFrame - Emit the common eh unwind frame.
///
@@ -3372,7 +3368,6 @@
DwarfException(std::ostream &OS, AsmPrinter *A, const TargetAsmInfo *T)
: Dwarf(OS, A, T, "eh")
, shouldEmit(false)
- , shouldEmitModule(false)
{}
virtual ~DwarfException() {}
@@ -3392,7 +3387,7 @@
/// EndModule - Emit all exception information that should come after the
/// content.
void EndModule() {
- if (!shouldEmitModule) return;
+ if (!shouldEmit) return;
const std::vector<Function *> Personalities = MMI->getPersonalities();
for (unsigned i =0; i < Personalities.size(); ++i)
@@ -3408,14 +3403,13 @@
void BeginFunction(MachineFunction *MF) {
this->MF = MF;
- shouldEmit = false;
- if ((ExceptionHandling || !MF->getFunction()->doesNotThrow()) &&
+ if (MMI &&
+ ExceptionHandling &&
TAI->doesSupportExceptionHandling()) {
shouldEmit = true;
// Assumes in correct section after the entry point.
EmitLabel("eh_func_begin", ++SubprogramCount);
}
- shouldEmitModule |= shouldEmit;
}
/// EndFunction - Gather and emit post-function exception information.
diff --git a/lib/CodeGen/LLVMTargetMachine.cpp b/lib/CodeGen/LLVMTargetMachine.cpp
index 67c0e47..bae7140 100644
--- a/lib/CodeGen/LLVMTargetMachine.cpp
+++ b/lib/CodeGen/LLVMTargetMachine.cpp
@@ -66,7 +66,8 @@
PM.add(createGCLoweringPass());
- PM.add(createLowerInvokePass(getTargetLowering()));
+ if (!ExceptionHandling)
+ PM.add(createLowerInvokePass(getTargetLowering()));
// Make sure that no unreachable blocks are instruction selected.
PM.add(createUnreachableBlockEliminationPass());
@@ -191,7 +192,8 @@
PM.add(createGCLoweringPass());
- PM.add(createLowerInvokePass(getTargetLowering()));
+ if (!ExceptionHandling)
+ PM.add(createLowerInvokePass(getTargetLowering()));
// Make sure that no unreachable blocks are instruction selected.
PM.add(createUnreachableBlockEliminationPass());
diff --git a/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp b/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
index ae2b418..80b5c04 100644
--- a/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
+++ b/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
@@ -169,7 +169,6 @@
Function &Fn;
MachineFunction &MF;
MachineRegisterInfo &RegInfo;
- bool needsExceptionHandling;
FunctionLoweringInfo(TargetLowering &TLI, Function &Fn,MachineFunction &MF);
@@ -305,10 +304,6 @@
BuildMI(MBB, TII->get(TargetInstrInfo::PHI), PHIReg+i);
}
}
-
- // Figure out whether we need to generate EH info. Currently we do this for
- // all functions not marked no-unwind, or if requested via -enable-eh.
- needsExceptionHandling = ExceptionHandling || !Fn.doesNotThrow();
}
/// CreateRegForValue - Allocate the appropriate number of virtual registers of
@@ -2832,7 +2827,7 @@
}
case Intrinsic::eh_exception: {
- if (FuncInfo.needsExceptionHandling) {
+ if (ExceptionHandling) {
if (!CurMBB->isLandingPad()) {
// FIXME: Mark exception register as live in. Hack for PR1508.
unsigned Reg = TLI.getExceptionAddressRegister();
@@ -2857,7 +2852,7 @@
MVT::ValueType VT = (Intrinsic == Intrinsic::eh_selector_i32 ?
MVT::i32 : MVT::i64);
- if (FuncInfo.needsExceptionHandling && MMI) {
+ if (ExceptionHandling && MMI) {
if (CurMBB->isLandingPad())
addCatchInfo(I, MMI, CurMBB);
else {
@@ -2907,7 +2902,7 @@
case Intrinsic::eh_return: {
MachineModuleInfo *MMI = DAG.getMachineModuleInfo();
- if (MMI && FuncInfo.needsExceptionHandling) {
+ if (MMI && ExceptionHandling) {
MMI->setCallsEHReturn(true);
DAG.setRoot(DAG.getNode(ISD::EH_RETURN,
MVT::Other,
@@ -2930,7 +2925,7 @@
}
case Intrinsic::eh_dwarf_cfa: {
- if (FuncInfo.needsExceptionHandling) {
+ if (ExceptionHandling) {
MVT::ValueType VT = getValue(I.getOperand(1)).getValueType();
SDOperand CfaArg;
if (MVT::getSizeInBits(VT) > MVT::getSizeInBits(TLI.getPointerTy()))
@@ -3181,7 +3176,7 @@
Args.push_back(Entry);
}
- if (LandingPad && FuncInfo.needsExceptionHandling && MMI) {
+ if (LandingPad && ExceptionHandling && MMI) {
// 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();
@@ -3200,7 +3195,7 @@
setValue(CS.getInstruction(), Result.first);
DAG.setRoot(Result.second);
- if (LandingPad && FuncInfo.needsExceptionHandling && MMI) {
+ if (LandingPad && ExceptionHandling && MMI) {
// Insert a label at the end of the invoke call to mark the try range. This
// can be used to detect deletion of the invoke via the MachineModuleInfo.
EndLabel = MMI->NextLabelID();
@@ -4619,7 +4614,7 @@
FunctionLoweringInfo FuncInfo(TLI, Fn, MF);
- if (FuncInfo.needsExceptionHandling)
+ if (ExceptionHandling)
for (Function::iterator I = Fn.begin(), E = Fn.end(); I != E; ++I)
if (InvokeInst *Invoke = dyn_cast<InvokeInst>(I->getTerminator()))
// Mark landing pad.
@@ -4762,7 +4757,7 @@
MachineModuleInfo *MMI = DAG.getMachineModuleInfo();
- if (FuncInfo.needsExceptionHandling && MMI && BB->isLandingPad()) {
+ if (ExceptionHandling && MMI && BB->isLandingPad()) {
// Add a label to mark the beginning of the landing pad. Deletion of the
// landing pad can thus be detected via the MachineModuleInfo.
unsigned LabelID = MMI->addLandingPad(BB);