aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Lattner <sabre@nondot.org>2010-06-27 01:08:03 +0000
committerChris Lattner <sabre@nondot.org>2010-06-27 01:08:03 +0000
commitf70d857cbd79b24cb69f4990e31175e95e679a31 (patch)
tree7b9489c4e1cdbee0f59e70ee5fe9f2240fcfc0a2
parent35b21b884e5c3447a52a74d7ffaba966b07ac81f (diff)
merge two tests.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@106971 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--test/CodeGen/2008-12-02-logical-or-fold.c4
-rw-r--r--test/CodeGen/exprs.c6
2 files changed, 6 insertions, 4 deletions
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
index 167c5c194f..0000000000
--- 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 010e6e3cf5..b3cf9133bd 100644
--- 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;
+}