Index: src/heap.cc |
=================================================================== |
--- src/heap.cc (revision 1154) |
+++ src/heap.cc (working copy) |
@@ -1724,9 +1724,12 @@ |
Object* Heap::AllocateFunctionPrototype(JSFunction* function) { |
- // Allocate the prototype. |
- Object* prototype = |
- AllocateJSObject(Top::context()->global_context()->object_function()); |
+ // Allocate the prototype. Make sure to use the object function |
+ // from the function's context, since the function can be from a |
+ // different context. |
+ JSFunction* object_function = |
+ function->context()->global_context()->object_function(); |
+ Object* prototype = AllocateJSObject(object_function); |
if (prototype->IsFailure()) return prototype; |
// When creating the prototype for the function we must set its |
// constructor to the function. |