retoor/wren
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

revert: remove safeToString_ and recursive toString handling due to memory leak on runtime errors

Browse Source 
The safeToString_ mechanism introduced in 40897f33 used per-fiber maps and lists to detect recursive toString calls, but leaked memory when runtime errors occurred before cleanup. This reverts to direct toString implementations for List and Map, removing the recursive detection logic and updating tests to mark self-referencing containers as TODO.
This commit is contained in:
Bob Nystrom
2015-05-19 13:50:17 +00:00
parent 13f63e0d04
commit 701cffbe69
4 changed files with 20 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vm/wren_core.c
+9 -39
View File
@@ -141,34 +141,6 @@ static const char* coreLibSource =
"}\n"
"\n"
"class String is Sequence {\n"
" // Avoids recursively calling [toString] on [object] and overflowing the\n"
" // stack.\n"
" //\n"
" // If we are already within a call to [safeToString_] on [object] in this\n"
" // fiber, then this returns \"...\". Otherwise, it returns the result of\n"
" // calling [ifUnseen].\n"
" static safeToString_(object, ifUnseen) {\n"
" if (__seenByFiber == null) __seenByFiber = new Map\n"
" var seen = __seenByFiber[Fiber.current]\n"
" if (seen == null) {\n"
" __seenByFiber[Fiber.current] = seen = new List\n"
" }\n"
"\n"
" // See if we are recursing on it.\n"
" for (outer in seen) {\n"
" if (Object.same(outer, object)) return \"...\"\n"
" }\n"
"\n"
" seen.add(object)\n"
"\n"
" var result = ifUnseen.call()\n"
"\n"
" seen.removeAt(-1)\n"
" if (seen.count == 0) __seenByFiber.remove(Fiber.current)\n"
"\n"
" return result\n"
" }\n"
"\n"
" bytes { new StringByteSequence(this) }\n"
"}\n"
"\n"
@@ -190,7 +162,7 @@ static const char* coreLibSource =
" return other\n"
" }\n"
"\n"
" toString { String.safeToString_(this) { \"[\" + join(\", \") + \"]\" } }\n"
" toString { \"[\" + join(\", \") + \"]\" }\n"
"\n"
" +(other) {\n"
" var result = this[0..-1]\n"
@@ -206,18 +178,16 @@ static const char* coreLibSource =
" values { new MapValueSequence(this) }\n"
"\n"
" toString {\n"
" return String.safeToString_(this) {\n"
" var first = true\n"
" var result = \"{\"\n"
" var first = true\n"
" var result = \"{\"\n"
"\n"
" for (key in keys) {\n"
" if (!first) result = result + \", \"\n"
" first = false\n"
" result = result + key.toString + \": \" + this[key].toString\n"
" }\n"
"\n"
" return result + \"}\"\n"
" for (key in keys) {\n"
" if (!first) result = result + \", \"\n"
" first = false\n"
" result = result + key.toString + \": \" + this[key].toString\n"
" }\n"
"\n"
" return result + \"}\"\n"
" }\n"
"}\n"
"\n"