diff options
| author | bors <bors@rust-lang.org> | 2017-10-19 18:22:15 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-10-19 18:22:15 +0000 |
| commit | 439f7521b87161908afaace97204d7a0b3438e19 (patch) | |
| tree | 01b3e31e94f47ce91e45c0e3933f6c5706ad6817 /src/test/run-pass/thinlto | |
| parent | 8b45c24b510e80a77c01881736ed0fad8770850e (diff) | |
| parent | 437186217ba37d52da9f657e78b56874a010cd98 (diff) | |
| download | rust-439f7521b87161908afaace97204d7a0b3438e19.tar.gz rust-439f7521b87161908afaace97204d7a0b3438e19.zip | |
Auto merge of #45386 - kennytm:rollup, r=kennytm
Rollup of 8 pull requests - Successful merges: #45343, #45349, #45352, #45374, #45375, #45376, #45377, #45382 - Failed merges:
Diffstat (limited to 'src/test/run-pass/thinlto')
| -rw-r--r-- | src/test/run-pass/thinlto/thin-lto-inlines.rs | 2 | ||||
| -rw-r--r-- | src/test/run-pass/thinlto/thin-lto-inlines2.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/test/run-pass/thinlto/thin-lto-inlines.rs b/src/test/run-pass/thinlto/thin-lto-inlines.rs index 3135a682d86..7a71dd2bc51 100644 --- a/src/test/run-pass/thinlto/thin-lto-inlines.rs +++ b/src/test/run-pass/thinlto/thin-lto-inlines.rs @@ -10,7 +10,7 @@ // compile-flags: -Z thinlto -C codegen-units=8 -O // min-llvm-version 4.0 -// ignore-emscripten +// ignore-emscripten can't inspect instructions on emscripten // We want to assert here that ThinLTO will inline across codegen units. There's // not really a great way to do that in general so we sort of hack around it by diff --git a/src/test/run-pass/thinlto/thin-lto-inlines2.rs b/src/test/run-pass/thinlto/thin-lto-inlines2.rs index ed899d2b115..0e8ad08a5f6 100644 --- a/src/test/run-pass/thinlto/thin-lto-inlines2.rs +++ b/src/test/run-pass/thinlto/thin-lto-inlines2.rs @@ -12,7 +12,7 @@ // aux-build:thin-lto-inlines-aux.rs // min-llvm-version 4.0 // no-prefer-dynamic -// ignore-emscripten +// ignore-emscripten can't inspect instructions on emscripten // We want to assert here that ThinLTO will inline across codegen units. There's // not really a great way to do that in general so we sort of hack around it by |