This is an archive of the discontinued LLVM Phabricator instance.

Differential D27594

[sanitizers] lsan+sancov doesn't need ubsanrt (multi def error)
ClosedPublic

Authored by aizatsky on Dec 8 2016, 2:22 PM.

Details

Reviewers
eugenis
Commits
rGd1033f575617: [sanitizers] lsan+sancov doesn't need ubsanrt (multi def error)
rC289144: [sanitizers] lsan+sancov doesn't need ubsanrt (multi def error)
rL289144: [sanitizers] lsan+sancov doesn't need ubsanrt (multi def error)

Diff Detail

Event Timeline

aizatsky updated this revision to Diff 80825.Dec 8 2016, 2:22 PM
aizatsky retitled this revision from to [sanitizers] lsan+sancov doesn't need ubsanrt (multi def error).
aizatsky updated this object.
aizatsky added a reviewer: eugenis.
eugenis accepted this revision.Dec 8 2016, 2:29 PM
eugenis edited edge metadata.

LGTM

test/Driver/sanitizer-ld.c
304

please add another "-NOT: libclang_rt.ubsan" line after libclang_rt.lsan

This revision is now accepted and ready to land.Dec 8 2016, 2:29 PM
aizatsky updated this revision to Diff 80828.Dec 8 2016, 2:30 PM
aizatsky marked an inline comment as done.
aizatsky edited edge metadata.

one more CHECK

aizatsky added a comment.Dec 8 2016, 2:31 PM

done. ptal

eugenis added a comment.Dec 8 2016, 2:36 PM

LGTM

Closed by commit rL289144: [sanitizers] lsan+sancov doesn't need ubsanrt (multi def error) (authored by aizatsky). · Explain WhyDec 9 2016, 4:00 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lib/
Driver/
3 lines
test/
Driver/
14 lines

Diff 80828

lib/Driver/SanitizerArgs.cpp

