Integrate the following from the 'objective-rewrite' branch:
http://llvm.org/viewvc/llvm-project?view=rev&revision=70922 llvm-svn: 90595
This commit is contained in:
parent
9b3a395bf3
commit
3ce3af2cb6
|
@ -1325,7 +1325,12 @@ Stmt *RewriteObjC::RewriteObjCForCollectionStmt(ObjCForCollectionStmt *S,
|
||||||
// type elem;
|
// type elem;
|
||||||
NamedDecl* D = cast<NamedDecl>(DS->getSingleDecl());
|
NamedDecl* D = cast<NamedDecl>(DS->getSingleDecl());
|
||||||
QualType ElementType = cast<ValueDecl>(D)->getType();
|
QualType ElementType = cast<ValueDecl>(D)->getType();
|
||||||
elementTypeAsString = ElementType.getAsString();
|
if (ElementType->isObjCQualifiedIdType() ||
|
||||||
|
ElementType->isObjCQualifiedInterfaceType())
|
||||||
|
// Simply use 'id' for all qualified types.
|
||||||
|
elementTypeAsString = "id";
|
||||||
|
else
|
||||||
|
elementTypeAsString = ElementType.getAsString();
|
||||||
buf += elementTypeAsString;
|
buf += elementTypeAsString;
|
||||||
buf += " ";
|
buf += " ";
|
||||||
elementName = D->getNameAsCString();
|
elementName = D->getNameAsCString();
|
||||||
|
@ -1335,8 +1340,13 @@ Stmt *RewriteObjC::RewriteObjCForCollectionStmt(ObjCForCollectionStmt *S,
|
||||||
else {
|
else {
|
||||||
DeclRefExpr *DR = cast<DeclRefExpr>(S->getElement());
|
DeclRefExpr *DR = cast<DeclRefExpr>(S->getElement());
|
||||||
elementName = DR->getDecl()->getNameAsCString();
|
elementName = DR->getDecl()->getNameAsCString();
|
||||||
elementTypeAsString
|
ValueDecl *VD = cast<ValueDecl>(DR->getDecl());
|
||||||
= cast<ValueDecl>(DR->getDecl())->getType().getAsString();
|
if (VD->getType()->isObjCQualifiedIdType() ||
|
||||||
|
VD->getType()->isObjCQualifiedInterfaceType())
|
||||||
|
// Simply use 'id' for all qualified types.
|
||||||
|
elementTypeAsString = "id";
|
||||||
|
else
|
||||||
|
elementTypeAsString = VD->getType().getAsString();
|
||||||
}
|
}
|
||||||
|
|
||||||
// struct __objcFastEnumerationState enumState = { 0 };
|
// struct __objcFastEnumerationState enumState = { 0 };
|
||||||
|
|
Loading…
Reference in New Issue