Phase 25.1 完了成果: - ✅ LoopForm v2 テスト・ドキュメント・コメント完備 - 4ケース(A/B/C/D)完全テストカバレッジ - 最小再現ケース作成(SSAバグ調査用) - SSOT文書作成(loopform_ssot.md) - 全ソースに [LoopForm] コメントタグ追加 - ✅ Stage-1 CLI デバッグ環境構築 - stage1_cli.hako 実装 - stage1_bridge.rs ブリッジ実装 - デバッグツール作成(stage1_debug.sh/stage1_minimal.sh) - アーキテクチャ改善提案文書 - ✅ 環境変数削減計画策定 - 25変数の完全調査・分類 - 6段階削減ロードマップ(25→5、80%削減) - 即時削除可能変数特定(NYASH_CONFIG/NYASH_DEBUG) Phase 26-D からの累積変更: - PHI実装改善(ExitPhiBuilder/HeaderPhiBuilder等) - MIRビルダーリファクタリング - 型伝播・最適化パス改善 - その他約300ファイルの累積変更 🎯 技術的成果: - SSAバグ根本原因特定(条件分岐内loop変数変更) - Region+next_iパターン適用完了(UsingCollectorBox等) - LoopFormパターン文書化・テスト化完了 - セルフホスティング基盤強化 Co-Authored-By: Claude <noreply@anthropic.com> Co-Authored-By: ChatGPT <noreply@openai.com> Co-Authored-By: Task Assistant <task@anthropic.com>
183 lines
7.3 KiB
Rust
183 lines
7.3 KiB
Rust
// Field access and assignment lowering
|
|
use super::{EffectMask, MirInstruction, ValueId};
|
|
use crate::ast::ASTNode;
|
|
use crate::mir::slot_registry;
|
|
|
|
impl super::MirBuilder {
|
|
/// Build field access: object.field
|
|
pub(super) fn build_field_access(
|
|
&mut self,
|
|
object: ASTNode,
|
|
field: String,
|
|
) -> Result<ValueId, String> {
|
|
let object_clone = object.clone();
|
|
let object_value = self.build_expression(object.clone())?;
|
|
let object_value = self.local_field_base(object_value);
|
|
|
|
// Unified members: if object class is known and has a synthetic getter for `field`,
|
|
// rewrite to method call `__get_<field>()`.
|
|
if let Some(class_name) = self.value_origin_newbox.get(&object_value).cloned() {
|
|
if let Some(map) = self.property_getters_by_box.get(&class_name) {
|
|
if let Some(kind) = map.get(&field) {
|
|
let mname = match kind {
|
|
super::PropertyKind::Computed => format!("__get_{}", field),
|
|
super::PropertyKind::Once => format!("__get_once_{}", field),
|
|
super::PropertyKind::BirthOnce => format!("__get_birth_{}", field),
|
|
};
|
|
return self.build_method_call(object_clone, mname, vec![]);
|
|
}
|
|
}
|
|
}
|
|
|
|
// Emit: field name const (boxed)
|
|
let field_name_id =
|
|
crate::mir::builder::emission::constant::emit_string(self, field.clone());
|
|
// Finalize operands (base + args) in current block
|
|
let mut base = object_value;
|
|
let mut args_vec = vec![field_name_id];
|
|
crate::mir::builder::ssa::local::finalize_field_base_and_args(
|
|
self,
|
|
&mut base,
|
|
&mut args_vec,
|
|
);
|
|
// BoxCall: getField(name)
|
|
let field_val = self.next_value_id();
|
|
self.emit_instruction(MirInstruction::BoxCall {
|
|
dst: Some(field_val),
|
|
box_val: base,
|
|
method: "getField".to_string(),
|
|
method_id: slot_registry::resolve_slot_by_type_name("InstanceBox", "getField"),
|
|
args: args_vec,
|
|
effects: EffectMask::READ,
|
|
})?;
|
|
|
|
// Propagate recorded origin class for this field if any (ValueId-scoped)
|
|
if let Some(class_name) = self
|
|
.field_origin_class
|
|
.get(&(object_value, field.clone()))
|
|
.cloned()
|
|
{
|
|
self.value_origin_newbox.insert(field_val, class_name);
|
|
} else if let Some(base_cls) = self.value_origin_newbox.get(&object_value).cloned() {
|
|
// Cross-function heuristic: use class-level field origin mapping
|
|
if let Some(fcls) = self
|
|
.field_origin_by_box
|
|
.get(&(base_cls.clone(), field.clone()))
|
|
.cloned()
|
|
{
|
|
if super::utils::builder_debug_enabled()
|
|
|| std::env::var("NYASH_BUILDER_DEBUG").ok().as_deref() == Some("1")
|
|
{
|
|
super::utils::builder_debug_log(&format!(
|
|
"field-origin hit by box-level map: base={} .{} -> {}",
|
|
base_cls, field, fcls
|
|
));
|
|
}
|
|
self.value_origin_newbox.insert(field_val, fcls);
|
|
}
|
|
}
|
|
|
|
// If base is a known newbox and field is weak, emit WeakLoad (+ optional barrier)
|
|
let mut inferred_class: Option<String> =
|
|
self.value_origin_newbox.get(&object_value).cloned();
|
|
if inferred_class.is_none() {
|
|
if let ASTNode::FieldAccess {
|
|
object: inner_obj,
|
|
field: inner_field,
|
|
..
|
|
} = object_clone
|
|
{
|
|
if let Ok(base_id) = self.build_expression(*inner_obj.clone()) {
|
|
if let Some(cls) = self
|
|
.field_origin_class
|
|
.get(&(base_id, inner_field))
|
|
.cloned()
|
|
{
|
|
inferred_class = Some(cls);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if let Some(class_name) = inferred_class {
|
|
if let Some(weak_set) = self.weak_fields_by_box.get(&class_name) {
|
|
if weak_set.contains(&field) {
|
|
let loaded = self.emit_weak_load(field_val)?;
|
|
let _ = self.emit_barrier_read(loaded);
|
|
return Ok(loaded);
|
|
}
|
|
}
|
|
}
|
|
|
|
// Correctness-first: slotify field values so they have block-local defs
|
|
// and participate in PHI merges when reused across branches.
|
|
let pinned = self.pin_to_slot(field_val, "@field")?;
|
|
Ok(pinned)
|
|
}
|
|
|
|
/// Build field assignment: object.field = value
|
|
pub(super) fn build_field_assignment(
|
|
&mut self,
|
|
object: ASTNode,
|
|
field: String,
|
|
value: ASTNode,
|
|
) -> Result<ValueId, String> {
|
|
let object_value = self.build_expression(object)?;
|
|
let object_value = self.local_field_base(object_value);
|
|
let mut value_result = self.build_expression(value)?;
|
|
// LocalSSA: argument in-block (optional safety)
|
|
value_result = self.local_arg(value_result);
|
|
|
|
// If base is known and field is weak, create WeakRef before store
|
|
if let Some(class_name) = self.value_origin_newbox.get(&object_value).cloned() {
|
|
if let Some(weak_set) = self.weak_fields_by_box.get(&class_name) {
|
|
if weak_set.contains(&field) {
|
|
value_result = self.emit_weak_new(value_result)?;
|
|
}
|
|
}
|
|
}
|
|
|
|
// Emit: field name const
|
|
let field_name_id =
|
|
crate::mir::builder::emission::constant::emit_string(self, field.clone());
|
|
// Finalize operands (base + args) in current block
|
|
let mut base = object_value;
|
|
let mut args_vec = vec![field_name_id, value_result];
|
|
crate::mir::builder::ssa::local::finalize_field_base_and_args(
|
|
self,
|
|
&mut base,
|
|
&mut args_vec,
|
|
);
|
|
// Set the field via BoxCall: setField(name, value)
|
|
self.emit_instruction(MirInstruction::BoxCall {
|
|
dst: None,
|
|
box_val: base,
|
|
method: "setField".to_string(),
|
|
method_id: slot_registry::resolve_slot_by_type_name("InstanceBox", "setField"),
|
|
args: args_vec,
|
|
effects: EffectMask::WRITE,
|
|
})?;
|
|
|
|
// Write barrier if weak field
|
|
if let Some(class_name) = self.value_origin_newbox.get(&object_value).cloned() {
|
|
if let Some(weak_set) = self.weak_fields_by_box.get(&class_name) {
|
|
if weak_set.contains(&field) {
|
|
let _ = self.emit_barrier_write(value_result);
|
|
}
|
|
}
|
|
}
|
|
|
|
// Record origin class for this field value if known
|
|
if let Some(val_cls) = self.value_origin_newbox.get(&value_result).cloned() {
|
|
self.field_origin_class
|
|
.insert((object_value, field.clone()), val_cls.clone());
|
|
// Also record class-level mapping if base object class is known
|
|
if let Some(base_cls) = self.value_origin_newbox.get(&object_value).cloned() {
|
|
self.field_origin_by_box
|
|
.insert((base_cls, field.clone()), val_cls);
|
|
}
|
|
}
|
|
|
|
Ok(value_result)
|
|
}
|
|
}
|