diff options
author | Thomas Lively <tlively@google.com> | 2019-05-29 18:31:50 +0000 |
---|---|---|
committer | Thomas Lively <tlively@google.com> | 2019-05-29 18:31:50 +0000 |
commit | 5458cd4027f534a9c02ade8fadb66701c47366be (patch) | |
tree | 19ab5abf7257b878c5f1815b37d4b458ac4f2340 /clang | |
parent | dea605e0907804fd63365ac0273e8a39781fe25d (diff) | |
download | bcm5719-llvm-5458cd4027f534a9c02ade8fadb66701c47366be.tar.gz bcm5719-llvm-5458cd4027f534a9c02ade8fadb66701c47366be.zip |
[WebAssembly] Support VPtr sanitizer for Emscripten
Summary:
After https://github.com/emscripten-core/emscripten/pull/8651, Emscripten
supports the full UBSan runtime. This includes the VPtr sanitizer.
This diff allows clang to generate code that uses the VPtr sanitizer for
Emscripten.
Patch by Guanzhong Chen
Reviewers: tlively, aheejin
Reviewed By: aheejin
Subscribers: dschuff, sbc100, jgravelle-google, sunfish, cfe-commits
Tags: #clang
Differential Revision: https://reviews.llvm.org/D62559
llvm-svn: 362004
Diffstat (limited to 'clang')
-rw-r--r-- | clang/lib/Driver/ToolChains/WebAssembly.cpp | 8 | ||||
-rw-r--r-- | clang/lib/Driver/ToolChains/WebAssembly.h | 1 | ||||
-rw-r--r-- | clang/test/CodeGenCXX/wasm-sanitize-vptr.cpp | 20 |
3 files changed, 29 insertions, 0 deletions
diff --git a/clang/lib/Driver/ToolChains/WebAssembly.cpp b/clang/lib/Driver/ToolChains/WebAssembly.cpp index af6e856b9f9..7fffbbe6bf5 100644 --- a/clang/lib/Driver/ToolChains/WebAssembly.cpp +++ b/clang/lib/Driver/ToolChains/WebAssembly.cpp @@ -208,6 +208,14 @@ void WebAssembly::AddCXXStdlibLibArgs(const llvm::opt::ArgList &Args, } } +SanitizerMask WebAssembly::getSupportedSanitizers() const { + SanitizerMask Res = ToolChain::getSupportedSanitizers(); + if (getTriple().isOSEmscripten()) { + Res |= SanitizerKind::Vptr; + } + return Res; +} + Tool *WebAssembly::buildLinker() const { return new tools::wasm::Linker(*this); } diff --git a/clang/lib/Driver/ToolChains/WebAssembly.h b/clang/lib/Driver/ToolChains/WebAssembly.h index 8e4e545c985..67d5fce8457 100644 --- a/clang/lib/Driver/ToolChains/WebAssembly.h +++ b/clang/lib/Driver/ToolChains/WebAssembly.h @@ -66,6 +66,7 @@ private: llvm::opt::ArgStringList &CC1Args) const override; void AddCXXStdlibLibArgs(const llvm::opt::ArgList &Args, llvm::opt::ArgStringList &CmdArgs) const override; + SanitizerMask getSupportedSanitizers() const override; const char *getDefaultLinker() const override { return "wasm-ld"; } diff --git a/clang/test/CodeGenCXX/wasm-sanitize-vptr.cpp b/clang/test/CodeGenCXX/wasm-sanitize-vptr.cpp new file mode 100644 index 00000000000..2a9055aea1e --- /dev/null +++ b/clang/test/CodeGenCXX/wasm-sanitize-vptr.cpp @@ -0,0 +1,20 @@ +// RUN: %clang_cc1 -std=c++11 -fsanitize=vptr -emit-llvm %s -o - -triple wasm32-unknown-emscripten | FileCheck %s + +struct S { + virtual ~S() {} + int a; +}; + +struct T : S { + int b; +}; + +// CHECK-LABEL: @_Z15bad_static_castv +void bad_static_cast() { + S s; + // CHECK: br i1 %[[NONNULL:.*]], label %[[CONT:.*]], label %[[MISS:.*]], !prof + // CHECK: [[MISS]]: + // CHECK: call void @__ubsan_handle_dynamic_type_cache_miss_abort + // CHECK: [[CONT]]: + T &r = static_cast<T &>(s); +} |