diff --git a/src/codegen/llvm.zig b/src/codegen/llvm.zig
index 68d929c5a4..cd9ef98e44 100644
--- a/src/codegen/llvm.zig
+++ b/src/codegen/llvm.zig
@@ -4033,24 +4033,16 @@ pub const DeclGen = struct {
                             const final_llvm_ty = (try dg.lowerType(ptr_child_ty)).pointerType(0);
                             break :blk field_addr.constIntToPtr(final_llvm_ty);
                         }
+                        bitcast_needed = !field_ty.eql(ptr_child_ty, dg.module);
 
                         var ty_buf: Type.Payload.Pointer = undefined;
-
+                        const llvm_field_index = llvmFieldIndex(parent_ty, field_index, target, &ty_buf).?;
+                        const indices: [2]*llvm.Value = .{
+                            llvm_u32.constInt(0, .False),
+                            llvm_u32.constInt(llvm_field_index, .False),
+                        };
                         const parent_llvm_ty = try dg.lowerType(parent_ty);
-                        if (llvmFieldIndex(parent_ty, field_index, target, &ty_buf)) |llvm_field_index| {
-                            bitcast_needed = !field_ty.eql(ptr_child_ty, dg.module);
-                            const indices: [2]*llvm.Value = .{
-                                llvm_u32.constInt(0, .False),
-                                llvm_u32.constInt(llvm_field_index, .False),
-                            };
-                            break :blk parent_llvm_ty.constInBoundsGEP(parent_llvm_ptr, &indices, indices.len);
-                        } else {
-                            bitcast_needed = !parent_ty.eql(ptr_child_ty, dg.module);
-                            const indices: [1]*llvm.Value = .{
-                                llvm_u32.constInt(1, .False),
-                            };
-                            break :blk parent_llvm_ty.constInBoundsGEP(parent_llvm_ptr, &indices, indices.len);
-                        }
+                        break :blk parent_llvm_ty.constInBoundsGEP(parent_llvm_ptr, &indices, indices.len);
                     },
                     .Pointer => {
                         assert(parent_ty.isSlice());
diff --git a/test/behavior/struct.zig b/test/behavior/struct.zig
index 0984f7d1e4..db7092ab82 100644
--- a/test/behavior/struct.zig
+++ b/test/behavior/struct.zig
@@ -1359,33 +1359,23 @@ test "under-aligned struct field" {
     try expect(result == 1234);
 }
 
-test "fieldParentPtr of a zero-bit field" {
+test "address of zero-bit field is equal to address of only field" {
     if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; // TODO
     if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
     if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
 
-    const S = struct {
-        fn testOneType(comptime A: type) !void {
-            {
-                const a = A{ .u = 0 };
-                const b_ptr = &a.b;
-                const a_ptr = @fieldParentPtr(A, "b", b_ptr);
-                try std.testing.expectEqual(&a, a_ptr);
-            }
-            {
-                var a = A{ .u = 0 };
-                const b_ptr = &a.b;
-                const a_ptr = @fieldParentPtr(A, "b", b_ptr);
-                try std.testing.expectEqual(&a, a_ptr);
-            }
-        }
-        fn doTheTest() !void {
-            try testOneType(struct { b: void = {}, u: u8 });
-            try testOneType(struct { u: u8, b: void = {} });
-        }
-    };
-    try S.doTheTest();
-    comptime try S.doTheTest();
+    {
+        const A = struct { b: void = {}, u: u8 };
+        var a = A{ .u = 0 };
+        const a_ptr = @fieldParentPtr(A, "b", &a.b);
+        try std.testing.expectEqual(&a, a_ptr);
+    }
+    {
+        const A = struct { u: u8, b: void = {} };
+        var a = A{ .u = 0 };
+        const a_ptr = @fieldParentPtr(A, "b", &a.b);
+        try std.testing.expectEqual(&a, a_ptr);
+    }
 }
 
 test "struct field has a pointer to an aligned version of itself" {