From db42a3e876e1ff37a692380cc226cd155eda60cd Mon Sep 17 00:00:00 2001
From: Eli Friedman <eli.friedman@gmail.com>
Date: Sat, 9 Apr 2011 19:54:33 +0000
Subject: Make sure we or together the overflow flags of the multiply and add,
 so the check is triggered appropriately.  Reported on cfe-dev.

llvm-svn: 129231
---
 clang/lib/CodeGen/CGExprCXX.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'clang/lib/CodeGen')

diff --git a/clang/lib/CodeGen/CGExprCXX.cpp b/clang/lib/CodeGen/CGExprCXX.cpp
index 8eee4a0..777036b 100644
--- a/clang/lib/CodeGen/CGExprCXX.cpp
+++ b/clang/lib/CodeGen/CGExprCXX.cpp
@@ -595,7 +595,7 @@ static llvm::Value *EmitCXXNewAllocSize(ASTContext &Context,
       Size = CGF.Builder.CreateExtractValue(AddRes, 0);
 
       llvm::Value *AddDidOverflow = CGF.Builder.CreateExtractValue(AddRes, 1);
-      DidOverflow = CGF.Builder.CreateAnd(DidOverflow, AddDidOverflow);
+      DidOverflow = CGF.Builder.CreateOr(DidOverflow, AddDidOverflow);
     }
 
     Size = CGF.Builder.CreateSelect(DidOverflow,
-- 
cgit v1.1