Tweak to Expr::isIntegerConstantExpr...make sure the result is appropriately size...

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

diff --git a/AST/Expr.cpp b/AST/Expr.cpp
index 8f1335c33386388628e1bc1fc6ac6822ef256246..44e8271bdb5129385842dba0ae982ac702e4b835 100644 (file)
--- a/AST/Expr.cpp
+++ b/AST/Expr.cpp
@@ -305,9 +305,12 @@ bool Expr::isIntegerConstantExpr(llvm::APSInt &Result, ASTContext &Ctx,
     Result.setIsUnsigned(!getType()->isSignedIntegerType());
     break;
   }
-  case TypesCompatibleExprClass:
-    Result = cast<TypesCompatibleExpr>(this)->typesAreCompatible();
+  case TypesCompatibleExprClass: {
+    const TypesCompatibleExpr *TCE = cast<TypesCompatibleExpr>(this);
+    Result.zextOrTrunc(Ctx.getTypeSize(getType(), TCE->getLocStart()));                              
+    Result = TCE->typesAreCompatible();
     break;
+  }
   case DeclRefExprClass:
     if (const EnumConstantDecl *D = 
           dyn_cast<EnumConstantDecl>(cast<DeclRefExpr>(this)->getDecl())) {