diff options
| author | Vedant Kumar <vsk@apple.com> | 2018-06-22 20:15:33 +0000 |
|---|---|---|
| committer | Vedant Kumar <vsk@apple.com> | 2018-06-22 20:15:33 +0000 |
| commit | 360b21e24e3c504439d8958b0bc0cb3e12fe9a4c (patch) | |
| tree | e198890e97871b8e34640e414528cd8937f9195d /lib | |
| parent | 6e647114ea9f022304be52f65da779d4e3bce821 (diff) | |
[ubsan] Fix __ubsan_on_report interface definition
Speculative fix for the interface definition of __ubsan_on_report for
the Windows bots:
http://lab.llvm.org:8011/builders/sanitizer-windows/builds/30528
lib\ubsan\ubsan_interface.inc(55): error C2065: '__ubsan_on_report':
undeclared identifier
INTERCEPT_SANITIZER_WEAK_FUNCTION was the wrong macro to use to begin
with because __ubsan_on_report isn't weak. Reading through that macro,
it's still not clear to me why there is an undefined reference, though,
because it appears to define a dummy __ubsan_on_report shim.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@335383 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ubsan/ubsan_interface.inc | 2 | ||||
| -rw-r--r-- | lib/ubsan/ubsan_win_weak_interception.cc | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/ubsan/ubsan_interface.inc b/lib/ubsan/ubsan_interface.inc index ab00557f0..782c621a2 100644 --- a/lib/ubsan/ubsan_interface.inc +++ b/lib/ubsan/ubsan_interface.inc @@ -52,5 +52,5 @@ INTERFACE_FUNCTION(__ubsan_handle_type_mismatch_v1_abort) INTERFACE_FUNCTION(__ubsan_handle_vla_bound_not_positive) INTERFACE_FUNCTION(__ubsan_handle_vla_bound_not_positive_abort) INTERFACE_WEAK_FUNCTION(__ubsan_default_options) -INTERFACE_WEAK_FUNCTION(__ubsan_on_report) +INTERFACE_FUNCTION(__ubsan_on_report) INTERFACE_FUNCTION(__ubsan_get_current_report_data) diff --git a/lib/ubsan/ubsan_win_weak_interception.cc b/lib/ubsan/ubsan_win_weak_interception.cc index 353719eef..c28577057 100644 --- a/lib/ubsan/ubsan_win_weak_interception.cc +++ b/lib/ubsan/ubsan_win_weak_interception.cc @@ -14,6 +14,7 @@ #ifdef SANITIZER_DYNAMIC #include "sanitizer_common/sanitizer_win_weak_interception.h" #include "ubsan_flags.h" +#include "ubsan_monitor.h" // Check if strong definitions for weak functions are present in the main // executable. If that is the case, override dll functions to point to strong // implementations. |