[cfe-commits] r71634 - in /cfe/trunk: lib/AST/ASTContext.cpp test/Sema/types.c
Chris Lattner
sabre at nondot.org
Tue May 12 21:13:10 PDT 2009
Author: lattner
Date: Tue May 12 23:12:56 2009
New Revision: 71634
URL: http://llvm.org/viewvc/llvm-project?rev=71634&view=rev
Log:
Fix rdar://6880874 - [sema] crash on array types with different index sizes
Modified:
cfe/trunk/lib/AST/ASTContext.cpp
cfe/trunk/test/Sema/types.c
Modified: cfe/trunk/lib/AST/ASTContext.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/ASTContext.cpp?rev=71634&r1=71633&r2=71634&view=diff
==============================================================================
--- cfe/trunk/lib/AST/ASTContext.cpp (original)
+++ cfe/trunk/lib/AST/ASTContext.cpp Tue May 12 23:12:56 2009
@@ -1133,9 +1133,14 @@
/// getConstantArrayType - Return the unique reference to the type for an
/// array of the specified element type.
QualType ASTContext::getConstantArrayType(QualType EltTy,
- const llvm::APInt &ArySize,
+ const llvm::APInt &ArySizeIn,
ArrayType::ArraySizeModifier ASM,
unsigned EltTypeQuals) {
+ // Convert the array size into a canonical width matching the pointer size for
+ // the target.
+ llvm::APInt ArySize(ArySizeIn);
+ ArySize.zextOrTrunc(Target.getPointerWidth(EltTy.getAddressSpace()));
+
llvm::FoldingSetNodeID ID;
ConstantArrayType::Profile(ID, EltTy, ArySize, ASM, EltTypeQuals);
Modified: cfe/trunk/test/Sema/types.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Sema/types.c?rev=71634&r1=71633&r2=71634&view=diff
==============================================================================
--- cfe/trunk/test/Sema/types.c (original)
+++ cfe/trunk/test/Sema/types.c Tue May 12 23:12:56 2009
@@ -19,3 +19,14 @@
int __int128_t;
int __uint128_t;
}
+
+
+// Array type merging should convert array size to whatever matches the target
+// pointer size.
+// rdar://6880874
+extern int i[1LL];
+int i[(short)1];
+
+enum e { e_1 };
+extern int j[sizeof(enum e)]; // expected-note {{previous definition}}
+int j[42]; // expected-error {{redefinition of 'j' with a different type}}
More information about the cfe-commits
mailing list