From 1e03cf1739c9c7407c4b3a56ee5f2705805c6a83 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Thu, 13 Sep 2018 19:12:25 -0400 Subject: fix assertion failure on compile-time `@intToPtr` of function --- src/codegen.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'src/codegen.cpp') diff --git a/src/codegen.cpp b/src/codegen.cpp index 86ede7411d..d7d7223657 100644 --- a/src/codegen.cpp +++ b/src/codegen.cpp @@ -5886,9 +5886,16 @@ static LLVMValueRef gen_const_val(CodeGen *g, ConstExprValue *const_val, const c case ZigTypeIdEnum: return bigint_to_llvm_const(type_entry->type_ref, &const_val->data.x_enum_tag); case ZigTypeIdFn: - assert(const_val->data.x_ptr.special == ConstPtrSpecialFunction); - assert(const_val->data.x_ptr.mut == ConstPtrMutComptimeConst); - return fn_llvm_value(g, const_val->data.x_ptr.data.fn.fn_entry); + if (const_val->data.x_ptr.special == ConstPtrSpecialFunction) { + assert(const_val->data.x_ptr.mut == ConstPtrMutComptimeConst); + return fn_llvm_value(g, const_val->data.x_ptr.data.fn.fn_entry); + } else if (const_val->data.x_ptr.special == ConstPtrSpecialHardCodedAddr) { + LLVMTypeRef usize_type_ref = g->builtin_types.entry_usize->type_ref; + uint64_t addr = const_val->data.x_ptr.data.hard_coded_addr.addr; + return LLVMConstIntToPtr(LLVMConstInt(usize_type_ref, addr, false), type_entry->type_ref); + } else { + zig_unreachable(); + } case ZigTypeIdPointer: return gen_const_val_ptr(g, const_val, name); case ZigTypeIdErrorUnion: -- cgit v1.2.3