diff options
| author | bors <bors@rust-lang.org> | 2022-08-21 19:05:18 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-08-21 19:05:18 +0000 |
| commit | c0941dfb5a7d07ef2d70cc54d319669d9d6f6c01 (patch) | |
| tree | 37525d0391e25a800121ccc4dcaf7b29d50fb86f /src/test/codegen | |
| parent | 650bff80a623e17675ac72ae4d62ed200a4a3568 (diff) | |
| parent | 5ba68df9884274ab3f8793effda72c2b62990804 (diff) | |
| download | rust-c0941dfb5a7d07ef2d70cc54d319669d9d6f6c01.tar.gz rust-c0941dfb5a7d07ef2d70cc54d319669d9d6f6c01.zip | |
Auto merge of #100847 - matthiaskrgr:rollup-0ga531s, r=matthiaskrgr
Rollup of 11 pull requests Successful merges: - #100556 (Clamp Function for f32 and f64) - #100663 (Make slice::reverse const) - #100697 ( Minor syntax and formatting update to doc comment on `find_vtable_types_for_unsizing`) - #100760 (update test for LLVM change) - #100761 (some general mir typeck cleanup) - #100775 (rustdoc: Merge source code pages HTML elements together v2) - #100813 (Add `/build-rust-analyzer/` to .gitignore) - #100821 (Make some docs nicer wrt pointer offsets) - #100822 (Replace most uses of `pointer::offset` with `add` and `sub`) - #100839 (Make doc for stdin field of process consistent) - #100842 (Add diagnostics lints to `rustc_transmute` module (zero diags)) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/test/codegen')
| -rw-r--r-- | src/test/codegen/pic-relocation-model.rs | 2 | ||||
| -rw-r--r-- | src/test/codegen/pie-relocation-model.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/test/codegen/pic-relocation-model.rs b/src/test/codegen/pic-relocation-model.rs index 6e1d5a6c3f2..bcfe2f9af50 100644 --- a/src/test/codegen/pic-relocation-model.rs +++ b/src/test/codegen/pic-relocation-model.rs @@ -13,4 +13,4 @@ pub fn call_foreign_fn() -> u8 { // CHECK: declare zeroext i8 @foreign_fn() extern "C" {fn foreign_fn() -> u8;} -// CHECK: !{i32 7, !"PIC Level", i32 2} +// CHECK: !{i32 {{[78]}}, !"PIC Level", i32 2} diff --git a/src/test/codegen/pie-relocation-model.rs b/src/test/codegen/pie-relocation-model.rs index a843202a94f..ec44edc0667 100644 --- a/src/test/codegen/pie-relocation-model.rs +++ b/src/test/codegen/pie-relocation-model.rs @@ -18,5 +18,5 @@ pub fn call_foreign_fn() -> u8 { // CHECK: declare zeroext i8 @foreign_fn() extern "C" {fn foreign_fn() -> u8;} -// CHECK: !{i32 7, !"PIC Level", i32 2} +// CHECK: !{i32 {{[78]}}, !"PIC Level", i32 2} // CHECK: !{i32 7, !"PIE Level", i32 2} |