mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2026-06-23 18:29:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into windows-llvm-11.1.0

Browse Source
This commit is contained in:
gingerBill
2022-09-08 17:28:04 +01:00
parent aa8d5618f4 3fae8b49db
commit 5a8afd1680
2 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
build.bat
View File

@@ -72,12 +72,10 @@ del *.ilk > NUL 2> NUL
cl %compiler_settings% "src\main.cpp" "src\libtommath.cpp" /link %linker_settings% -OUT:%exe_name%
if %errorlevel% neq 0 goto end_of_build
rem call build_vendor.bat
rem if %errorlevel% neq 0 goto end_of_build
call build_vendor.bat
if %errorlevel% neq 0 goto end_of_build
odin run examples/demo -vet -strict-style
rem odin check examples/all
rem odin run examples/bug
if %release_mode% EQU 0 odin run examples/demo
del *.obj > NUL 2> NUL

19
src/llvm_backend_const.cpp
View File

@@ -381,12 +381,17 @@ lbValue lb_const_value(lbModule *m, Type *type, ExactValue value, bool allow_loc
}
if (value.kind == ExactValue_Procedure) {
lbValue res = {};
Ast *expr = unparen_expr(value.value_procedure);
if (expr->kind == Ast_ProcLit) {
return lb_generate_anonymous_proc_lit(m, str_lit("_proclit"), expr);
res = lb_generate_anonymous_proc_lit(m, str_lit("_proclit"), expr);
} else {
Entity *e = entity_from_expr(expr);
res = lb_find_procedure_value_from_entity(m, e);
}
Entity *e = entity_from_expr(expr);
return lb_find_procedure_value_from_entity(m, e);
res.value = LLVMConstPointerCast(res.value, lb_type(m, res.type));
return res;
}
bool is_local = allow_local && m->curr_procedure != nullptr;
@@ -1141,13 +1146,7 @@ lbValue lb_const_value(lbModule *m, Type *type, ExactValue value, bool allow_loc
}
break;
case ExactValue_Procedure:
{
Ast *expr = value.value_procedure;
GB_ASSERT(expr != nullptr);
if (expr->kind == Ast_ProcLit) {
return lb_generate_anonymous_proc_lit(m, str_lit("_proclit"), expr);
}
}
GB_PANIC("handled earlier");
break;
case ExactValue_Typeid:
return lb_typeid(m, value.value_typeid);