diff options
| author | bjorn3 <17426603+bjorn3@users.noreply.github.com> | 2024-08-22 11:08:13 +0000 |
|---|---|---|
| committer | bjorn3 <17426603+bjorn3@users.noreply.github.com> | 2024-08-22 11:08:13 +0000 |
| commit | 46b7db19ae516cd7098f4e5f5f0b4d31770b3f64 (patch) | |
| tree | b8df705ca427ca509d614ac08333bc9de1bcf247 | |
| parent | 01f873990a341be1db0b9d86a397a302fac24d29 (diff) | |
| parent | 8e7b3b5c2b307eb078ea836eba4e5bb30e5c4b60 (diff) | |
| download | rust-46b7db19ae516cd7098f4e5f5f0b4d31770b3f64.tar.gz rust-46b7db19ae516cd7098f4e5f5f0b4d31770b3f64.zip | |
Sync from rust a32d4a0e822a29a6682e08b75a8df4c29c7fa9f1
| -rw-r--r-- | example/mini_core_hello_world.rs | 3 | ||||
| -rw-r--r-- | src/analyze.rs | 2 | ||||
| -rw-r--r-- | src/base.rs | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/example/mini_core_hello_world.rs b/example/mini_core_hello_world.rs index e603ac566f4..ccbd5a78485 100644 --- a/example/mini_core_hello_world.rs +++ b/example/mini_core_hello_world.rs @@ -6,8 +6,7 @@ extern_types, naked_functions, thread_local, - repr_simd, - raw_ref_op + repr_simd )] #![no_core] #![allow(dead_code, non_camel_case_types, internal_features)] diff --git a/src/analyze.rs b/src/analyze.rs index c5762638a6b..72380f50385 100644 --- a/src/analyze.rs +++ b/src/analyze.rs @@ -25,7 +25,7 @@ pub(crate) fn analyze(fx: &FunctionCx<'_, '_, '_>) -> IndexVec<Local, SsaKind> { for stmt in bb.statements.iter() { match &stmt.kind { Assign(place_and_rval) => match &place_and_rval.1 { - Rvalue::Ref(_, _, place) | Rvalue::AddressOf(_, place) => { + Rvalue::Ref(_, _, place) | Rvalue::RawPtr(_, place) => { flag_map[place.local] = SsaKind::NotSsa; } _ => {} diff --git a/src/base.rs b/src/base.rs index 9bc7b57c537..f1d885bf1bc 100644 --- a/src/base.rs +++ b/src/base.rs @@ -595,7 +595,7 @@ fn codegen_stmt<'tcx>( let val = cplace.to_cvalue(fx); lval.write_cvalue(fx, val) } - Rvalue::Ref(_, _, place) | Rvalue::AddressOf(_, place) => { + Rvalue::Ref(_, _, place) | Rvalue::RawPtr(_, place) => { let place = codegen_place(fx, place); let ref_ = place.place_ref(fx, lval.layout()); lval.write_cvalue(fx, ref_); |