merge two tests.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@106971 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/test/CodeGen/2008-12-02-logical-or-fold.c b/test/CodeGen/2008-12-02-logical-or-fold.c
deleted file mode 100644 (file)
index 167c5c1..0000000
--- a/test/CodeGen/2008-12-02-logical-or-fold.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// RUN: %clang_cc1 -emit-llvm -o - %s | grep "ret i32 1"
-// PR3150
-
-int a() {return 1||1;}

diff --git a/test/CodeGen/exprs.c b/test/CodeGen/exprs.c
index 010e6e3cf515daaef9ae067c0854e9738f499bfe..b3cf9133bdac1f43e639f7cae6826076d299212c 100644 (file)
--- a/test/CodeGen/exprs.c
+++ b/test/CodeGen/exprs.c
@@ -131,3 +131,9 @@ int f11(long X) {
 // CHECK-NEXT: load i32*
 }
 
+int f12() {
+  // PR3150
+  // CHECK: define i32 @f12
+  // CHECK: ret i32 1
+  return 1||1;
+}