SergeychWorks/lyng
1
0 Fork 0
Code Issues 2 Pull Requests Actions Packages Projects 1 Releases 21 Wiki Activity

Fix escaping immutable closure captures

Browse Source
This commit is contained in:
sergeych committed 2026-04-22 18:50:49 +03:00
1 parent 0f5343fa17
commit 14214e91e1
2 files changed
+58 -10
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

lynglib/src/commonMain/kotlin/net/sergeych/lyng/bytecode/CmdRuntime.kt
+14 -10
View File
@@ -2204,8 +2204,8 @@ class CmdAssignOpObj(
}
if (result == null) {
val name = (frame.fn.constants.getOrNull(nameId) as? BytecodeConst.StringVal)?.value
if (name != null) frame.ensureScope().raiseIllegalAssignment("symbol is readonly: $name")
frame.ensureScope().raiseIllegalAssignment("symbol is readonly")
if (name != null) frame.ensureScope().raiseIllegalAssignment("can't reassign val $name")
frame.ensureScope().raiseIllegalAssignment("can't reassign val")
}
frame.storeObjResult(dst, result)
return
@@ -4552,7 +4552,7 @@ class CmdFrame(
type = inherited.type
)
copied.delegate = inherited.delegate
return@mapIndexed copied
return@mapIndexed freezeImmutableCaptureRecord(copied)
}
}
val isMutable = fn.localSlotMutables.getOrNull(localIndex) ?: false
@@ -4576,11 +4576,13 @@ class CmdFrame(
val record = findNamedExistingRecord(scope, name)
if (record != null) {
val value = record.value
return@mapIndexed when (value) {
return@mapIndexed freezeImmutableCaptureRecord(
when (value) {
is FrameSlotRef -> ObjRecord(value, isMutable)
is RecordSlotRef -> ObjRecord(value, isMutable)
else -> ObjRecord(value, isMutable)
}
}
)
}
if (hasNamedScopeBinding(scope, name)) {
throw ScriptError(
@@ -4589,11 +4591,13 @@ class CmdFrame(
)
}
}
when (raw) {
is FrameSlotRef -> ObjRecord(raw, isMutable)
is RecordSlotRef -> ObjRecord(raw, isMutable)
else -> ObjRecord(FrameSlotRef(frame, localIndex), isMutable)
}
freezeImmutableCaptureRecord(
when (raw) {
is FrameSlotRef -> ObjRecord(raw, isMutable)
is RecordSlotRef -> ObjRecord(raw, isMutable)
else -> ObjRecord(FrameSlotRef(frame, localIndex), isMutable)
}
)
}
}