forked from OSchip/llvm-project
[MS] Use mangled names and comdats for string merging with ASan
This should reduce the binary size penalty of ASan on Windows. After r334313, ASan will add red zones to globals in comdats, so we will still find OOB accesses to string literals. llvm-svn: 334417
This commit is contained in:
parent
ae7179414d
commit
3513fdcc0f
|
@ -4114,15 +4114,13 @@ CodeGenModule::GetAddrOfConstantStringFromLiteral(const StringLiteral *S,
|
|||
StringRef GlobalVariableName;
|
||||
llvm::GlobalValue::LinkageTypes LT;
|
||||
|
||||
// Mangle the string literal if the ABI allows for it. However, we cannot
|
||||
// do this if we are compiling with ASan or -fwritable-strings because they
|
||||
// rely on strings having normal linkage.
|
||||
if (!LangOpts.WritableStrings &&
|
||||
!LangOpts.Sanitize.has(SanitizerKind::Address) &&
|
||||
getCXXABI().getMangleContext().shouldMangleStringLiteral(S)) {
|
||||
// Mangle the string literal if that's how the ABI merges duplicate strings.
|
||||
// Don't do it if they are writable, since we don't want writes in one TU to
|
||||
// affect strings in another.
|
||||
if (getCXXABI().getMangleContext().shouldMangleStringLiteral(S) &&
|
||||
!LangOpts.WritableStrings) {
|
||||
llvm::raw_svector_ostream Out(MangledNameBuffer);
|
||||
getCXXABI().getMangleContext().mangleStringLiteral(S, Out);
|
||||
|
||||
LT = llvm::GlobalValue::LinkOnceODRLinkage;
|
||||
GlobalVariableName = MangledNameBuffer;
|
||||
} else {
|
||||
|
|
Loading…
Reference in New Issue