Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of 6 pull requests #125663

Closed
wants to merge 21 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
ead02ba
NVPTX: Avoid PassMode::Direct for args in C abi
May 10, 2024
f63931b
Cleanup custom mingw in CI
ChrisDenton May 26, 2024
19cfe8d
Add "Setup Python" action to github-hosted runners
ChrisDenton May 26, 2024
ede62b8
Add an intrinsic for `ptr::metadata`
scottmcm Apr 21, 2024
ce8f37b
Add custom mir support for `PtrMetadata`
scottmcm May 25, 2024
0f9e4d6
Add Miri tests for `PtrMetadata` UB
scottmcm May 26, 2024
f931290
Update description of install-mingw
ChrisDenton May 27, 2024
713ddc2
Add Miri smoke pass test for ptr_metadata intrinsic
scottmcm May 27, 2024
bcfa67d
Remove out-of-date comment.
nnethercote May 22, 2024
5673337
Add `assert_not_contains` to `run-make-support` library
GuillaumeGomez May 27, 2024
404d47e
Migrate `run-make/allow-warnings-cmdline-stability` to `rmake.rs`
GuillaumeGomez May 26, 2024
4702a1c
Fix comments.
nnethercote May 28, 2024
f1b0ca0
Don't format `tests/run-make/*/rmake.rs`.
nnethercote May 28, 2024
50a5da1
EvalCtxt::tcx() -> EvalCtxt::interner()
compiler-errors May 19, 2024
f494036
Make ProofTreeBuilder actually generic over interner
compiler-errors May 19, 2024
2c5a26b
Rollup merge of #117671 - kjetilkjeka:nvptx_c_abi_avoid_direct, r=dav…
matthiaskrgr May 28, 2024
f96ce48
Rollup merge of #124251 - scottmcm:unop-ptr-metadata, r=oli-obk
matthiaskrgr May 28, 2024
df3b962
Rollup merge of #125573 - GuillaumeGomez:migrate-allow-warnings-cmdli…
matthiaskrgr May 28, 2024
1c51557
Rollup merge of #125590 - ChrisDenton:mingw-ci-3, r=Kobzol
matthiaskrgr May 28, 2024
87cd582
Rollup merge of #125598 - compiler-errors:proof-tree-builder, r=lcnr
matthiaskrgr May 28, 2024
2c7d9ce
Rollup merge of #125637 - nnethercote:rustfmt-fixes, r=GuillaumeGomez
matthiaskrgr May 28, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add custom mir support for PtrMetadata
  • Loading branch information
scottmcm committed May 27, 2024
commit ce8f37be22ac26249c917ac6cdcffa0102c11c94
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,7 @@ impl<'tcx, 'body> ParseCtxt<'tcx, 'body> {
Ok(Rvalue::BinaryOp(BinOp::Offset, Box::new((ptr, offset))))
},
@call(mir_len, args) => Ok(Rvalue::Len(self.parse_place(args[0])?)),
@call(mir_ptr_metadata, args) => Ok(Rvalue::UnaryOp(UnOp::PtrMetadata, self.parse_operand(args[0])?)),
@call(mir_copy_for_deref, args) => Ok(Rvalue::CopyForDeref(self.parse_place(args[0])?)),
ExprKind::Borrow { borrow_kind, arg } => Ok(
Rvalue::Ref(self.tcx.lifetimes.re_erased, *borrow_kind, self.parse_place(*arg)?)
Expand Down
1 change: 1 addition & 0 deletions compiler/rustc_span/src/symbol.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1179,6 +1179,7 @@ symbols! {
mir_make_place,
mir_move,
mir_offset,
mir_ptr_metadata,
mir_retag,
mir_return,
mir_return_to,
Expand Down
4 changes: 4 additions & 0 deletions library/core/src/intrinsics/mir.rs
Original file line number Diff line number Diff line change
Expand Up @@ -360,6 +360,10 @@ define!("mir_assume", fn Assume(operand: bool));
define!("mir_deinit", fn Deinit<T>(place: T));
define!("mir_checked", fn Checked<T>(binop: T) -> (T, bool));
define!("mir_len", fn Len<T>(place: T) -> usize);
define!(
"mir_ptr_metadata",
fn PtrMetadata<P: ?Sized>(place: *const P) -> <P as ::core::ptr::Pointee>::Metadata
);
define!("mir_copy_for_deref", fn CopyForDeref<T>(place: T) -> T);
define!("mir_retag", fn Retag<T>(place: T));
define!("mir_move", fn Move<T>(place: T) -> T);
Expand Down
13 changes: 13 additions & 0 deletions tests/mir-opt/building/custom/operators.g.runtime.after.mir
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
// MIR for `g` after runtime

fn g(_1: *const i32, _2: *const [i32]) -> () {
let mut _0: ();
let mut _3: ();
let mut _4: usize;

bb0: {
_3 = PtrMetadata(_1);
_4 = PtrMetadata(_2);
return;
}
}
10 changes: 10 additions & 0 deletions tests/mir-opt/building/custom/operators.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,13 @@ pub fn f(a: i32, b: bool) -> i32 {
Return()
})
}

// EMIT_MIR operators.g.runtime.after.mir
#[custom_mir(dialect = "runtime")]
pub fn g(p: *const i32, q: *const [i32]) {
mir!({
let a = PtrMetadata(p);
let b = PtrMetadata(q);
Return()
})
}