commit 6c6bbfab1967a9c10b6d2d4c63d4519d3d1a374f
author Richard Smith <richard-llvm@metafoo.co.uk> Tue Apr 08 12:19:28 2014 +0000
committer Richard Smith <richard-llvm@metafoo.co.uk> Tue Apr 08 12:19:28 2014 +0000
tree ba1a5588822da087762d34fc09ade7c1cfb0bbb5
parent 7955feb82f2b91358dab5de7afd2e3fe55da46b0

PR19346: Adding 0 to a null pointer has defined behavior in C++. Allow it in constant expressions.

llvm-svn: 205757

clang/lib/AST/ExprConstant.cpp

diff --git a/clang/lib/AST/ExprConstant.cpp b/clang/lib/AST/ExprConstant.cpp
index 9c69080..16c5a52 100644
--- a/clang/lib/AST/ExprConstant.cpp
+++ b/clang/lib/AST/ExprConstant.cpp
@@ -968,7 +968,7 @@
       // any object: we won't use such a designator for anything.
       if (!Info.getLangOpts().CPlusPlus11)
         Designator.setInvalid();
-      return checkNullPointer(Info, E, CSK) &&
+      return (CSK == CSK_ArrayToPointer || checkNullPointer(Info, E, CSK)) &&
              Designator.checkSubobject(Info, E, CSK);
     }
 
@@ -986,7 +986,7 @@
         Designator.addComplexUnchecked(EltTy, Imag);
     }
     void adjustIndex(EvalInfo &Info, const Expr *E, uint64_t N) {
-      if (checkNullPointer(Info, E, CSK_ArrayIndex))
+      if (N && checkNullPointer(Info, E, CSK_ArrayIndex))
         Designator.adjustIndex(Info, E, N);
     }
   };