Revert r66423, which was not the right fix for this issue.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@66431 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Sema/SemaTemplateInstantiate.cpp b/lib/Sema/SemaTemplateInstantiate.cpp
index c9a9f43..faeebc0 100644
--- a/lib/Sema/SemaTemplateInstantiate.cpp
+++ b/lib/Sema/SemaTemplateInstantiate.cpp
@@ -134,7 +134,9 @@
// BuildArrayType. Since we have already checked the size as part of
// creating the dependent array type in the first place, we know
// there aren't any errors.
- IntegerLiteral ArraySize(T->getSize(), SemaRef.Context.getSizeType(), Loc);
+ // FIXME: Is IntTy big enough? Maybe not, but LongLongTy causes
+ // problems that I have yet to investigate.
+ IntegerLiteral ArraySize(T->getSize(), SemaRef.Context.IntTy, Loc);
return SemaRef.BuildArrayType(ElementType, T->getSizeModifier(),
&ArraySize, T->getIndexTypeQualifier(),
Loc, Entity);