From ea4e983d703b1598a3a1947f725d4139991d968c Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Tue, 18 Jan 2011 01:23:44 +0000 Subject: [PATCH] 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. llvm-svn: 123711 --- llvm/lib/Target/TargetLoweringObjectFile.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/llvm/lib/Target/TargetLoweringObjectFile.cpp b/llvm/lib/Target/TargetLoweringObjectFile.cpp index eab43fb42764..681beec636bb 100644 --- a/llvm/lib/Target/TargetLoweringObjectFile.cpp +++ b/llvm/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(C->getType())) {