[llvm-commits] [compiler-rt] r161869 - in /compiler-rt/trunk/lib/asan: asan_flags.h asan_rtl.cc lit_tests/default_options.cc

[Alexey Samsonov]

Author: samsonov
Date: Tue Aug 14 08:54:28 2012
New Revision: 161869

URL: http://llvm.org/viewvc/llvm-project?rev=161869&view=rev
Log:
[ASan] make sure __asan_default_options gets default visibility, port corresponding test to lit

Added:
    compiler-rt/trunk/lib/asan/lit_tests/default_options.cc
Modified:
    compiler-rt/trunk/lib/asan/asan_flags.h
    compiler-rt/trunk/lib/asan/asan_rtl.cc

Modified: compiler-rt/trunk/lib/asan/asan_flags.h
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_flags.h?rev=161869&r1=161868&r2=161869&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/asan_flags.h (original)
+++ compiler-rt/trunk/lib/asan/asan_flags.h Tue Aug 14 08:54:28 2012
@@ -25,7 +25,8 @@
 
 extern "C" {
 // Can be overriden by user.
-const char *__asan_default_options() SANITIZER_WEAK_ATTRIBUTE;
+const char *__asan_default_options()
+    SANITIZER_WEAK_ATTRIBUTE SANITIZER_INTERFACE_ATTRIBUTE;
 }  // extern "C"
 
 namespace __asan {

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=161869&r1=161868&r2=161869&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/asan_rtl.cc (original)
+++ compiler-rt/trunk/lib/asan/asan_rtl.cc Tue Aug 14 08:54:28 2012
@@ -101,7 +101,9 @@
 }
 
 extern "C" {
-const char* WEAK __asan_default_options() { return ""; }
+SANITIZER_WEAK_ATTRIBUTE
+SANITIZER_INTERFACE_ATTRIBUTE
+const char* __asan_default_options() { return ""; }
 }  // extern "C"
 
 void InitializeFlags(Flags *f, const char *env) {

Added: compiler-rt/trunk/lib/asan/lit_tests/default_options.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/lit_tests/default_options.cc?rev=161869&view=auto
==============================================================================
--- compiler-rt/trunk/lib/asan/lit_tests/default_options.cc (added)
+++ compiler-rt/trunk/lib/asan/lit_tests/default_options.cc Tue Aug 14 08:54:28 2012
@@ -0,0 +1,15 @@
+// RUN: %clang_asan -O2 %s -o %t
+// RUN: %t 2>&1 | FileCheck %s
+
+const char *kAsanDefaultOptions="verbosity=1 foo=bar";
+
+extern "C"
+__attribute__((no_address_safety_analysis))
+const char *__asan_default_options() {
+  // CHECK: Using the defaults from __asan_default_options: {{.*}} foo=bar
+  return kAsanDefaultOptions;
+}
+
+int main() {
+  return 0;
+}