Added support for objc's gc attribute in ExtQualType.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@64800 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/AST/ASTContext.cpp b/lib/AST/ASTContext.cpp
index 32a6c7d..dec7318 100644
--- a/lib/AST/ASTContext.cpp
+++ b/lib/AST/ASTContext.cpp
@@ -725,7 +725,7 @@
// Check if we've already instantiated an address space qual'd type of this
// type.
llvm::FoldingSetNodeID ID;
- ExtQualType::Profile(ID, T.getTypePtr(), AddressSpace);
+ ExtQualType::Profile(ID, T.getTypePtr(), AddressSpace, 0);
void *InsertPos = 0;
if (ExtQualType *EXTQy = ExtQualTypes.FindNodeOrInsertPos(ID, InsertPos))
return QualType(EXTQy, 0);
@@ -741,7 +741,8 @@
assert(NewIP == 0 && "Shouldn't be in the map!"); NewIP = NewIP;
}
ExtQualType *New = new (*this, 8) ExtQualType(T.getTypePtr(), Canonical,
- AddressSpace);
+ AddressSpace, 0,
+ ExtQualType::ASQUAL);
ExtQualTypes.InsertNode(New, InsertPos);
Types.push_back(New);
return QualType(New, T.getCVRQualifiers());
diff --git a/lib/AST/Type.cpp b/lib/AST/Type.cpp
index 0edc6ee..6aec24f 100644
--- a/lib/AST/Type.cpp
+++ b/lib/AST/Type.cpp
@@ -1053,7 +1053,23 @@
}
void ExtQualType::getAsStringInternal(std::string &S) const {
- S = "__attribute__((address_space("+llvm::utostr_32(AddressSpace)+")))" + S;
+ bool space = false;
+ if (ExtQualTypeKind & ASQUAL) {
+ S = "__attribute__((address_space("+llvm::utostr_32(AddressSpace)+")))" + S;
+ space = true;
+ }
+ if (ExtQualTypeKind & GCQUAL) {
+ if (space)
+ S += ' ';
+ S += "__attribute__((objc_gc(";
+ ObjCGCAttr *gcattr = getGCAttr();
+ ObjCGCAttr::GCAttrTypes attr = gcattr->getType();
+ if (attr & ObjCGCAttr::Weak)
+ S += "weak";
+ else
+ S += "strong";
+ S += ")))";
+ }
BaseType->getAsStringInternal(S);
}