Show First 20 Lines • Show All 159 Lines • ▼ Show 20 Linesstatic SanitizerMask parseSanitizeTrapArgs(const Driver &D,
return TrappingKinds; return TrappingKinds;
} }
bool SanitizerArgs::needsUbsanRt() const { bool SanitizerArgs::needsUbsanRt() const {
return ((Sanitizers.Mask & NeedsUbsanRt & ~TrapSanitizers.Mask) || return ((Sanitizers.Mask & NeedsUbsanRt & ~TrapSanitizers.Mask) ||
CoverageFeatures) && CoverageFeatures) &&
!Sanitizers.has(Address) && !Sanitizers.has(Memory) && !Sanitizers.has(Address) && !Sanitizers.has(Memory) &&
!Sanitizers.has(Thread) && !Sanitizers.has(DataFlow) && !CfiCrossDso; !Sanitizers.has(Thread) && !Sanitizers.has(DataFlow) &&
!Sanitizers.has(Leak) && !CfiCrossDso;
} }
bool SanitizerArgs::needsCfiRt() const { bool SanitizerArgs::needsCfiRt() const {
return !(Sanitizers.Mask & CFI & ~TrapSanitizers.Mask) && CfiCrossDso; return !(Sanitizers.Mask & CFI & ~TrapSanitizers.Mask) && CfiCrossDso;
} }
bool SanitizerArgs::needsCfiDiagRt() const { bool SanitizerArgs::needsCfiDiagRt() const {
return (Sanitizers.Mask & CFI & ~TrapSanitizers.Mask) && CfiCrossDso; return (Sanitizers.Mask & CFI & ~TrapSanitizers.Mask) && CfiCrossDso;
▲ Show 20 Lines • Show All 669 Lines • Show Last 20 Lines

test/Driver/sanitizer-ld.c

Show First 20 Lines • Show All 283 Lines • ▼ Show 20 Lines
// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
// RUN: -target x86_64-unknown-linux -fsanitize=leak \ // RUN: -target x86_64-unknown-linux -fsanitize=leak \
// RUN: --sysroot=%S/Inputs/basic_linux_tree \ // RUN: --sysroot=%S/Inputs/basic_linux_tree \
// RUN: | FileCheck --check-prefix=CHECK-LSAN-LINUX %s // RUN: | FileCheck --check-prefix=CHECK-LSAN-LINUX %s
// //
// CHECK-LSAN-LINUX: "{{(.*[^-.0-9A-Z_a-z])?}}ld{{(.exe)?}}" // CHECK-LSAN-LINUX: "{{(.*[^-.0-9A-Z_a-z])?}}ld{{(.exe)?}}"
// CHECK-LSAN-LINUX-NOT: "-lc" // CHECK-LSAN-LINUX-NOT: "-lc"
// CHECK-LSAN-LINUX-NOT: libclang_rt.ubsan
// CHECK-LSAN-LINUX: libclang_rt.lsan-x86_64.a" // CHECK-LSAN-LINUX: libclang_rt.lsan-x86_64.a"
// CHECK-LSAN-LINUX: "-lpthread" // CHECK-LSAN-LINUX: "-lpthread"
// CHECK-LSAN-LINUX: "-ldl" // CHECK-LSAN-LINUX: "-ldl"
// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
// RUN: -target x86_64-unknown-linux -fsanitize=leak -fsanitize-coverage=func \
// RUN: --sysroot=%S/Inputs/basic_linux_tree \
// RUN: | FileCheck --check-prefix=CHECK-LSAN-COV-LINUX %s
//
// CHECK-LSAN-COV-LINUX: "{{(.*[^-.0-9A-Z_a-z])?}}ld{{(.exe)?}}"
// CHECK-LSAN-COV-LINUX-NOT: "-lc"
// CHECK-LSAN-COV-LINUX-NOT: libclang_rt.ubsan
eugenisUnsubmitted
Done
ReplyInline Actions

please add another "-NOT: libclang_rt.ubsan" line after libclang_rt.lsan

eugenis: please add another "-NOT: libclang_rt.ubsan" line after libclang_rt.lsan
// CHECK-LSAV-COV-LINUX: libclang_rt.lsan-x86_64.a"
// CHECK-LSAN-COV-LINUX-NOT: libclang_rt.ubsan
// CHECK-LSAN-COV-LINUX: "-lpthread"
// CHECK-LSAN-COV-LINUX: "-ldl"
// RUN: %clang -fsanitize=leak,address %s -### -o %t.o 2>&1 \ // RUN: %clang -fsanitize=leak,address %s -### -o %t.o 2>&1 \
// RUN: -target x86_64-unknown-linux \ // RUN: -target x86_64-unknown-linux \
// RUN: --sysroot=%S/Inputs/basic_linux_tree \ // RUN: --sysroot=%S/Inputs/basic_linux_tree \
// RUN: | FileCheck --check-prefix=CHECK-LSAN-ASAN-LINUX %s // RUN: | FileCheck --check-prefix=CHECK-LSAN-ASAN-LINUX %s
// CHECK-LSAN-ASAN-LINUX: "{{.*}}ld{{(.exe)?}}" // CHECK-LSAN-ASAN-LINUX: "{{.*}}ld{{(.exe)?}}"
// CHECK-LSAN-ASAN-LINUX-NOT: libclang_rt.lsan // CHECK-LSAN-ASAN-LINUX-NOT: libclang_rt.lsan
// CHECK-LSAN-ASAN-LINUX: libclang_rt.asan-x86_64 // CHECK-LSAN-ASAN-LINUX: libclang_rt.asan-x86_64
// CHECK-LSAN-ASAN-LINUX-NOT: libclang_rt.lsan // CHECK-LSAN-ASAN-LINUX-NOT: libclang_rt.lsan
▲ Show 20 Lines • Show All 212 Lines • Show Last 20 Lines