This is an archive of the discontinued LLVM Phabricator instance.

Differential D55899

[asan] Undo special treatment of linkonce_odr and weak_odr
ClosedPublic

Authored by vitalybuka on Dec 19 2018, 1:00 PM.

Details

Reviewers
pcc
Commits
rG07a55f27dc42: [asan] Undo special treatment of linkonce_odr and weak_odr
rL349707: [asan] Undo special treatment of linkonce_odr and weak_odr
Summary

On non-Windows these are already removed by ShouldInstrumentGlobal.
On Window we will wait until we get actual issues with that.

Diff Detail

Event Timeline

vitalybuka created this revision.Dec 19 2018, 1:00 PM
Herald added a subscriber: hiraditya. · View Herald TranscriptDec 19 2018, 1:00 PM
Harbormaster completed remote builds in B26153: Diff 178947.Dec 19 2018, 1:00 PM
vitalybuka mentioned this in D55857: [asan] Prevent folding of globals with redzones.Dec 19 2018, 1:00 PM
vitalybuka updated this revision to Diff 178949.Dec 19 2018, 1:21 PM

update a test

Harbormaster completed remote builds in B26154: Diff 178949.Dec 19 2018, 1:21 PM
pcc accepted this revision.Dec 19 2018, 4:31 PM

LGTM

This revision is now accepted and ready to land.Dec 19 2018, 4:31 PM
Closed by commit rL349707: [asan] Undo special treatment of linkonce_odr and weak_odr (authored by vitalybuka). · Explain WhyDec 19 2018, 4:33 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
llvm/
lib/
Transforms/
Instrumentation/
6 lines
test/
Instrumentation/
AddressSanitizer/
2 lines

Diff 178949

llvm/lib/Transforms/Instrumentation/AddressSanitizer.cpp

Show First 20 Lines • Show All 2,195 Lines • ▼ Show 20 Lines bool CanUsePrivateAliases =
TargetTriple.isOSBinFormatWasm(); TargetTriple.isOSBinFormatWasm();
if (CanUsePrivateAliases && UsePrivateAlias) { if (CanUsePrivateAliases && UsePrivateAlias) {
// Create local alias for NewGlobal to avoid crash on ODR between // Create local alias for NewGlobal to avoid crash on ODR between
// instrumented and non-instrumented libraries. // instrumented and non-instrumented libraries.
InstrumentedGlobal = InstrumentedGlobal =
GlobalAlias::create(GlobalValue::PrivateLinkage, "", NewGlobal); GlobalAlias::create(GlobalValue::PrivateLinkage, "", NewGlobal);
} }
// ODR check is not useful for the following, but we see false reports // ODR should not happen for local linkage.
// caused by linker optimizations. if (NewGlobal->hasLocalLinkage()) {
if (NewGlobal->hasLocalLinkage() || NewGlobal->hasLinkOnceODRLinkage() ||
NewGlobal->hasWeakODRLinkage()) {
ODRIndicator = ConstantExpr::getIntToPtr(ConstantInt::get(IntptrTy, -1), ODRIndicator = ConstantExpr::getIntToPtr(ConstantInt::get(IntptrTy, -1),
IRB.getInt8PtrTy()); IRB.getInt8PtrTy());
} else if (UseOdrIndicator) { } else if (UseOdrIndicator) {
// With local aliases, we need to provide another externally visible // With local aliases, we need to provide another externally visible
// symbol __odr_asan_XXX to detect ODR violation. // symbol __odr_asan_XXX to detect ODR violation.
auto *ODRIndicatorSym = auto *ODRIndicatorSym =
new GlobalVariable(M, IRB.getInt8Ty(), false, Linkage, new GlobalVariable(M, IRB.getInt8Ty(), false, Linkage,
Constant::getNullValue(IRB.getInt8Ty()), Constant::getNullValue(IRB.getInt8Ty()),
▲ Show 20 Lines • Show All 1,047 Lines • Show Last 20 Lines

llvm/test/Instrumentation/AddressSanitizer/win-string-literal.ll

Show All 9 Lines
; CHECK-SAME: linkonce_odr dso_local constant { [5 x i8], [59 x i8] } ; CHECK-SAME: linkonce_odr dso_local constant { [5 x i8], [59 x i8] }
; CHECK-SAME: { [5 x i8] c"asdf\00", [59 x i8] zeroinitializer }, comdat, align 32 ; CHECK-SAME: { [5 x i8] c"asdf\00", [59 x i8] zeroinitializer }, comdat, align 32
; CHECK: @"__asan_global_??_C@_04JIHMPGLA@asdf?$AA@" = ; CHECK: @"__asan_global_??_C@_04JIHMPGLA@asdf?$AA@" =
; CHECK-SAME: private global { i64, i64, i64, i64, i64, i64, i64, i64 } ; CHECK-SAME: private global { i64, i64, i64, i64, i64, i64, i64, i64 }
; CHECK-SAME: { i64 ptrtoint ({ [5 x i8], [59 x i8] }* @"??_C@_04JIHMPGLA@asdf?$AA@" to i64), ; CHECK-SAME: { i64 ptrtoint ({ [5 x i8], [59 x i8] }* @"??_C@_04JIHMPGLA@asdf?$AA@" to i64),
; CHECK-SAME: i64 5, i64 64, i64 ptrtoint ([17 x i8]* @___asan_gen_.1 to i64), ; CHECK-SAME: i64 5, i64 64, i64 ptrtoint ([17 x i8]* @___asan_gen_.1 to i64),
; CHECK-SAME: i64 ptrtoint ([8 x i8]* @___asan_gen_ to i64), i64 0, ; CHECK-SAME: i64 ptrtoint ([8 x i8]* @___asan_gen_ to i64), i64 0,
; CHECK-SAME: i64 ptrtoint ({ [6 x i8]*, i32, i32 }* @___asan_gen_.3 to i64), i64 -1 }, ; CHECK-SAME: i64 ptrtoint ({ [6 x i8]*, i32, i32 }* @___asan_gen_.3 to i64), i64 0 },
; CHECK-SAME: section ".ASAN$GL", comdat($"??_C@_04JIHMPGLA@asdf?$AA@"), align 64 ; CHECK-SAME: section ".ASAN$GL", comdat($"??_C@_04JIHMPGLA@asdf?$AA@"), align 64
; ModuleID = 't.cpp' ; ModuleID = 't.cpp'
source_filename = "t.cpp" source_filename = "t.cpp"
target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128" target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-pc-windows-msvc19.13.26131" target triple = "x86_64-pc-windows-msvc19.13.26131"
$"??_C@_04JIHMPGLA@asdf?$AA@" = comdat any $"??_C@_04JIHMPGLA@asdf?$AA@" = comdat any
Show All 20 Lines