motiejus/zig
1
Fork 0
Code Releases Activity

Revert "llvm: fix lowering pointer to final zero-width field of a comptime value"

Browse Source 
This reverts commit e0bc5f65b9.

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)
```
This commit is contained in:
Andrew Kelley
2022-12-18 13:49:41 -07:00
parent 40ed6ae846
commit 6ed0910d6d
2 changed files with 20 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/codegen/llvm.zig
View File

@@ -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());