authorgravatar for thatlemon@gmail.comLemonBoy <thatlemon@gmail.com> 2019-11-06 22:49:24+01:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-11-07 02:46:10-05:00
log528908a06e9663a5e6595fc5ff80e017c663dc76
treef23dba18a6fedc310c7cd0de3cc81e091abfc642
parentc7fd414dab3c69819c6528e8dcbb9de8ab17cdf9
signaturelock-open Commit is signed but in an unrecognized format.

Fix ptrCast of array references to fn

Closes #3607

2 files changed, 10 insertions(+), 8 deletions(-)

src/codegen.cpp+4-8
...@@ -7050,16 +7050,12 @@ check: switch (const_val->special) {...@@ -7050,16 +7050,12 @@ check: switch (const_val->special) {
7050 case ZigTypeIdEnum:7050 case ZigTypeIdEnum:
7051 return bigint_to_llvm_const(get_llvm_type(g, type_entry), &const_val->data.x_enum_tag);7051 return bigint_to_llvm_const(get_llvm_type(g, type_entry), &const_val->data.x_enum_tag);
7052 case ZigTypeIdFn:7052 case ZigTypeIdFn:
7053 if (const_val->data.x_ptr.special == ConstPtrSpecialFunction) {7053 if (const_val->data.x_ptr.special == ConstPtrSpecialFunction &&
7054 assert(const_val->data.x_ptr.mut == ConstPtrMutComptimeConst);7054 const_val->data.x_ptr.mut != ConstPtrMutComptimeConst) {
7055 return fn_llvm_value(g, const_val->data.x_ptr.data.fn.fn_entry);
7056 } else if (const_val->data.x_ptr.special == ConstPtrSpecialHardCodedAddr) {
7057 LLVMTypeRef usize_type_ref = g->builtin_types.entry_usize->llvm_type;
7058 uint64_t addr = const_val->data.x_ptr.data.hard_coded_addr.addr;
7059 return LLVMConstIntToPtr(LLVMConstInt(usize_type_ref, addr, false), get_llvm_type(g, type_entry));
7060 } else {
7061 zig_unreachable();7055 zig_unreachable();
7062 }7056 }
7057 // Treat it the same as we do for pointers
7058 return gen_const_val_ptr(g, const_val, name);
7063 case ZigTypeIdPointer:7059 case ZigTypeIdPointer:
7064 return gen_const_val_ptr(g, const_val, name);7060 return gen_const_val_ptr(g, const_val, name);
7065 case ZigTypeIdErrorUnion:7061 case ZigTypeIdErrorUnion:
test/stage1/behavior/cast.zig+6
...@@ -559,3 +559,9 @@ test "peer cast *[0]T to []const T" {...@@ -559,3 +559,9 @@ test "peer cast *[0]T to []const T" {
559 var y = if (b) &[0]u8{} else buf;559 var y = if (b) &[0]u8{} else buf;
560 expect(mem.eql(u8, "abcde", y));560 expect(mem.eql(u8, "abcde", y));
561}561}
562
563var global_array: [4]u8 = undefined;
564test "cast from array reference to fn" {
565 const f = @ptrCast(extern fn () void, &global_array);
566 expect(@ptrToInt(f) == @ptrToInt(&global_array));
567}