Changeset 34659 in webkit for trunk/JavaScriptCore/kjs/nodes.cpp

Timestamp:

Jun 19, 2008, 10:29:29 AM (17 years ago)

Author:

[email protected]

Message:

Reviewed by Darin.

Prepare JavaScript heap for being per-thread.

File:

• trunk/JavaScriptCore/kjs/nodes.cpp (modified) (7 diffs)

trunk/JavaScriptCore/kjs/nodes.cpp

@@ -196 +196 @@
 RegisterID* Node::emitThrowError(CodeGenerator& generator, ErrorType e, const char* msg)
 {
-    RegisterID* exception = generator.emitNewError(generator.newTemporary(), e, jsString(msg));
+    RegisterID* exception = generator.emitNewError(generator.newTemporary(), e, jsString(generator.globalExec(), msg));
     generator.emitThrow(exception);
     return exception;
@@ -205 +205 @@
     UString message = msg;
     substitute(message, label.ustring());
-    RegisterID* exception = generator.emitNewError(generator.newTemporary(), e, jsString(message));
+    RegisterID* exception = generator.emitNewError(generator.newTemporary(), e, jsString(generator.globalExec(), message));
     generator.emitThrow(exception);
     return exception;
@@ -273 +273 @@
 {
     // FIXME: should we try to atomize constant strings?
-    return generator.emitLoad(generator.finalDestination(dst), jsOwnedString(m_value));
+    return generator.emitLoad(generator.finalDestination(dst), jsOwnedString(generator.globalExec(), m_value));
 }
 
@@ -322 +322 @@
     }
 
-    value = generator.emitLoad(generator.newTemporary(), jsNumber(m_elision + length));
+    value = generator.emitLoad(generator.newTemporary(), jsNumber(generator.globalExec(), m_elision + length));
     generator.emitPutById(newArray.get(), generator.propertyNames().length, value);
 
@@ -1693 +1693 @@
 JSFunction* FuncDeclNode::makeFunction(ExecState* exec, ScopeChainNode* scopeChain)
 {
-    JSFunction* func = new JSFunction(exec, m_ident, m_body.get(), scopeChain);
+    JSFunction* func = new (exec) JSFunction(exec, m_ident, m_body.get(), scopeChain);
 
     JSObject* proto = exec->lexicalGlobalObject()->objectConstructor()->construct(exec, exec->emptyList());
     proto->putDirect(exec->propertyNames().constructor, func, DontEnum);
     func->putDirect(exec->propertyNames().prototype, proto, DontDelete);
-    func->putDirect(exec->propertyNames().length, jsNumber(m_body->parameters().size()), ReadOnly | DontDelete | DontEnum);
+    func->putDirect(exec->propertyNames().length, jsNumber(exec, m_body->parameters().size()), ReadOnly | DontDelete | DontEnum);
     return func;
 }
@@ -1716 +1716 @@
 JSFunction* FuncExprNode::makeFunction(ExecState* exec, ScopeChainNode* scopeChain)
 {
-    JSFunction* func = new JSFunction(exec, m_ident, m_body.get(), scopeChain);
+    JSFunction* func = new (exec) JSFunction(exec, m_ident, m_body.get(), scopeChain);
     JSObject* proto = exec->lexicalGlobalObject()->objectConstructor()->construct(exec, exec->emptyList());
     proto->putDirect(exec->propertyNames().constructor, func, DontEnum);
@@ -1730 +1730 @@
 
     if (!m_ident.isNull()) {
-        JSObject* functionScopeObject = new JSObject;
+        JSObject* functionScopeObject = new (exec) JSObject;
         functionScopeObject->putDirect(m_ident, func, ReadOnly | DontDelete);
         func->scope().push(functionScopeObject);