Prep for merging 3.4: Undo changes from 3.3 branch

test/CodeGenCXX/throw-expressions.cpp

Index: test/CodeGenCXX/throw-expressions.cpp
diff --git a/test/CodeGenCXX/throw-expressions.cpp b/test/CodeGenCXX/throw-expressions.cpp
index ba8a86881a63de3907ec8ee16f0734ef22252c7c..f04185b23f1b91d08d8ee5443aa5b9dafaece029 100644
--- a/test/CodeGenCXX/throw-expressions.cpp
+++ b/test/CodeGenCXX/throw-expressions.cpp
@@ -1,4 +1,5 @@
-// RUN: %clang_cc1 -fcxx-exceptions -fexceptions -Wno-unreachable-code -Werror -triple x86_64-linux-gnu -emit-llvm -o - %s | FileCheck %s
+// RUN: %clang_cc1 -fcxx-exceptions -fexceptions -emit-llvm-only -verify %s -Wno-unreachable-code
+// expected-no-diagnostics
 
 int val = 42;
 int& test1() {
@@ -18,28 +19,3 @@ void test3() {
 int test4() {
   return 1 ? throw val : val;
 }
-
-// PR15923
-int test5(bool x, bool y, int z) {
-  return (x ? throw 1 : y) ? z : throw 2;
-}
-// CHECK: define i32 @_Z5test5bbi(
-// CHECK: br i1
-//
-// x.true:
-// CHECK: call void @__cxa_throw(
-// CHECK-NEXT: unreachable
-//
-// x.false:
-// CHECK: br i1
-//
-// y.true:
-// CHECK: load i32*
-// CHECK: br label
-//
-// y.false:
-// CHECK: call void @__cxa_throw(
-// CHECK-NEXT: unreachable
-//
-// end:
-// CHECK: ret i32