Fix for PR3150: obvious copy-paste bug in

ScalarExprEmitter::VisitBinLOr.

llvm-svn: 60415

clang/lib/CodeGen/CGExprScalar.cpp

@@ -1077,9 +1077,9 @@ Value *ScalarExprEmitter::VisitBinLOr(const BinaryOperator *E) {
       return Builder.CreateZExt(RHSCond, CGF.LLVMIntTy, "lor.ext");
     }
     
-    // 1 || RHS: If it is safe, just elide the RHS, and return 0.
+    // 1 || RHS: If it is safe, just elide the RHS, and return 1.
     if (!CGF.ContainsLabel(E->getRHS()))
-      return llvm::Constant::getNullValue(CGF.LLVMIntTy);
+      return llvm::ConstantInt::get(CGF.LLVMIntTy, 1);
   }
   
   llvm::BasicBlock *ContBlock = CGF.createBasicBlock("lor.end");

clang/test/CodeGen/2008-12-02-logical-or-fold.c

@@ -0,0 +1,4 @@
+// RUN: clang -emit-llvm -o - %s | grep "store i32 1"
+// PR3150
+
+int a() {return 1||1;}