maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

simplify array compatibility testing. 

llvm-svn: 49326
This commit is contained in:
Chris Lattner 2008-04-07 06:56:55 +00:00
parent 7460fd297d
commit e6b27c6ecd
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
clang/include/clang/AST/ASTContext.h
View File

@ -330,7 +330,6 @@ public:
bool pointerTypesAreCompatible(QualType, QualType); // C99 6.7.5.1p2
bool referenceTypesAreCompatible(QualType, QualType); // C++ 5.17p6
bool functionTypesAreCompatible(QualType, QualType); // C99 6.7.5.3p15
bool arrayTypesAreCompatible(QualType, QualType); // C99 6.7.5.2p6
bool isObjCIdType(QualType T) const {
if (!IdStructType) // ObjC isn't enabled

24
clang/lib/AST/ASTContext.cpp
View File

@ -1513,20 +1513,19 @@ bool ASTContext::functionTypesAreCompatible(QualType lhs, QualType rhs) {
return true;
}
bool ASTContext::arrayTypesAreCompatible(QualType lhs, QualType rhs) {
// C99 6.7.5.2p6
static bool areCompatArrayTypes(ArrayType *LHS, ArrayType *RHS, ASTContext &C) {
// Compatible arrays must have compatible element types
QualType ltype = lhs->getAsArrayType()->getElementType();
QualType rtype = rhs->getAsArrayType()->getElementType();
QualType ltype = LHS->getElementType();
QualType rtype = RHS->getElementType();
if (!typesAreCompatible(ltype, rtype))
return false;
// Constant arrays must be the same size to be compatible.
if (const ConstantArrayType* LCAT = dyn_cast<ConstantArrayType>(LHS))
if (const ConstantArrayType* RCAT = dyn_cast<ConstantArrayType>(RHS))
if (RCAT->getSize() != LCAT->getSize())
return false;
// Compatible arrays must be the same size
if (const ConstantArrayType* LCAT = lhs->getAsConstantArrayType())
if (const ConstantArrayType* RCAT = rhs->getAsConstantArrayType())
return RCAT->getSize() == LCAT->getSize();
return true;
return C.typesAreCompatible(QualType(LHS, 0), QualType(RHS, 0));
}
/// areCompatVectorTypes - Return true if the two specified vector types are
@ -1681,7 +1680,8 @@ bool ASTContext::typesAreCompatible(QualType LHS_NC, QualType RHS_NC) {
case Type::Pointer:
return pointerTypesAreCompatible(LHS, RHS);
case Type::ConstantArray:
return arrayTypesAreCompatible(LHS, RHS);
return areCompatArrayTypes(cast<ArrayType>(LHS), cast<ArrayType>(RHS),
*this);
case Type::FunctionNoProto:
return functionTypesAreCompatible(LHS, RHS);
case Type::Tagged: // handle structures, unions