From 662ba69a15f201f34a702bf62fcfe957fc2824f0 Mon Sep 17 00:00:00 2001 From: Zhongxing Xu Date: Tue, 5 Jan 2010 09:27:03 +0000 Subject: Revert r92318. Instead fix the analyzer: do not call ASTContext::hasSameUnqualifiedType() when one of the type is VariableArrayType. llvm-svn: 92723 --- clang/lib/AST/ASTContext.cpp | 7 ------- 1 file changed, 7 deletions(-) (limited to 'clang/lib/AST/ASTContext.cpp') diff --git a/clang/lib/AST/ASTContext.cpp b/clang/lib/AST/ASTContext.cpp index ad10aa38edb..fe962806091 100644 --- a/clang/lib/AST/ASTContext.cpp +++ b/clang/lib/AST/ASTContext.cpp @@ -2383,7 +2383,6 @@ QualType ASTContext::getUnqualifiedArrayType(QualType T, assert(!T.hasQualifiers() && "canonical array type has qualifiers!"); const ArrayType *AT = cast(T); QualType Elt = AT->getElementType(); - assert(Elt.isCanonical()); QualType UnqualElt = getUnqualifiedArrayType(Elt, Quals); if (Elt == UnqualElt) return T; @@ -2397,12 +2396,6 @@ QualType ASTContext::getUnqualifiedArrayType(QualType T, return getIncompleteArrayType(UnqualElt, IAT->getSizeModifier(), 0); } - if (const VariableArrayType *VAT = dyn_cast(T)) { - return getVariableArrayType(UnqualElt, VAT->getSizeExpr()->Retain(), - VAT->getSizeModifier(), 0, - SourceRange()); - } - const DependentSizedArrayType *DSAT = cast(T); return getDependentSizedArrayType(UnqualElt, DSAT->getSizeExpr()->Retain(), DSAT->getSizeModifier(), 0, -- cgit v1.2.3