Ekdohibs
/
zig
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added peer type resolution for [*]T and *[N]T.

master
elucent 2020-04-21 02:10:50 -04:00 committed by Andrew Kelley
parent 412aac8a70
commit 48dc3b6fe9
2 changed files with 50 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/ir.cpp
View File

@ -11962,6 +11962,7 @@ static ZigType *ir_resolve_peer_types(IrAnalyze *ira, AstNode *source_node, ZigT
bool any_are_null = (prev_inst->value->type->id == ZigTypeIdNull); bool any_are_null = (prev_inst->value->type->id == ZigTypeIdNull);
bool convert_to_const_slice = false; bool convert_to_const_slice = false;
bool make_the_slice_const = false; bool make_the_slice_const = false;
bool make_the_pointer_const = false;
for (; i < instruction_count; i += 1) { for (; i < instruction_count; i += 1) {
IrInstGen *cur_inst = instructions[i]; IrInstGen *cur_inst = instructions[i];
ZigType *cur_type = cur_inst->value->type; ZigType *cur_type = cur_inst->value->type;
@ -12463,6 +12464,34 @@ static ZigType *ir_resolve_peer_types(IrAnalyze *ira, AstNode *source_node, ZigT
} }
} }
// *[N]T to [*]T
if (prev_type->id == ZigTypeIdPointer &&
prev_type->data.pointer.ptr_len == PtrLenSingle &&
prev_type->data.pointer.child_type->id == ZigTypeIdArray &&
((cur_type->id == ZigTypeIdPointer && cur_type->data.pointer.ptr_len == PtrLenUnknown)))
{
prev_inst = cur_inst;
if (prev_type->data.pointer.is_const && !cur_type->data.pointer.is_const) {
// const array pointer and non-const unknown pointer
make_the_pointer_const = true;
}
continue;
}
// *[N]T to [*]T
if (cur_type->id == ZigTypeIdPointer &&
cur_type->data.pointer.ptr_len == PtrLenSingle &&
cur_type->data.pointer.child_type->id == ZigTypeIdArray &&
((prev_type->id == ZigTypeIdPointer && prev_type->data.pointer.ptr_len == PtrLenUnknown)))
{
if (cur_type->data.pointer.is_const && !prev_type->data.pointer.is_const) {
// const array pointer and non-const unknown pointer
make_the_pointer_const = true;
}
continue;
}
// *[N]T to []T // *[N]T to []T
// *[N]T to E![]T // *[N]T to E![]T
if (cur_type->id == ZigTypeIdPointer && if (cur_type->id == ZigTypeIdPointer &&
@ -12677,6 +12706,8 @@ static ZigType *ir_resolve_peer_types(IrAnalyze *ira, AstNode *source_node, ZigT
} else { } else {
zig_unreachable(); zig_unreachable();
} }
} else if (make_the_pointer_const) {
return adjust_ptr_const(ira->codegen, prev_inst->value->type, make_the_pointer_const);
} else { } else {
return prev_inst->value->type; return prev_inst->value->type;
} }

19
test/stage1/behavior/cast.zig
View File

@ -805,3 +805,22 @@ test "peer type resolve array pointers, one of them const" {
comptime expect(@TypeOf(&array1, &array2) == []const u8); comptime expect(@TypeOf(&array1, &array2) == []const u8);
comptime expect(@TypeOf(&array2, &array1) == []const u8); comptime expect(@TypeOf(&array2, &array1) == []const u8);
} }
test "peer type resolve array pointer and unknown pointer" {
const const_array: [4]u8 = undefined;
var array: [4]u8 = undefined;
var const_ptr: [*]const u8 = undefined;
var ptr: [*]u8 = undefined;
comptime expect(@TypeOf(&array, ptr) == [*]u8);
comptime expect(@TypeOf(ptr, &array) == [*]u8);
comptime expect(@TypeOf(&const_array, ptr) == [*]const u8);
comptime expect(@TypeOf(ptr, &const_array) == [*]const u8);
comptime expect(@TypeOf(&array, const_ptr) == [*]const u8);
comptime expect(@TypeOf(const_ptr, &array) == [*]const u8);
comptime expect(@TypeOf(&const_array, const_ptr) == [*]const u8);
comptime expect(@TypeOf(const_ptr, &const_array) == [*]const u8);
}