Index: src/handles.cc |
diff --git a/src/handles.cc b/src/handles.cc |
index ed92c414e37c1e8f3f423525dce17b603e4f1fe5..c0dea20aae3c09b6a98d3b4bd851e8fc15da140b 100644 |
--- a/src/handles.cc |
+++ b/src/handles.cc |
@@ -375,6 +375,15 @@ Handle<JSValue> GetScriptWrapper(Handle<Script> script) { |
Handle<JSFunction> constructor = isolate->script_function(); |
Handle<JSValue> result = |
Handle<JSValue>::cast(isolate->factory()->NewJSObject(constructor)); |
+ |
+ // The allocation might have triggered a GC, which could have called this |
+ // function recursively, and a wrapper has already been created and cached. |
+ // In that case, simply return the cached wrapper. |
+ if (script->wrapper()->foreign_address() != NULL) { |
+ return Handle<JSValue>( |
+ reinterpret_cast<JSValue**>(script->wrapper()->foreign_address())); |
+ } |
+ |
result->set_value(*script); |
// Create a new weak global handle and use it to cache the wrapper |