commit 5536daa627b508299007b735a588bf4e88825bb3
author Eli Friedman <eli.friedman@gmail.com> Sat Apr 09 19:54:33 2011 +0000
committer Eli Friedman <eli.friedman@gmail.com> Sat Apr 09 19:54:33 2011 +0000
tree a148a4a71dbcdee3627bbf0f0068044d4a1d95cd
parent 067bbd0e11c71a33b51832532e836971be697699

Make sure we or together the overflow flags of the multiply and add, so the
check is triggered appropriately.  Reported on cfe-dev.



git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@129231 91177308-0d34-0410-b5e6-96231b3b80d8

lib/CodeGen/CGExprCXX.cpp

diff --git a/lib/CodeGen/CGExprCXX.cpp b/lib/CodeGen/CGExprCXX.cpp
index 8eee4a0..777036b 100644
--- a/lib/CodeGen/CGExprCXX.cpp
+++ b/lib/CodeGen/CGExprCXX.cpp
@@ -595,7 +595,7 @@
       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,