diff options
author | John McCall <rjmccall@apple.com> | 2010-10-14 21:48:26 +0000 |
---|---|---|
committer | John McCall <rjmccall@apple.com> | 2010-10-14 21:48:26 +0000 |
commit | b870b88df784c2940efce448ebfaf54dece14666 (patch) | |
tree | 5fc03a4ce87b774a3cb293882c3329f2d8761806 /lib/AST/Type.cpp | |
parent | 8b380af8c68b7d789881e75a47c6c2a167dec828 (diff) |
At Fariborz's request, a somewhat cleaner bit-combining hack.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@116524 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/AST/Type.cpp')
-rw-r--r-- | lib/AST/Type.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/lib/AST/Type.cpp b/lib/AST/Type.cpp index 89c39d8120..145250793f 100644 --- a/lib/AST/Type.cpp +++ b/lib/AST/Type.cpp @@ -312,7 +312,7 @@ ObjCObjectType::ObjCObjectType(QualType Canonical, QualType Base, unsigned NumProtocols) : Type(ObjCObject, Canonical, false, false), BaseType(Base) { - SubclassBits = NumProtocols; + ObjCObjectTypeBits.NumProtocols = NumProtocols; assert(getNumProtocols() == NumProtocols && "bitfield overflow in protocol count"); if (NumProtocols) @@ -917,7 +917,7 @@ bool Type::isElaboratedTypeSpecifier() const { } const char *Type::getTypeClassName() const { - switch (TC) { + switch (TypeBits.TC) { default: assert(0 && "Type class not in TypeNodes.def!"); #define ABSTRACT_TYPE(Derived, Base) #define TYPE(Derived, Base) case Derived: return #Derived; @@ -1273,28 +1273,28 @@ Linkage Type::getLinkage() const { if (this != CanonicalType.getTypePtr()) return CanonicalType->getLinkage(); - if (!LinkageKnown) { + if (!TypeBits.LinkageKnown) { std::pair<Linkage, bool> Result = getLinkageUnnamedLocalImpl(); - CachedLinkage = Result.first; - CachedLocalOrUnnamed = Result.second; - LinkageKnown = true; + TypeBits.CachedLinkage = Result.first; + TypeBits.CachedLocalOrUnnamed = Result.second; + TypeBits.LinkageKnown = true; } - return static_cast<clang::Linkage>(CachedLinkage); + return static_cast<clang::Linkage>(TypeBits.CachedLinkage); } bool Type::hasUnnamedOrLocalType() const { if (this != CanonicalType.getTypePtr()) return CanonicalType->hasUnnamedOrLocalType(); - if (!LinkageKnown) { + if (!TypeBits.LinkageKnown) { std::pair<Linkage, bool> Result = getLinkageUnnamedLocalImpl(); - CachedLinkage = Result.first; - CachedLocalOrUnnamed = Result.second; - LinkageKnown = true; + TypeBits.CachedLinkage = Result.first; + TypeBits.CachedLocalOrUnnamed = Result.second; + TypeBits.LinkageKnown = true; } - return CachedLocalOrUnnamed; + return TypeBits.CachedLocalOrUnnamed; } std::pair<Linkage, bool> Type::getLinkageUnnamedLocalImpl() const { @@ -1307,7 +1307,7 @@ void Type::ClearLinkageCache() { if (this != CanonicalType.getTypePtr()) CanonicalType->ClearLinkageCache(); else - LinkageKnown = false; + TypeBits.LinkageKnown = false; } std::pair<Linkage, bool> BuiltinType::getLinkageUnnamedLocalImpl() const { |