diff options
author | Chris Lattner <sabre@nondot.org> | 2011-01-18 01:23:44 +0000 |
---|---|---|
committer | Chris Lattner <sabre@nondot.org> | 2011-01-18 01:23:44 +0000 |
commit | 32899199c043269b4dfab7f0429cc946e67bd54d (patch) | |
tree | 5ac0ac19cf22a124d3bda15898df6ca826b389eb /lib/Target/TargetLoweringObjectFile.cpp | |
parent | 955ed73d12f2b186ef3f80da872b702cd7f2895b (diff) | |
download | llvm-32899199c043269b4dfab7f0429cc946e67bd54d.tar.gz llvm-32899199c043269b4dfab7f0429cc946e67bd54d.tar.bz2 llvm-32899199c043269b4dfab7f0429cc946e67bd54d.tar.xz |
minor change to rafael's recent patches: if something is
constant but requires a unique address, we can still put it in a
readonly section, just not a mergable one.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@123711 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Target/TargetLoweringObjectFile.cpp')
-rw-r--r-- | lib/Target/TargetLoweringObjectFile.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/Target/TargetLoweringObjectFile.cpp b/lib/Target/TargetLoweringObjectFile.cpp index eab43fb427..681beec636 100644 --- a/lib/Target/TargetLoweringObjectFile.cpp +++ b/lib/Target/TargetLoweringObjectFile.cpp @@ -162,13 +162,19 @@ SectionKind TargetLoweringObjectFile::getKindForGlobal(const GlobalValue *GV, // If the global is marked constant, we can put it into a mergable section, // a mergable string section, or general .data if it contains relocations. - if (GVar->isConstant() && GVar->hasUnnamedAddr()) { + if (GVar->isConstant()) { // If the initializer for the global contains something that requires a // relocation, then we may have to drop this into a wriable data section // even though it is marked const. switch (C->getRelocationInfo()) { default: assert(0 && "unknown relocation info kind"); case Constant::NoRelocation: + // If the global is required to have a unique address, it can't be put + // into a mergable section: just drop it into the general read-only + // section instead. + if (!GVar->hasUnnamedAddr()) + return SectionKind::getReadOnly(); + // If initializer is a null-terminated string, put it in a "cstring" // section of the right width. if (const ArrayType *ATy = dyn_cast<ArrayType>(C->getType())) { |