diff options
| -rw-r--r-- | compiler-rt/lib/ubsan/ubsan_interface.inc | 2 | ||||
| -rw-r--r-- | compiler-rt/test/asan/TestCases/Darwin/interface_symbols_darwin.cc (renamed from compiler-rt/test/asan/TestCases/Darwin/interface_symbols_darwin.c) | 3 | ||||
| -rw-r--r-- | compiler-rt/test/asan/TestCases/Linux/interface_symbols_linux.cc (renamed from compiler-rt/test/asan/TestCases/Linux/interface_symbols_linux.c) | 3 | ||||
| -rw-r--r-- | compiler-rt/test/asan/TestCases/Windows/interface_symbols_windows.cc (renamed from compiler-rt/test/asan/TestCases/Windows/interface_symbols_windows.c) | 1 |
4 files changed, 5 insertions, 4 deletions
diff --git a/compiler-rt/lib/ubsan/ubsan_interface.inc b/compiler-rt/lib/ubsan/ubsan_interface.inc index d2e5a67fa0d..9beb3e2ff95 100644 --- a/compiler-rt/lib/ubsan/ubsan_interface.inc +++ b/compiler-rt/lib/ubsan/ubsan_interface.inc @@ -16,6 +16,8 @@ INTERFACE_FUNCTION(__ubsan_handle_cfi_check_fail) INTERFACE_FUNCTION(__ubsan_handle_cfi_check_fail_abort) INTERFACE_FUNCTION(__ubsan_handle_divrem_overflow) INTERFACE_FUNCTION(__ubsan_handle_divrem_overflow_abort) +INTERFACE_FUNCTION(__ubsan_handle_dynamic_type_cache_miss) +INTERFACE_FUNCTION(__ubsan_handle_dynamic_type_cache_miss_abort) INTERFACE_FUNCTION(__ubsan_handle_float_cast_overflow) INTERFACE_FUNCTION(__ubsan_handle_float_cast_overflow_abort) INTERFACE_FUNCTION(__ubsan_handle_function_type_mismatch) diff --git a/compiler-rt/test/asan/TestCases/Darwin/interface_symbols_darwin.c b/compiler-rt/test/asan/TestCases/Darwin/interface_symbols_darwin.cc index 431de435fb9..a8e2bcb3ebc 100644 --- a/compiler-rt/test/asan/TestCases/Darwin/interface_symbols_darwin.c +++ b/compiler-rt/test/asan/TestCases/Darwin/interface_symbols_darwin.cc @@ -2,7 +2,7 @@ // If you're changing this file, please also change // ../Linux/interface_symbols.c -// RUN: %clang_asan -dead_strip -O2 %s -o %t.exe +// RUN: %clangxx_asan -dead_strip -O2 %s -o %t.exe // // note: we can not use -D on Darwin. // RUN: nm -g `%clang_asan %s -fsanitize=address -### 2>&1 | grep "libclang_rt.asan_osx_dynamic.dylib" | sed -e 's/.*"\(.*libclang_rt.asan_osx_dynamic.dylib\)".*/\1/'` \ @@ -11,7 +11,6 @@ // RUN: | grep -v "__sanitizer_syscall" \ // RUN: | grep -v "__sanitizer_weak_hook" \ // RUN: | grep -v "__sanitizer_mz" \ -// RUN: | grep -v "__ubsan_handle_dynamic_type_cache_miss" \ // RUN: | grep -v "__sancov_lowest_stack" \ // RUN: | sed -e "s/__asan_version_mismatch_check_v[0-9]+/__asan_version_mismatch_check/" \ // RUN: > %t.exports diff --git a/compiler-rt/test/asan/TestCases/Linux/interface_symbols_linux.c b/compiler-rt/test/asan/TestCases/Linux/interface_symbols_linux.cc index a8b9d37cc12..8c22976e710 100644 --- a/compiler-rt/test/asan/TestCases/Linux/interface_symbols_linux.c +++ b/compiler-rt/test/asan/TestCases/Linux/interface_symbols_linux.cc @@ -1,11 +1,10 @@ // Check the presence of interface symbols in compiled file. -// RUN: %clang_asan -O2 %s -o %t.exe +// RUN: %clangxx_asan -O2 %s -o %t.exe // RUN: nm -D %t.exe | grep " [TWw] " \ // RUN: | grep -o "\(__asan_\|__ubsan_\|__sancov_\|__sanitizer_\)[^ ]*" \ // RUN: | grep -v "__sanitizer_syscall" \ // RUN: | grep -v "__sanitizer_weak_hook" \ -// RUN: | grep -v "__ubsan_handle_dynamic_type_cache_miss" \ // RUN: | grep -v "__sancov_lowest_stack" \ // RUN: | sed -e "s/__asan_version_mismatch_check_v[0-9]+/__asan_version_mismatch_check/" \ // RUN: > %t.exports diff --git a/compiler-rt/test/asan/TestCases/Windows/interface_symbols_windows.c b/compiler-rt/test/asan/TestCases/Windows/interface_symbols_windows.cc index bc2f3e88375..4a59dba25b0 100644 --- a/compiler-rt/test/asan/TestCases/Windows/interface_symbols_windows.c +++ b/compiler-rt/test/asan/TestCases/Windows/interface_symbols_windows.cc @@ -39,6 +39,7 @@ // IMPORT: __asan_unhandled_exception_filter // IMPORT: __asan_test_only_reported_buggy_pointer // IMPORT: __sancov_lowest_stack +// IMPORT: __ubsan_vptr_type_cache // // RUN: cat %t.imports1 %t.imports2 %t.imports3 | sort | uniq > %t.imports-sorted // RUN: cat %t.exports | sort | uniq > %t.exports-sorted |
