authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2018-09-03 00:04:12-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2018-09-03 00:04:12-04:00
log95636c7e5ff6ad0eeb768a2a0a1d7533b5872e20
treebface1d6e36b3830f0229efcaf73d20bc3480f05
parent92f747435930bc4d54114e414b372c7eafe7cc02
signaturelock-open Commit is signed but in an unrecognized format.

ability to @ptrCast to *void

fixes #960

3 files changed, 17 insertions(+), 2 deletions(-)

src/codegen.cpp+3
...@@ -2655,6 +2655,9 @@ static LLVMValueRef ir_render_ptr_cast(CodeGen *g, IrExecutable *executable,...@@ -2655,6 +2655,9 @@ static LLVMValueRef ir_render_ptr_cast(CodeGen *g, IrExecutable *executable,
2655 IrInstructionPtrCast *instruction)2655 IrInstructionPtrCast *instruction)
2656{2656{
2657 TypeTableEntry *wanted_type = instruction->base.value.type;2657 TypeTableEntry *wanted_type = instruction->base.value.type;
2658 if (!type_has_bits(wanted_type)) {
2659 return nullptr;
2660 }
2658 LLVMValueRef ptr = ir_llvm_value(g, instruction->ptr);2661 LLVMValueRef ptr = ir_llvm_value(g, instruction->ptr);
2659 return LLVMBuildBitCast(g->builder, ptr, wanted_type->type_ref, "");2662 return LLVMBuildBitCast(g->builder, ptr, wanted_type->type_ref, "");
2660}2663}
src/ir.cpp+8-2
...@@ -19757,6 +19757,8 @@ static IrInstruction *ir_align_cast(IrAnalyze *ira, IrInstruction *target, uint3...@@ -19757,6 +19757,8 @@ static IrInstruction *ir_align_cast(IrAnalyze *ira, IrInstruction *target, uint3
19757}19757}
1975819758
19759static TypeTableEntry *ir_analyze_instruction_ptr_cast(IrAnalyze *ira, IrInstructionPtrCast *instruction) {19759static TypeTableEntry *ir_analyze_instruction_ptr_cast(IrAnalyze *ira, IrInstructionPtrCast *instruction) {
19760 Error err;
19761
19760 IrInstruction *dest_type_value = instruction->dest_type->other;19762 IrInstruction *dest_type_value = instruction->dest_type->other;
19761 TypeTableEntry *dest_type = ir_resolve_type(ira, dest_type_value);19763 TypeTableEntry *dest_type = ir_resolve_type(ira, dest_type_value);
19762 if (type_is_invalid(dest_type))19764 if (type_is_invalid(dest_type))
...@@ -19810,9 +19812,13 @@ static TypeTableEntry *ir_analyze_instruction_ptr_cast(IrAnalyze *ira, IrInstruc...@@ -19810,9 +19812,13 @@ static TypeTableEntry *ir_analyze_instruction_ptr_cast(IrAnalyze *ira, IrInstruc
19810 instruction->base.source_node, nullptr, ptr);19812 instruction->base.source_node, nullptr, ptr);
19811 casted_ptr->value.type = dest_type;19813 casted_ptr->value.type = dest_type;
1981219814
19813 // keep the bigger alignment, it can only help19815 // Keep the bigger alignment, it can only help-
19816 // unless the target is zero bits.
19817 if ((err = type_ensure_zero_bits_known(ira->codegen, dest_type)))
19818 return ira->codegen->builtin_types.entry_invalid;
19819
19814 IrInstruction *result;19820 IrInstruction *result;
19815 if (src_align_bytes > dest_align_bytes) {19821 if (src_align_bytes > dest_align_bytes && type_has_bits(dest_type)) {
19816 result = ir_align_cast(ira, casted_ptr, src_align_bytes, false);19822 result = ir_align_cast(ira, casted_ptr, src_align_bytes, false);
19817 if (type_is_invalid(result->value.type))19823 if (type_is_invalid(result->value.type))
19818 return ira->codegen->builtin_types.entry_invalid;19824 return ira->codegen->builtin_types.entry_invalid;
test/cases/cast.zig+6
...@@ -519,3 +519,9 @@ fn incrementVoidPtrArray(array: ?*c_void, len: usize) void {...@@ -519,3 +519,9 @@ fn incrementVoidPtrArray(array: ?*c_void, len: usize) void {
519 @ptrCast([*]u8, array.?)[n] += 1;519 @ptrCast([*]u8, array.?)[n] += 1;
520 }520 }
521}521}
522
523test "*usize to *void" {
524 var i = usize(0);
525 var v = @ptrCast(*void, &i);
526 v.* = {};
527}