Set alignment on __cstring metadata variables to 1 (matching
llvm-gcc).
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@69097 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/CGObjCMac.cpp b/lib/CodeGen/CGObjCMac.cpp
index a0a8524..dd55e65 100644
--- a/lib/CodeGen/CGObjCMac.cpp
+++ b/lib/CodeGen/CGObjCMac.cpp
@@ -2534,7 +2534,7 @@
Entry = CreateMetadataVar("\01L_OBJC_CLASS_NAME_",
llvm::ConstantArray::get(Ident->getName()),
"__TEXT,__cstring,cstring_literals",
- 0, true);
+ 1, true);
return getConstantGEP(Entry, 0, 0);
}
@@ -2939,7 +2939,7 @@
llvm::GlobalVariable * Entry = CreateMetadataVar("\01L_OBJC_CLASS_NAME_",
llvm::ConstantArray::get(BitMap.c_str()),
"__TEXT,__cstring,cstring_literals",
- 0, true);
+ 1, true);
// FIXME. Need a commomand-line option for this eventually.
if (ForStrongLayout)
printf("\nstrong ivar layout: ");
@@ -2964,7 +2964,7 @@
Entry = CreateMetadataVar("\01L_OBJC_METH_VAR_NAME_",
llvm::ConstantArray::get(Sel.getAsString()),
"__TEXT,__cstring,cstring_literals",
- 0, true);
+ 1, true);
return getConstantGEP(Entry, 0, 0);
}
@@ -2989,7 +2989,7 @@
Entry = CreateMetadataVar("\01L_OBJC_METH_VAR_TYPE_",
llvm::ConstantArray::get(TypeStr),
"__TEXT,__cstring,cstring_literals",
- 0, true);
+ 1, true);
return getConstantGEP(Entry, 0, 0);
}
@@ -3001,16 +3001,11 @@
llvm::GlobalVariable *&Entry = MethodVarTypes[TypeStr];
- if (!Entry) {
- llvm::Constant *C = llvm::ConstantArray::get(TypeStr);
- Entry =
- new llvm::GlobalVariable(C->getType(), false,
- llvm::GlobalValue::InternalLinkage,
- C, "\01L_OBJC_METH_VAR_TYPE_",
- &CGM.getModule());
- Entry->setSection("__TEXT,__cstring,cstring_literals");
- UsedGlobals.push_back(Entry);
- }
+ if (!Entry)
+ Entry = CreateMetadataVar("\01L_OBJC_METH_VAR_TYPE_",
+ llvm::ConstantArray::get(TypeStr),
+ "__TEXT,__cstring,cstring_literals",
+ 1, true);
return getConstantGEP(Entry, 0, 0);
}
@@ -3023,7 +3018,7 @@
Entry = CreateMetadataVar("\01L_OBJC_PROP_NAME_ATTR_",
llvm::ConstantArray::get(Ident->getName()),
"__TEXT,__cstring,cstring_literals",
- 0, true);
+ 1, true);
return getConstantGEP(Entry, 0, 0);
}