[compiler-rt] r194125 - [ASan] Disable back init-order checker. Make strict_init_order imply check_initialization_order

[Alexey Samsonov]

Author: samsonov
Date: Tue Nov  5 22:27:09 2013
New Revision: 194125

URL: http://llvm.org/viewvc/llvm-project?rev=194125&view=rev
Log:
[ASan] Disable back init-order checker. Make strict_init_order imply check_initialization_order

Modified:
    compiler-rt/trunk/lib/asan/asan_rtl.cc
    compiler-rt/trunk/lib/asan/lit_tests/TestCases/Linux/initialization-bug-any-order.cc
    compiler-rt/trunk/lib/asan/lit_tests/TestCases/init-order-atexit.cc
    compiler-rt/trunk/lib/asan/lit_tests/TestCases/init-order-dlopen.cc
    compiler-rt/trunk/lib/asan/lit_tests/TestCases/init-order-pthread-create.cc

Modified: compiler-rt/trunk/lib/asan/asan_rtl.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_rtl.cc?rev=194125&r1=194124&r2=194125&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/asan_rtl.cc (original)
+++ compiler-rt/trunk/lib/asan/asan_rtl.cc Tue Nov  5 22:27:09 2013
@@ -148,7 +148,7 @@ void InitializeFlags(Flags *f, const cha
   f->redzone = 16;
   f->debug = false;
   f->report_globals = 1;
-  f->check_initialization_order = true;
+  f->check_initialization_order = false;
   f->replace_str = true;
   f->replace_intrin = true;
   f->mac_ignore_invalid_free = false;
@@ -199,6 +199,12 @@ void InitializeFlags(Flags *f, const cha
     cf->detect_leaks = false;
   }
 #endif
+
+  // Make "strict_init_order" imply "check_initialization_order".
+  // TODO(samsonov): Use a single runtime flag for an init-order checker.
+  if (f->strict_init_order) {
+    f->check_initialization_order = true;
+  }
 }
 
 // -------------------------- Globals --------------------- {{{1

Modified: compiler-rt/trunk/lib/asan/lit_tests/TestCases/Linux/initialization-bug-any-order.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/lit_tests/TestCases/Linux/initialization-bug-any-order.cc?rev=194125&r1=194124&r2=194125&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/lit_tests/TestCases/Linux/initialization-bug-any-order.cc (original)
+++ compiler-rt/trunk/lib/asan/lit_tests/TestCases/Linux/initialization-bug-any-order.cc Tue Nov  5 22:27:09 2013
@@ -4,11 +4,9 @@
 // strict init-order checking).
 
 // RUN: %clangxx_asan -O0 %s %p/../Helpers/initialization-bug-extra.cc -o %t
-// RUN: ASAN_OPTIONS=check_initialization_order=true:strict_init_order=true not %t 2>&1 \
-// RUN:    | FileCheck %s
+// RUN: ASAN_OPTIONS=strict_init_order=true not %t 2>&1 | FileCheck %s
 // RUN: %clangxx_asan -O0 %p/../Helpers/initialization-bug-extra.cc %s -o %t
-// RUN: ASAN_OPTIONS=check_initialization_order=true:strict_init_order=true not %t 2>&1 \
-// RUN:    | FileCheck %s
+// RUN: ASAN_OPTIONS=strict_init_order=true not %t 2>&1 | FileCheck %s
 
 // Do not test with optimization -- the error may be optimized away.
 

Modified: compiler-rt/trunk/lib/asan/lit_tests/TestCases/init-order-atexit.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/lit_tests/TestCases/init-order-atexit.cc?rev=194125&r1=194124&r2=194125&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/lit_tests/TestCases/init-order-atexit.cc (original)
+++ compiler-rt/trunk/lib/asan/lit_tests/TestCases/init-order-atexit.cc Tue Nov  5 22:27:09 2013
@@ -5,7 +5,7 @@
 // We do *not* want to report init-order bug in this case.
 
 // RUN: %clangxx_asan -O0 %s %p/Helpers/init-order-atexit-extra.cc -o %t
-// RUN: ASAN_OPTIONS=check_initialization_order=true:strict_init_order=true not %t 2>&1 | FileCheck %s
+// RUN: ASAN_OPTIONS=strict_init_order=true not %t 2>&1 | FileCheck %s
 
 #include <stdio.h>
 #include <stdlib.h>

Modified: compiler-rt/trunk/lib/asan/lit_tests/TestCases/init-order-dlopen.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/lit_tests/TestCases/init-order-dlopen.cc?rev=194125&r1=194124&r2=194125&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/lit_tests/TestCases/init-order-dlopen.cc (original)
+++ compiler-rt/trunk/lib/asan/lit_tests/TestCases/init-order-dlopen.cc Tue Nov  5 22:27:09 2013
@@ -12,7 +12,7 @@
 // FIXME: find a better solution.
 // RUN: %clangxx_asan -O0 %s -o %t -Wl,--export-dynamic || \
 // RUN:     %clangxx_asan -O0 %s -o %t
-// RUN: ASAN_OPTIONS=check_initialization_order=true:strict_init_order=true %t 2>&1 | FileCheck %s
+// RUN: ASAN_OPTIONS=strict_init_order=true %t 2>&1 | FileCheck %s
 #include <dlfcn.h>
 #include <pthread.h>
 #include <stdio.h>

Modified: compiler-rt/trunk/lib/asan/lit_tests/TestCases/init-order-pthread-create.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/lit_tests/TestCases/init-order-pthread-create.cc?rev=194125&r1=194124&r2=194125&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/lit_tests/TestCases/init-order-pthread-create.cc (original)
+++ compiler-rt/trunk/lib/asan/lit_tests/TestCases/init-order-pthread-create.cc Tue Nov  5 22:27:09 2013
@@ -2,7 +2,7 @@
 // called.
 
 // RUN: %clangxx_asan %s %p/Helpers/init-order-pthread-create-extra.cc -o %t
-// RUN: ASAN_OPTIONS=check_initialization_order=true:strict_init_order=true %t
+// RUN: ASAN_OPTIONS=strict_init_order=true %t
 
 #include <stdio.h>
 #include <pthread.h>