Support enum variants in offset_of!

2023-08-15 20:10:45 +01:00 · 2023-08-15 20:10:45 +01:00 · e936416a8d
commit e936416a8d
parent 9d83ac2179
27 changed files with 472 additions and 75 deletions
--- a/compiler/rustc_codegen_cranelift/src/base.rs
+++ b/compiler/rustc_codegen_cranelift/src/base.rs
@ -766,7 +766,7 @@ fn codegen_stmt<'tcx>(
                        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()
+                            layout.offset_of_subfield(fx, fields.iter()).bytes()
                        }
                    };
                    let val = CValue::by_val(