diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2022-12-18 13:49:41 -0700 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2022-12-18 13:51:15 -0700 |
| commit | 6ed0910d6d974750fe65990983d5347ceacc0186 (patch) | |
| tree | 995cb7403d93934044c9135ff9b466a1c16e1b25 /src/codegen | |
| parent | 40ed6ae8469fd599f0524d294f38365c3bb8a825 (diff) | |
| download | zig-6ed0910d6d974750fe65990983d5347ceacc0186.tar.gz zig-6ed0910d6d974750fe65990983d5347ceacc0186.zip | |
Revert "llvm: fix lowering pointer to final zero-width field of a comptime value"
This reverts commit e0bc5f65b98d154b4318027d56f780b55605e33c.
Caused an assertion failure when running the behavior tests:
```
zig: llvm/lib/IR/Type.cpp:729: static llvm::PointerType* llvm::PointerType::get(llvm::Type*, unsigned int): Assertion `isValidElementType(EltTy) && "Invalid type for pointer element!"' failed.
Aborted (core dumped)
```
Diffstat (limited to 'src/codegen')
| -rw-r--r-- | src/codegen/llvm.zig | 22 |
1 files changed, 7 insertions, 15 deletions
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()); |