FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re PR sanitizer/77396 (address sanitizer crashes if all static global variables are optimized)

Browse source 
PR sanitizer/77396
	* asan/asan_globals.cc: Cherry-pick upstream r280657.

	* g++.dg/asan/pr77396-2.C: New test.

From-SVN: r239998
This commit is contained in:
Jakub Jelinek 2016-09-05 21:43:57 +02:00 • committed by Jakub Jelinek
parent 3f8257db2e
commit 0ce483917f
4 changed files with 26 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gcc/testsuite/ChangeLog
View file

@ -1,3 +1,8 @@
2016-09-05 Jakub Jelinek <jakub@redhat.com>
PR sanitizer/77396
* g++.dg/asan/pr77396-2.C: New test.
2016-09-05 Uros Bizjak <ubizjak@gmail.com>
PR rtl-optimization/77452

12
gcc/testsuite/g++.dg/asan/pr77396-2.C Normal file
View file

@ -0,0 +1,12 @@
// PR sanitizer/77396
// { dg-do run }
// { dg-set-target-env-var ASAN_OPTIONS "check_initialization_order=true" }
struct S { S () { asm volatile ("" : : : "memory"); } };
static S c;
int
main ()
{
return 0;
}

5
libsanitizer/ChangeLog
View file

@ -1,3 +1,8 @@
2016-09-05 Jakub Jelinek <jakub@redhat.com>
PR sanitizer/77396
* asan/asan_globals.cc: Cherry-pick upstream r280657.
2016-08-12 Jakub Jelinek <jakub@redhat.com>
PR sanitizer/71042

7
libsanitizer/asan/asan_globals.cc
View file

@ -248,10 +248,10 @@ void __asan_unregister_globals(__asan_global *globals, uptr n) {
// initializer can only touch global variables in the same TU.
void __asan_before_dynamic_init(const char *module_name) {
if (!flags()->check_initialization_order ||
!CanPoisonMemory())
!CanPoisonMemory() ||
!dynamic_init_globals)
return;
bool strict_init_order = flags()->strict_init_order;
CHECK(dynamic_init_globals);
CHECK(module_name);
CHECK(asan_inited);
BlockingMutexLock lock(&mu_for_globals);
@ -274,7 +274,8 @@ void __asan_before_dynamic_init(const char *module_name) {
// TU are poisoned. It simply unpoisons all dynamically initialized globals.
void __asan_after_dynamic_init() {
if (!flags()->check_initialization_order ||
!CanPoisonMemory())
!CanPoisonMemory() ||
!dynamic_init_globals)
return;
CHECK(asan_inited);
BlockingMutexLock lock(&mu_for_globals);