This is an archive of the discontinued LLVM Phabricator instance.

Differential D92273

[sanitizer] Disable use_tls_dynamic on non-Android x86 Linux.
ClosedPublic

Authored by oontvoo on Nov 28 2020, 6:09 PM.

Details

Reviewers
vitalybuka
thakis
Commits
rG1b723a955da0: [sanitizer] Disable use_tls_dynamic on on-Android x86 Linux.
Summary

https://bugs.chromium.org/p/chromium/issues/detail?id=1153421

Diff Detail

Event Timeline

oontvoo created this revision.Nov 28 2020, 6:09 PM
Herald added a project: Restricted Project. · View Herald TranscriptNov 28 2020, 6:09 PM
Herald added a subscriber: Restricted Project. · View Herald Transcript
oontvoo requested review of this revision.Nov 28 2020, 6:09 PM
oontvoo updated this revision to Diff 308194.Nov 28 2020, 6:15 PM

typo

oontvoo retitled this revision from [sanitizer] Disable use_tls_dynamic on on-Android x86 Linux. to [sanitizer] Disable use_tls_dynamic on non-Android x86 Linux..Nov 28 2020, 6:15 PM
Harbormaster completed remote builds in B80437: Diff 308193.Nov 28 2020, 6:40 PM
Harbormaster completed remote builds in B80438: Diff 308194.Nov 28 2020, 6:50 PM
thakis added inline comments.Nov 28 2020, 7:49 PM
compiler-rt/test/lsan/TestCases/Linux/use_tls_dynamic.cpp
13

I think we only want to disable it on 32-bit (non-android) linux -- does i386-linux && !android work, to restore the pre D89884 state as much as possible?

oontvoo updated this revision to Diff 308211.Nov 29 2020, 6:14 AM
oontvoo marked an inline comment as done.

s/x86/i386-linux

Harbormaster completed remote builds in B80449: Diff 308211.Nov 29 2020, 6:41 AM
thakis accepted this revision.Nov 29 2020, 5:58 PM

Thanks!

This revision is now accepted and ready to land.Nov 29 2020, 5:58 PM
Closed by commit rG1b723a955da0: [sanitizer] Disable use_tls_dynamic on on-Android x86 Linux. (authored by oontvoo). · Explain WhyNov 30 2020, 8:45 AM
This revision was automatically updated to reflect the committed changes.
oontvoo added a commit: rG1b723a955da0: [sanitizer] Disable use_tls_dynamic on on-Android x86 Linux..

Revision Contents

PathSize
compiler-rt/
test/
lsan/
TestCases/
Linux/
2 lines

Diff 308194

compiler-rt/test/lsan/TestCases/Linux/use_tls_dynamic.cpp

// Test that dynamically allocated TLS space is included in the root set. // Test that dynamically allocated TLS space is included in the root set.
// This is known to be broken with glibc-2.27+ but it should pass with Bionic // This is known to be broken with glibc-2.27+ but it should pass with Bionic
// https://bugs.llvm.org/show_bug.cgi?id=37804 // https://bugs.llvm.org/show_bug.cgi?id=37804
// XFAIL: glibc-2.27 // XFAIL: glibc-2.27
// RUN: LSAN_BASE="report_objects=1:use_stacks=0:use_registers=0:use_ld_allocations=0" // RUN: LSAN_BASE="report_objects=1:use_stacks=0:use_registers=0:use_ld_allocations=0"
// RUN: %clangxx %s -DBUILD_DSO -fPIC -shared -o %t-so.so // RUN: %clangxx %s -DBUILD_DSO -fPIC -shared -o %t-so.so
// RUN: %clangxx_lsan %s -o %t // RUN: %clangxx_lsan %s -o %t
// RUN: %env_lsan_opts=$LSAN_BASE:"use_tls=0" not %run %t 2>&1 | FileCheck %s // RUN: %env_lsan_opts=$LSAN_BASE:"use_tls=0" not %run %t 2>&1 | FileCheck %s
// RUN: %env_lsan_opts=$LSAN_BASE:"use_tls=1" %run %t 2>&1 // RUN: %env_lsan_opts=$LSAN_BASE:"use_tls=1" %run %t 2>&1
// RUN: %env_lsan_opts="" %run %t 2>&1 // RUN: %env_lsan_opts="" %run %t 2>&1
// UNSUPPORTED: arm,powerpc // UNSUPPORTED: arm,powerpc,x86 && !android
thakisUnsubmitted
Done
ReplyInline Actions

I think we only want to disable it on 32-bit (non-android) linux -- does i386-linux && !android work, to restore the pre D89884 state as much as possible?

thakis: I think we only want to disable it on 32-bit (non-android) linux -- does `i386-linux && !
#ifndef BUILD_DSO #ifndef BUILD_DSO
#include <assert.h> #include <assert.h>
#include <dlfcn.h> #include <dlfcn.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string> #include <string>
#include "sanitizer_common/print_address.h" #include "sanitizer_common/print_address.h"
▲ Show 20 Lines • Show All 43 Lines • Show Last 20 Lines