backport: re PR sanitizer/77396 (address sanitizer crashes if all static global...

	Backported from mainline
	2016-09-05  Jakub Jelinek  <jakub@redhat.com>

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

	2016-09-05  Jakub Jelinek  <jakub@redhat.com>

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

	2016-09-02  Jakub Jelinek  <jakub@redhat.com>

	PR sanitizer/77396
	* g++.dg/asan/pr77396.C: New test.

From-SVN: r248603

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index fc5e04bb5779f7cbc6c8a265fbe9fc601dd39880..16f15aaa6751f61f20016fedde026efe2c5f0d83 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,6 +1,16 @@
 2017-05-30  Jakub Jelinek  <jakub@redhat.com>
 
        Backported from mainline
+       2016-09-05  Jakub Jelinek  <jakub@redhat.com>
+
+       PR sanitizer/77396
+       * g++.dg/asan/pr77396-2.C: New test.
+
+       2016-09-02  Jakub Jelinek  <jakub@redhat.com>
+
+       PR sanitizer/77396
+       * g++.dg/asan/pr77396.C: New test.
+
        2016-08-30  Jakub Jelinek  <jakub@redhat.com>
 
        PR debug/77363

diff --git a/gcc/testsuite/g++.dg/asan/pr77396-2.C b/gcc/testsuite/g++.dg/asan/pr77396-2.C
new file mode 100644 (file)
index 0000000..0570a14
--- /dev/null
+++ b/gcc/testsuite/g++.dg/asan/pr77396-2.C
@@ -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;
+}

diff --git a/gcc/testsuite/g++.dg/asan/pr77396.C b/gcc/testsuite/g++.dg/asan/pr77396.C
new file mode 100644 (file)
index 0000000..3b3195e
--- /dev/null
+++ b/gcc/testsuite/g++.dg/asan/pr77396.C
@@ -0,0 +1,12 @@
+// PR sanitizer/77396
+// { dg-do run }
+// { dg-set-target-env-var ASAN_OPTIONS "check_initialization_order=true" }
+
+static int a = 0; 
+static int b = a; 
+
+int
+main ()
+{
+  return 0;
+}

diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog
index cf0bb56e5fee050e7a2a8884f4e61308ddff4b9c..995f3c93ca265fb832e6f9fd6d36a80a734fa620 100644 (file)
--- a/libsanitizer/ChangeLog
+++ b/libsanitizer/ChangeLog
@@ -1,3 +1,11 @@
+2017-05-30  Jakub Jelinek  <jakub@redhat.com>
+
+       Backported from mainline
+       2016-09-05  Jakub Jelinek  <jakub@redhat.com>
+
+       PR sanitizer/77396
+       * asan/asan_globals.cc: Cherry-pick upstream r280657.
+
 2017-05-29  Martin Liska  <mliska@suse.cz>
 
        Backport from mainline

diff --git a/libsanitizer/asan/asan_globals.cc b/libsanitizer/asan/asan_globals.cc
index 4bb88cfa001f9a02d1685f6bbbc69a407d36b15d..be128ea52356d89bec22d74218745f559e767560 100644 (file)
--- a/libsanitizer/asan/asan_globals.cc
+++ b/libsanitizer/asan/asan_globals.cc
@@ -249,10 +249,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 ||
-      !flags()->poison_heap)
+      !flags()->poison_heap ||
+      !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);
@@ -275,7 +275,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 ||
-      !flags()->poison_heap)
+      !flags()->poison_heap ||
+      !dynamic_init_globals)
     return;
   CHECK(asan_inited);
   BlockingMutexLock lock(&mu_for_globals);