[cfe-commits] r67032 - in /cfe/trunk: lib/Lex/Preprocessor.cpp lib/Sema/SemaTemplateInstantiate.cpp test/SemaTemplate/instantiate-array.cpp
Anders Carlsson
andersca at mac.com
Sun Mar 15 13:12:14 PDT 2009
Author: andersca
Date: Sun Mar 15 15:12:13 2009
New Revision: 67032
URL: http://llvm.org/viewvc/llvm-project?rev=67032&view=rev
Log:
(Hopefully) instantiate dependent array types correctly.
Added:
cfe/trunk/test/SemaTemplate/instantiate-array.cpp
Modified:
cfe/trunk/lib/Lex/Preprocessor.cpp
cfe/trunk/lib/Sema/SemaTemplateInstantiate.cpp
Modified: cfe/trunk/lib/Lex/Preprocessor.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Lex/Preprocessor.cpp?rev=67032&r1=67031&r2=67032&view=diff
==============================================================================
--- cfe/trunk/lib/Lex/Preprocessor.cpp (original)
+++ cfe/trunk/lib/Lex/Preprocessor.cpp Sun Mar 15 15:12:13 2009
@@ -488,6 +488,9 @@
else if (0) // STDC94 ?
DefineBuiltinMacro(Buf, "__STDC_VERSION__=199409L");
+ if (PP.getLangOptions().CPlusPlus0x)
+ DefineBuiltinMacro(Buf, "__GXX_EXPERIMENTAL_CXX0X__");
+
if (PP.getLangOptions().Freestanding)
DefineBuiltinMacro(Buf, "__STDC_HOSTED__=0");
else
Modified: cfe/trunk/lib/Sema/SemaTemplateInstantiate.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaTemplateInstantiate.cpp?rev=67032&r1=67031&r2=67032&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaTemplateInstantiate.cpp (original)
+++ cfe/trunk/lib/Sema/SemaTemplateInstantiate.cpp Sun Mar 15 15:12:13 2009
@@ -283,9 +283,27 @@
TemplateTypeInstantiator::
InstantiateDependentSizedArrayType(const DependentSizedArrayType *T,
unsigned Quals) const {
- // FIXME: Implement this
- assert(false && "Cannot instantiate DependentSizedArrayType yet");
- return QualType();
+ Expr *ArraySize = T->getSizeExpr();
+ assert(ArraySize->isValueDependent() &&
+ "dependent sized array types must have value dependent size expr");
+
+ // Instantiate the element type if needed
+ QualType ElementType = T->getElementType();
+ if (ElementType->isDependentType()) {
+ ElementType = Instantiate(ElementType);
+ if (ElementType.isNull())
+ return QualType();
+ }
+
+ // Instantiate the size expression
+ Sema::OwningExprResult InstantiatedArraySize =
+ SemaRef.InstantiateExpr(ArraySize, TemplateArgs, NumTemplateArgs);
+ if (InstantiatedArraySize.isInvalid())
+ return QualType();
+
+ return SemaRef.BuildArrayType(ElementType, T->getSizeModifier(),
+ (Expr *)InstantiatedArraySize.release(),
+ T->getIndexTypeQualifier(), Loc, Entity);
}
QualType
Added: cfe/trunk/test/SemaTemplate/instantiate-array.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaTemplate/instantiate-array.cpp?rev=67032&view=auto
==============================================================================
--- cfe/trunk/test/SemaTemplate/instantiate-array.cpp (added)
+++ cfe/trunk/test/SemaTemplate/instantiate-array.cpp Sun Mar 15 15:12:13 2009
@@ -0,0 +1,28 @@
+// RUN: clang -fsyntax-only -verify %s -std=c++0x
+
+#ifndef __GXX_EXPERIMENTAL_CXX0X__
+#define __CONCAT(__X, __Y) __CONCAT1(__X, __Y)
+#define __CONCAT1(__X, __Y) __X ## __Y
+
+#define static_assert(__b, __m) \
+ typedef int __CONCAT(__sa, __LINE__)[__b ? 1 : -1]
+#endif
+
+template <int N> class IntArray {
+ int elems[N];
+};
+
+static_assert(sizeof(IntArray<10>) == sizeof(int) * 10, "Array size mismatch");
+static_assert(sizeof(IntArray<1>) == sizeof(int) * 1, "Array size mismatch");
+
+template <typename T> class TenElementArray {
+ int elems[10];
+};
+
+static_assert(sizeof(TenElementArray<int>) == sizeof(int) * 10, "Array size mismatch");
+
+template<typename T, int N> class Array {
+ T elems[N];
+};
+
+static_assert(sizeof(Array<int, 10>) == sizeof(int) * 10, "Array size mismatch");
More information about the cfe-commits
mailing list