mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2026-01-05 04:27:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix lb_emit_ptr_offset

Browse Source
This commit is contained in:
gingerBill
2022-08-12 13:48:10 +01:00
parent 22d16c20f8
commit 8e7c7eeeba
3 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/llvm_backend_proc.cpp
View File

@@ -2077,15 +2077,7 @@ lbValue lb_build_builtin_proc(lbProcedure *p, Ast *expr, TypeAndValue const &tv,
lbValue ptr = lb_build_expr(p, ce->args[0]);
lbValue len = lb_build_expr(p, ce->args[1]);
len = lb_emit_conv(p, len, t_int);
LLVMValueRef indices[1] = {
len.value,
};
lbValue res = {};
res.type = tv.type;
res.value = LLVMBuildGEP2(p->builder, lb_type(p->module, type_deref(tv.type)), ptr.value, indices, gb_count_of(indices), "");
return res;
return lb_emit_ptr_offset(p, ptr, len);
}
case BuiltinProc_ptr_sub:
{

2
src/llvm_backend_utility.cpp
View File

@@ -1285,7 +1285,7 @@ lbValue lb_emit_ptr_offset(lbProcedure *p, lbValue ptr, lbValue index) {
LLVMValueRef indices[1] = {index.value};
lbValue res = {};
res.type = ptr.type;
LLVMTypeRef type = lb_type(p->module, type_deref(ptr.type));
LLVMTypeRef type = lb_type(p->module, type_deref(res.type, true));
if (lb_is_const(ptr) && lb_is_const(index)) {
res.value = LLVMConstGEP2(type, ptr.value, indices, 1);

7
src/types.cpp
View File

@@ -1115,7 +1115,7 @@ Type *alloc_type_simd_vector(i64 count, Type *elem, Type *generic_count=nullptr)
////////////////////////////////////////////////////////////////
Type *type_deref(Type *t) {
Type *type_deref(Type *t, bool allow_multi_pointer=false) {
if (t != nullptr) {
Type *bt = base_type(t);
if (bt == nullptr) {
@@ -1132,6 +1132,11 @@ Type *type_deref(Type *t) {
GB_ASSERT(elem->kind == Type_Struct && elem->Struct.soa_kind != StructSoa_None);
return elem->Struct.soa_elem;
}
case Type_MultiPointer:
if (allow_multi_pointer) {
return bt->MultiPointer.elem;
}
break;
}
}
return t;