commit 98710fc4f549f70a094690c70272cb6cbda6fb02
author Richard Smith <richard-llvm@metafoo.co.uk> Thu Nov 13 23:03:19 2014 +0000
committer Richard Smith <richard-llvm@metafoo.co.uk> Thu Nov 13 23:03:19 2014 +0000
tree caedd9da1957ade7437488d331b5b654389443e7
parent da59f3de450d31b8bc9f21e217d45f6f9ceeadd7

Fix assert/crash on invalid with __builtin_constant_p conditionals in constant expressions.

llvm-svn: 221942

clang/lib/AST/ExprConstant.cpp

diff --git a/clang/lib/AST/ExprConstant.cpp b/clang/lib/AST/ExprConstant.cpp
index 2ce5ac5..ea28d74 100644
--- a/clang/lib/AST/ExprConstant.cpp
+++ b/clang/lib/AST/ExprConstant.cpp
@@ -8971,7 +8971,11 @@
   if (!E->isCXX11ConstantExpr(Ctx, &Result, Loc))
     return false;
 
-  assert(Result.isInt() && "pointer cast to int is not an ICE");
+  if (!Result.isInt()) {
+    if (Loc) *Loc = E->getExprLoc();
+    return false;
+  }
+
   if (Value) *Value = Result.getInt();
   return true;
 }