diff options
| author | Eli Friedman <eli.friedman@gmail.com> | 2008-12-02 16:02:46 +0000 |
|---|---|---|
| committer | Eli Friedman <eli.friedman@gmail.com> | 2008-12-02 16:02:46 +0000 |
| commit | e918435f949259fc02a1dd1bc265456d466d2e4c (patch) | |
| tree | 8f92ba0d5949f661b67cf45259a2bb3fee586eba /clang/lib | |
| parent | 9af949105a949cce7177cce2e3e235456b2c5730 (diff) | |
| download | bcm5719-llvm-e918435f949259fc02a1dd1bc265456d466d2e4c.tar.gz bcm5719-llvm-e918435f949259fc02a1dd1bc265456d466d2e4c.zip | |
Fix for PR3150: obvious copy-paste bug in
ScalarExprEmitter::VisitBinLOr.
llvm-svn: 60415
Diffstat (limited to 'clang/lib')
| -rw-r--r-- | clang/lib/CodeGen/CGExprScalar.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/CodeGen/CGExprScalar.cpp b/clang/lib/CodeGen/CGExprScalar.cpp index 8c4303b467c..7f417b374aa 100644 --- a/clang/lib/CodeGen/CGExprScalar.cpp +++ b/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"); |
