Index: lib/CodeGen/CGException.cpp |
diff --git a/lib/CodeGen/CGException.cpp b/lib/CodeGen/CGException.cpp |
index a088d78641fa7fae8469dff2f059cbb1c3c09a29..36642bcc48ffee023dd4a4659f9b18d37945168c 100644 |
--- a/lib/CodeGen/CGException.cpp |
+++ b/lib/CodeGen/CGException.cpp |
@@ -419,16 +419,14 @@ llvm::Value *CodeGenFunction::getSelectorFromSlot() { |
return Builder.CreateLoad(getEHSelectorSlot(), "sel"); |
} |
-void CodeGenFunction::EmitCXXThrowExpr(const CXXThrowExpr *E, |
- bool KeepInsertionPoint) { |
+void CodeGenFunction::EmitCXXThrowExpr(const CXXThrowExpr *E) { |
if (!E->getSubExpr()) { |
EmitNoreturnRuntimeCallOrInvoke(getReThrowFn(CGM), |
ArrayRef<llvm::Value*>()); |
// throw is an expression, and the expression emitters expect us |
// to leave ourselves at a valid insertion point. |
- if (KeepInsertionPoint) |
- EmitBlock(createBasicBlock("throw.cont")); |
+ EmitBlock(createBasicBlock("throw.cont")); |
return; |
} |
@@ -442,8 +440,7 @@ void CodeGenFunction::EmitCXXThrowExpr(const CXXThrowExpr *E, |
CGM.getObjCRuntime().EmitThrowStmt(*this, S, false); |
// This will clear insertion point which was not cleared in |
// call to EmitThrowStmt. |
- if (KeepInsertionPoint) |
- EmitBlock(createBasicBlock("throw.cont")); |
+ EmitBlock(createBasicBlock("throw.cont")); |
return; |
} |
@@ -481,8 +478,7 @@ void CodeGenFunction::EmitCXXThrowExpr(const CXXThrowExpr *E, |
// throw is an expression, and the expression emitters expect us |
// to leave ourselves at a valid insertion point. |
- if (KeepInsertionPoint) |
- EmitBlock(createBasicBlock("throw.cont")); |
+ EmitBlock(createBasicBlock("throw.cont")); |
} |
void CodeGenFunction::EmitStartEHSpec(const Decl *D) { |