[PATCH] D42389: [ubsan] Add preinit initializer for ubsan

[Francis Ricci via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL323249: [ubsan] Add preinit initializer for ubsan (authored by fjricci, committed by ).
Herald added a subscriber: hintonda.

Repository:
  rL LLVM

https://reviews.llvm.org/D42389

Files:
  compiler-rt/trunk/lib/ubsan/CMakeLists.txt
  compiler-rt/trunk/lib/ubsan/ubsan_flags.cc
  compiler-rt/trunk/lib/ubsan/ubsan_init_standalone_preinit.cc


Index: compiler-rt/trunk/lib/ubsan/CMakeLists.txt
===================================================================
--- compiler-rt/trunk/lib/ubsan/CMakeLists.txt
+++ compiler-rt/trunk/lib/ubsan/CMakeLists.txt
@@ -151,6 +151,7 @@
     add_compiler_rt_runtime(clang_rt.ubsan_standalone
       STATIC
       ARCHS ${UBSAN_SUPPORTED_ARCH}
+      SOURCES ubsan_init_standalone_preinit.cc
       OBJECT_LIBS RTSanitizerCommon
               RTSanitizerCommonLibc
               RTUbsan
Index: compiler-rt/trunk/lib/ubsan/ubsan_flags.cc
===================================================================
--- compiler-rt/trunk/lib/ubsan/ubsan_flags.cc
+++ compiler-rt/trunk/lib/ubsan/ubsan_flags.cc
@@ -26,6 +26,15 @@
   return (&__ubsan_default_options) ? __ubsan_default_options() : "";
 }
 
+static const char *GetFlag(const char *flag) {
+  // We cannot call getenv() from inside a preinit array initializer
+  if (SANITIZER_CAN_USE_PREINIT_ARRAY) {
+    return GetEnv(flag);
+  } else {
+    return getenv(flag);
+  }
+}
+
 Flags ubsan_flags;
 
 void Flags::SetDefaults() {
@@ -47,7 +56,7 @@
     CommonFlags cf;
     cf.CopyFrom(*common_flags());
     cf.print_summary = false;
-    cf.external_symbolizer_path = getenv("UBSAN_SYMBOLIZER_PATH");
+    cf.external_symbolizer_path = GetFlag("UBSAN_SYMBOLIZER_PATH");
     OverrideCommonFlags(cf);
   }
 
@@ -61,7 +70,7 @@
   // Override from user-specified string.
   parser.ParseString(MaybeCallUbsanDefaultOptions());
   // Override from environment variable.
-  parser.ParseString(getenv("UBSAN_OPTIONS"));
+  parser.ParseString(GetFlag("UBSAN_OPTIONS"));
   InitializeCommonFlags();
   if (Verbosity()) ReportUnrecognizedFlags();
 
Index: compiler-rt/trunk/lib/ubsan/ubsan_init_standalone_preinit.cc
===================================================================
--- compiler-rt/trunk/lib/ubsan/ubsan_init_standalone_preinit.cc
+++ compiler-rt/trunk/lib/ubsan/ubsan_init_standalone_preinit.cc
@@ -0,0 +1,36 @@
+//===-- ubsan_init_standalone_preinit.cc ---------------------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+//
+// Initialization of standalone UBSan runtime.
+//
+//===----------------------------------------------------------------------===//
+
+#include "ubsan_platform.h"
+#if !CAN_SANITIZE_UB
+#error "UBSan is not supported on this platform!"
+#endif
+
+#include "sanitizer_common/sanitizer_internal_defs.h"
+#include "ubsan_init.h"
+#include "ubsan_signals_standalone.h"
+
+#if SANITIZER_CAN_USE_PREINIT_ARRAY
+
+namespace __ubsan {
+
+static void PreInitAsStandalone() {
+  InitAsStandalone();
+  InitializeDeadlySignals();
+}
+
+} // namespace __ubsan
+
+__attribute__((section(".preinit_array"), used)) void (*__local_ubsan_preinit)(
+    void) = __ubsan::PreInitAsStandalone;
+#endif // SANITIZER_CAN_USE_PREINIT_ARRAY


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D42389.131123.patch
Type: text/x-patch
Size: 3040 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20180123/21ddb2bd/attachment.bin>