Support enum variants in offset_of!

GKFX · GKFX · commit 03c9acdd8fec · 2023-10-31T23:25:54.000Z
diff --git a/src/base.rs b/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(

Original file line number	Diff line number	Diff line change
`@@ -766,7 +766,7 @@ fn codegen_stmt<'tcx>(`
`766`	`766`	`NullOp::SizeOf => layout.size.bytes(),`
`767`	`767`	`NullOp::AlignOf => layout.align.abi.bytes(),`
`768`	`768`	`NullOp::OffsetOf(fields) => {`
`769`		`- layout.offset_of_subfield(fx, fields.iter().map(\|f\| f.index())).bytes()`
	`769`	`+ layout.offset_of_subfield(fx, fields.iter()).bytes()`
`770`	`770`	`}`
`771`	`771`	`};`
`772`	`772`	`let val = CValue::by_val(`