intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-02-04 11:38:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix an inconsistance in objc2's meta-data related to

Browse Source 
the symbol for the root meta-data.

llvm-svn: 65548
This commit is contained in:
Fariborz Jahanian
2009-02-26 18:23:47 +00:00
parent 42ab0dd1ee
commit 03b300b734
1 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
clang/lib/CodeGen/CGObjCMac.cpp
View File

@@ -3683,9 +3683,23 @@ void CGObjCNonFragileABIMac::GenerateClass(const ObjCImplementationDecl *ID) {
}
} else {
// Has a root. Current class is not a root.
std::string RootClassName =
ID->getClassInterface()->getSuperClass()->getNameAsString();
std::string SuperClassName = ObjCMetaClassName + RootClassName;
const ObjCInterfaceDecl *Root = ID->getClassInterface();
while (const ObjCInterfaceDecl *Super = Root->getSuperClass())
Root = Super;
std::string RootClassName = ObjCMetaClassName + Root->getNameAsString();
IsAGV = CGM.getModule().getGlobalVariable(RootClassName);
if (!IsAGV) {
IsAGV =
new llvm::GlobalVariable(ObjCTypes.ClassnfABITy, false,
llvm::GlobalValue::ExternalLinkage,
0,
RootClassName,
&CGM.getModule());
UsedGlobals.push_back(IsAGV);
}
// work on super class metadata symbol.
std::string SuperClassName =
ObjCMetaClassName + ID->getClassInterface()->getSuperClass()->getNameAsString();
SuperClassGV = CGM.getModule().getGlobalVariable(SuperClassName);
if (!SuperClassGV) {
SuperClassGV =
@@ -3696,7 +3710,6 @@ void CGObjCNonFragileABIMac::GenerateClass(const ObjCImplementationDecl *ID) {
&CGM.getModule());
UsedGlobals.push_back(SuperClassGV);
}
IsAGV = SuperClassGV;
}
llvm::GlobalVariable *CLASS_RO_GV = BuildClassRoTInitializer(flags,
InstanceStart,
@@ -3716,7 +3729,7 @@ void CGObjCNonFragileABIMac::GenerateClass(const ObjCImplementationDecl *ID) {
}
else {
// Has a root. Current class is not a root.
std::string RootClassName =
std::string RootClassName =
ID->getClassInterface()->getSuperClass()->getNameAsString();
std::string SuperClassName = ObjCClassName + RootClassName;
SuperClassGV = CGM.getModule().getGlobalVariable(SuperClassName);