Revert "Canonicalize GEPs"

This reverts commit 23cc55f.
rust-lang · Dec 11, 2024 · 2547971 · 2547971
1 parent b84448f
commit 2547971
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 21 deletions.
diff --git a/compiler/rustc_codegen_ssa/src/mir/place.rs b/compiler/rustc_codegen_ssa/src/mir/place.rs
@@ -422,18 +422,10 @@ impl<'a, 'tcx, V: CodegenObject> PlaceRef<'tcx, V> {
             layout.size
         };
 
-        let llval = {
-            let pointee_layout = layout;
-            let bytes = pointee_layout.size.align_to(pointee_layout.align.abi).bytes();
-            let rhs = if bytes == 1 {
-                llindex
-            } else {
-                let lhs = llindex;
-                let rhs = bx.cx().const_usize(bytes);
-                bx.unchecked_umul(lhs, rhs)
-            };
-            bx.inbounds_ptradd(self.val.llval, rhs)
-        };
+        let llval = bx.inbounds_gep(bx.cx().backend_type(self.layout), self.val.llval, &[
+            bx.cx().const_usize(0),
+            llindex,
+        ]);
         let align = self.val.align.restrict_for_offset(offset);
         PlaceValue::new_sized(llval, align).with_type(layout)
     }

diff --git a/compiler/rustc_codegen_ssa/src/mir/rvalue.rs b/compiler/rustc_codegen_ssa/src/mir/rvalue.rs
@@ -925,15 +925,8 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
                     // so offsetting a pointer to ZST is a noop.
                     lhs
                 } else {
-                    let bytes = pointee_layout.size.align_to(pointee_layout.align.abi).bytes();
-                    let rhs = if bytes == 1 {
-                        rhs
-                    } else {
-                        let lhs = rhs;
-                        let rhs = bx.cx().const_usize(bytes);
-                        bx.unchecked_umul(lhs, rhs)
-                    };
-                    bx.inbounds_ptradd(lhs, rhs)
+                    let llty = bx.cx().backend_type(pointee_layout);
+                    bx.inbounds_gep(llty, lhs, &[rhs])
                 }
             }
             mir::BinOp::Shl | mir::BinOp::ShlUnchecked => {