about summary refs log tree commit diff
path: root/src/rustllvm/RustWrapper.cpp
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-02-09 05:58:29 +0000
committerbors <bors@rust-lang.org>2017-02-09 05:58:29 +0000
commitfd2f8a4536cb9b45abd72b8ff977ad48618602b3 (patch)
tree1a4ac51c16de92345ef062bc86eda21c87e5d57b /src/rustllvm/RustWrapper.cpp
parent29dece1c8bbebf7ae8034ef0826b119281730937 (diff)
parent1e3e904101087c11612f97bc604941e5ee85b86e (diff)
downloadrust-fd2f8a4536cb9b45abd72b8ff977ad48618602b3.tar.gz
rust-fd2f8a4536cb9b45abd72b8ff977ad48618602b3.zip
Auto merge of #39677 - frewsxcv:rollup, r=frewsxcv
Rollup of 9 pull requests

- Successful merges: #37928, #38699, #39589, #39598, #39599, #39641, #39649, #39653, #39671
- Failed merges:
Diffstat (limited to 'src/rustllvm/RustWrapper.cpp')
-rw-r--r--src/rustllvm/RustWrapper.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/rustllvm/RustWrapper.cpp b/src/rustllvm/RustWrapper.cpp
index 4e201c254e3..f3b52b71b99 100644
--- a/src/rustllvm/RustWrapper.cpp
+++ b/src/rustllvm/RustWrapper.cpp
@@ -148,6 +148,12 @@ static Attribute::AttrKind fromRust(LLVMRustAttribute Kind) {
     return Attribute::ZExt;
   case InReg:
     return Attribute::InReg;
+  case SanitizeThread:
+    return Attribute::SanitizeThread;
+  case SanitizeAddress:
+    return Attribute::SanitizeAddress;
+  case SanitizeMemory:
+    return Attribute::SanitizeMemory;
   }
   llvm_unreachable("bad AttributeKind");
 }