Merge branch 'fix_core_scripts' into quicken_mcode
This commit is contained in:
@@ -95,8 +95,7 @@ static void mach_link_code(JSContext *ctx, JSCodeRegister *code, JSValue env) {
|
||||
int bx = MACH_GET_Bx(instr);
|
||||
int in_env = 0;
|
||||
if (!JS_IsNull(env_ref.val) && (uint32_t)bx < code->cpool_count) {
|
||||
JSValue val = JS_GetProperty(ctx, env_ref.val, code->cpool[bx]);
|
||||
in_env = !JS_IsNull(val) && !JS_IsException(val);
|
||||
in_env = JS_HasProperty(ctx, env_ref.val, code->cpool[bx]);
|
||||
}
|
||||
code->instructions[i] = MACH_ABx(in_env ? MACH_GETENV : MACH_GETINTRINSIC, a, bx);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user