diff options
| author | bors <bors@rust-lang.org> | 2020-02-12 22:43:20 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-02-12 22:43:20 +0000 |
| commit | 92d8e82f6b571cecb1809a9aa85f8947e84b648d (patch) | |
| tree | 389649e7fcb8d8ad1709183e482bc0f158441f5f /src/test/codegen | |
| parent | a1912f2e89b77cfe2a0e64b96f444848fe4e2d49 (diff) | |
| parent | 839adda4be859bac6518d3d3e0f6093defefae65 (diff) | |
| download | rust-92d8e82f6b571cecb1809a9aa85f8947e84b648d.tar.gz rust-92d8e82f6b571cecb1809a9aa85f8947e84b648d.zip | |
Auto merge of #69105 - Dylan-DPC:rollup-n73lh5h, r=Dylan-DPC
Rollup of 7 pull requests Successful merges: - #67954 (Support new LLVM pass manager) - #68981 ( Account for type params on method without parentheses) - #69002 (miri: improve and simplify overflow detection) - #69038 (Add initial debug fmt for Backtrace) - #69040 (Cleanup SGX entry code) - #69086 (Update compiler-builtins to 0.1.25) - #69095 (Minified theme check) Failed merges: r? @ghost
Diffstat (limited to 'src/test/codegen')
| -rw-r--r-- | src/test/codegen/sanitizer-memory-track-orgins.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/test/codegen/sanitizer-memory-track-orgins.rs b/src/test/codegen/sanitizer-memory-track-orgins.rs index 1fd496b35df..8ea41c5d44b 100644 --- a/src/test/codegen/sanitizer-memory-track-orgins.rs +++ b/src/test/codegen/sanitizer-memory-track-orgins.rs @@ -15,10 +15,10 @@ #![crate_type="lib"] // MSAN-0-NOT: @__msan_track_origins -// MSAN-1: @__msan_track_origins = weak_odr local_unnamed_addr constant i32 1 -// MSAN-2: @__msan_track_origins = weak_odr local_unnamed_addr constant i32 2 -// MSAN-1-LTO: @__msan_track_origins = weak_odr local_unnamed_addr constant i32 1 -// MSAN-2-LTO: @__msan_track_origins = weak_odr local_unnamed_addr constant i32 2 +// MSAN-1: @__msan_track_origins = weak_odr {{.*}}constant i32 1 +// MSAN-2: @__msan_track_origins = weak_odr {{.*}}constant i32 2 +// MSAN-1-LTO: @__msan_track_origins = weak_odr {{.*}}constant i32 1 +// MSAN-2-LTO: @__msan_track_origins = weak_odr {{.*}}constant i32 2 // // MSAN-0-LABEL: define void @copy( // MSAN-1-LABEL: define void @copy( |