Prep for merging 3.4: Undo changes from 3.3 branch

lib/CodeGen/CodeGenFunction.cpp

Index: lib/CodeGen/CodeGenFunction.cpp
diff --git a/lib/CodeGen/CodeGenFunction.cpp b/lib/CodeGen/CodeGenFunction.cpp
index 75c60edbba531e0754eda5217a6bb328ab42c14d..791c1a81525f498d692bd104b575b2c9045d1b58 100644
--- a/lib/CodeGen/CodeGenFunction.cpp
+++ b/lib/CodeGen/CodeGenFunction.cpp
@@ -928,16 +928,6 @@ void CodeGenFunction::EmitBranchOnBoolExpr(const Expr *Cond,
     return;
   }
 
-  if (const CXXThrowExpr *Throw = dyn_cast<CXXThrowExpr>(Cond)) {
-    // Conditional operator handling can give us a throw expression as a
-    // condition for a case like:
-    //   br(c ? throw x : y, t, f) -> br(c, br(throw x, t, f), br(y, t, f)
-    // Fold this to:
-    //   br(c, throw x, br(y, t, f))
-    EmitCXXThrowExpr(Throw, /*KeepInsertionPoint*/false);
-    return;
-  }
-
   // Emit the code with the fully general case.
   llvm::Value *CondV = EvaluateExprAsBool(Cond);
   Builder.CreateCondBr(CondV, TrueBlock, FalseBlock);