tomoaki/hakorune
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(llvm): MapBox core-first implementation with plugin fallback by ChatGPT

Browse Source 
Implemented elegant solution for MapBox as core box with plugin fallback:

1. Core-first Strategy:
   - Removed MapBox type_id from nyash_box.toml
   - MapBox now uses env.box.new fallback (core implementation)
   - Consistent with self-hosting goals

2. Plugin Fallback Option:
   - Added NYASH_LLVM_FORCE_PLUGIN_MAP=1 environment variable
   - Allows forcing MapBox to plugin path when needed
   - Preserves flexibility during transition

3. MIR Type Inference:
   - Added MapBox method type inference (size/has/get)
   - Ensures proper return type handling

4. Documentation:
   - Added core vs plugin box explanation in nyrt
   - Clarified the transition strategy

This aligns with Phase 15 goals where basic boxes will eventually
be implemented in Nyash itself for true self-hosting.

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
Selfhosting Dev
2025-09-11 23:09:16 +09:00
parent 89e6fbf010
commit 13298126c8
5 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/backend/llvm/compiler/codegen/instructions.rs
View File

@ -1221,7 +1221,7 @@ pub(super) fn lower_boxcall<'ctx>(
}
}
// Map fast-paths (minimal): get/set/has/size with i64 keys
// Map fast-paths (core-first): get/set/has/size using NyRT shims with handle receiver
if let Some(crate::mir::MirType::Box(bname)) = func.metadata.value_types.get(box_val) {
if bname == "MapBox" && (method == "get" || method == "set" || method == "has" || method == "size") {
let i64t = codegen.context.i64_type();
@ -1257,7 +1257,7 @@ pub(super) fn lower_boxcall<'ctx>(
"get" => {
if args.len() != 1 { return Err("MapBox.get expects 1 arg".to_string()); }
let key_v = *vmap.get(&args[0]).ok_or("map.get key missing")?;
// prefer integer key path; if pointer, convert to handle and call get_hh
// prefer integer key; if pointer, convert to handle and call get_hh
let call = match key_v {
BVE::IntValue(iv) => {
let fnty = i64t.fn_type(&[i64t.into(), i64t.into()], false);

7
src/backend/llvm/compiler/codegen/mod.rs
View File

@ -233,8 +233,13 @@ impl LLVMCompiler {
);
}
let type_id = *box_type_ids.get(box_type).unwrap_or(&0);
// Temporary gate: allow forcing MapBox to plugin path explicitly
let force_plugin_map = std::env::var("NYASH_LLVM_FORCE_PLUGIN_MAP")
.ok()
.as_deref()
== Some("1");
let i64t = codegen.context.i64_type();
if type_id != 0 {
if type_id != 0 && !(box_type == "MapBox" && !force_plugin_map) {
// declare i64 @nyash.box.birth_h(i64)
let fn_ty = i64t.fn_type(&[i64t.into()], false);
let callee = codegen