about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2023-04-22 00:10:44 +0000
committerbors <bors@rust-lang.org>2023-04-22 00:10:44 +0000
commit6b80e9c0a6fec3080c82809c277b54cfa2334778 (patch)
tree20e777f9af8b1233b808417f7b530d3561949a6c
parent22e6885de0b02097eb6a8599c70df7925601ddc1 (diff)
parent9dd0653ed53595886669620f51fdf69c7ff0b63f (diff)
downloadrust-6b80e9c0a6fec3080c82809c277b54cfa2334778.tar.gz
rust-6b80e9c0a6fec3080c82809c277b54cfa2334778.zip
Auto merge of #106934 - DrMeepster:offset_of, r=WaffleLapkin
Add offset_of! macro (RFC 3308)

Implements https://github.com/rust-lang/rfcs/pull/3308 (tracking issue #106655) by adding the built in macro `core::mem::offset_of`. Two of the future possibilities are also implemented:

* Nested field accesses (without array indexing)
* DST support (for `Sized` fields)

I wrote this a few months ago, before the RFC merged. Now that it's merged, I decided to rebase and finish it.

cc `@thomcc` (RFC author)
-rw-r--r--src/base.rs5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/base.rs b/src/base.rs
index f5301f9f7f1..f481290583e 100644
--- a/src/base.rs
+++ b/src/base.rs
@@ -781,12 +781,15 @@ fn codegen_stmt<'tcx>(
                     let operand = operand.load_scalar(fx);
                     lval.write_cvalue(fx, CValue::by_val(operand, box_layout));
                 }
-                Rvalue::NullaryOp(null_op, ty) => {
+                Rvalue::NullaryOp(ref null_op, ty) => {
                     assert!(lval.layout().ty.is_sized(fx.tcx, ParamEnv::reveal_all()));
                     let layout = fx.layout_of(fx.monomorphize(ty));
                     let val = match null_op {
                         NullOp::SizeOf => layout.size.bytes(),
                         NullOp::AlignOf => layout.align.abi.bytes(),
+                        NullOp::OffsetOf(fields) => {
+                            layout.offset_of_subfield(fx, fields.iter().map(|f| f.index())).bytes()
+                        }
                     };
                     let val = CValue::const_val(fx, fx.layout_of(fx.tcx.types.usize), val.into());
                     lval.write_cvalue(fx, val);