From e01d966ce22e90a3d007bbb60a88c6b553bb74b5 Mon Sep 17 00:00:00 2001
From: Chris Lattner <sabre@nondot.org>
Date: Sun, 27 Jun 2010 01:08:03 +0000
Subject: [PATCH] merge two tests.

llvm-svn: 106971
---
 clang/test/CodeGen/2008-12-02-logical-or-fold.c | 4 ----
 clang/test/CodeGen/exprs.c                      | 6 ++++++
 2 files changed, 6 insertions(+), 4 deletions(-)
 delete mode 100644 clang/test/CodeGen/2008-12-02-logical-or-fold.c

diff --git a/clang/test/CodeGen/2008-12-02-logical-or-fold.c b/clang/test/CodeGen/2008-12-02-logical-or-fold.c
deleted file mode 100644
index 167c5c194f7a..000000000000
--- a/clang/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/clang/test/CodeGen/exprs.c b/clang/test/CodeGen/exprs.c
index 010e6e3cf515..b3cf9133bdac 100644
--- a/clang/test/CodeGen/exprs.c
+++ b/clang/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;
+}