diff options
| author | bors <bors@rust-lang.org> | 2022-03-02 05:32:00 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-03-02 05:32:00 +0000 |
| commit | 2a280de64fb34378174fa33b6866a7ee920ceb8d (patch) | |
| tree | 9399eae34b3e1e5526e28c18d78d10b37afdb221 /src/test/codegen | |
| parent | 39a3b527674c1c8d2b9d3edc0cfae67abe6b3ecb (diff) | |
| parent | e89ab08f11332f11d8b574b43f11b9d7b3c18346 (diff) | |
| download | rust-2a280de64fb34378174fa33b6866a7ee920ceb8d.tar.gz rust-2a280de64fb34378174fa33b6866a7ee920ceb8d.zip | |
Auto merge of #94514 - matthiaskrgr:rollup-pdzn82h, r=matthiaskrgr
Rollup of 9 pull requests Successful merges: - #94464 (Suggest adding a new lifetime parameter when two elided lifetimes should match up for traits and impls.) - #94476 (7 - Make more use of `let_chains`) - #94478 (Fix panic when handling intra doc links generated from macro) - #94482 (compiler: fix some typos) - #94490 (Update books) - #94496 (tests: accept llvm intrinsic in align-checking test) - #94498 (9 - Make more use of `let_chains`) - #94503 (Provide C FFI types via core::ffi, not just in std) - #94513 (update Miri) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/test/codegen')
| -rw-r--r-- | src/test/codegen/dst-vtable-align-nonzero.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/test/codegen/dst-vtable-align-nonzero.rs b/src/test/codegen/dst-vtable-align-nonzero.rs index 021c7b19f89..14c4c3f30f9 100644 --- a/src/test/codegen/dst-vtable-align-nonzero.rs +++ b/src/test/codegen/dst-vtable-align-nonzero.rs @@ -24,6 +24,7 @@ pub fn eliminates_runtime_check_when_align_1( x: &Struct<WrapperWithAlign1<dyn Trait>> ) -> &WrapperWithAlign1<dyn Trait> { // CHECK: load [[USIZE:i[0-9]+]], {{.+}} !range [[RANGE_META:![0-9]+]] + // CHECK-NOT: llvm.umax // CHECK-NOT: icmp // CHECK-NOT: select // CHECK: ret @@ -36,8 +37,7 @@ pub fn does_not_eliminate_runtime_check_when_align_2( x: &Struct<WrapperWithAlign2<dyn Trait>> ) -> &WrapperWithAlign2<dyn Trait> { // CHECK: [[X0:%[0-9]+]] = load [[USIZE]], {{.+}} !range [[RANGE_META]] - // CHECK: [[X1:%[0-9]+]] = icmp {{.+}} [[X0]] - // CHECK: [[X2:%[0-9]+]] = select {{.+}} [[X1]] + // CHECK: {{icmp|llvm.umax}} // CHECK: ret &x.dst } |