Changeset 58986 in webkit for trunk/JavaScriptCore/runtime

Timestamp:

May 7, 2010, 5:05:00 PM (15 years ago)

Author:

[email protected]

Message:

2010-05-07 Oliver Hunt <​[email protected]>

Reviewed by Geoffrey Garen.

Optimize access to the global object from a function that uses eval
​https://bugs.webkit.org/show_bug.cgi?id=38644

Add op_resolve_global_dynamic, a variant of op_resolve_global that
checks each node in the scope chain for dynamically inserted properties
and falls back to the normal resolve logic in that case.

• JavaScriptCore.exp:
• bytecode/CodeBlock.cpp: (JSC::isGlobalResolve): (JSC::CodeBlock::printStructures): (JSC::CodeBlock::dump): (JSC::CodeBlock::derefStructures):
• bytecode/Opcode.h:
• bytecompiler/BytecodeGenerator.cpp: (JSC::BytecodeGenerator::findScopedProperty):

Now take an additional reference parameter to used to indicate that
there were nodes that may gain dynamic properties

(JSC::BytecodeGenerator::emitResolve):
(JSC::BytecodeGenerator::emitResolveBase):
(JSC::BytecodeGenerator::emitResolveWithBase):

deal with additional argument to findScopedProperty

• bytecompiler/BytecodeGenerator.h:
• bytecompiler/NodesCodegen.cpp: (JSC::FunctionCallResolveNode::emitBytecode): (JSC::PostfixResolveNode::emitBytecode): (JSC::PrefixResolveNode::emitBytecode): (JSC::ReadModifyResolveNode::emitBytecode): (JSC::AssignResolveNode::emitBytecode):

These functions use findScopedProperty directly in order to
optimise lookup. They cannot trivially handle any degree of
dynamism in the lookup so we just give up in such case.

• interpreter/Interpreter.cpp: (JSC::Interpreter::resolveGlobalDynamic): (JSC::Interpreter::execute): (JSC::Interpreter::privateExecute):
• interpreter/Interpreter.h:
• jit/JIT.cpp: (JSC::JIT::privateCompileMainPass): (JSC::JIT::privateCompileSlowCases):
• jit/JIT.h:
• jit/JITOpcodes.cpp: (JSC::JIT::emit_op_resolve_global): (JSC::JIT::emit_op_resolve_global_dynamic): (JSC::JIT::emitSlow_op_resolve_global): (JSC::JIT::emitSlow_op_resolve_global_dynamic):

Happily resolve_global_dynamic can share the slow case!

• jit/JITStubs.h: (JSC::):
• runtime/JSActivation.cpp: (JSC::JSActivation::isDynamicScope):
• runtime/JSActivation.h:
• runtime/JSGlobalObject.cpp: (JSC::JSGlobalObject::isDynamicScope):
• runtime/JSGlobalObject.h:
• runtime/JSStaticScopeObject.cpp: (JSC::JSStaticScopeObject::isDynamicScope):
• runtime/JSStaticScopeObject.h:
• runtime/JSVariableObject.h:

Location:

trunk/JavaScriptCore/runtime

Files:

• JSActivation.cpp (modified) (1 diff)
• JSActivation.h (modified) (1 diff)
• JSGlobalObject.cpp (modified) (1 diff)
• JSGlobalObject.h (modified) (1 diff)
• JSStaticScopeObject.cpp (modified) (1 diff)
• JSStaticScopeObject.h (modified) (1 diff)
• JSVariableObject.h (modified) (1 diff)

trunk/JavaScriptCore/runtime/JSActivation.cpp

@@ -135 +135 @@
 }
 
-bool JSActivation::isDynamicScope() const
+bool JSActivation::isDynamicScope(bool& requiresDynamicChecks) const
 {
-    return d()->functionExecutable->usesEval();
+    requiresDynamicChecks = d()->functionExecutable->usesEval();
+    return false;
 }
 

trunk/JavaScriptCore/runtime/JSActivation.h

@@ -48 +48 @@
         virtual void markChildren(MarkStack&);
 
-        virtual bool isDynamicScope() const;
+        virtual bool isDynamicScope(bool& requiresDynamicChecks) const;
 
         virtual bool isActivationObject() const { return true; }

trunk/JavaScriptCore/runtime/JSGlobalObject.cpp

@@ -427 +427 @@
 }
 
-bool JSGlobalObject::isDynamicScope() const
+bool JSGlobalObject::isDynamicScope(bool&) const
 {
     return true;

trunk/JavaScriptCore/runtime/JSGlobalObject.h

@@ -257 +257 @@
         virtual bool allowsAccessFrom(const JSGlobalObject*) const { return true; }
 
-        virtual bool isDynamicScope() const;
+        virtual bool isDynamicScope(bool& requiresDynamicChecks) const;
 
         HashSet<GlobalCodeBlock*>& codeBlocks() { return d()->codeBlocks; }

trunk/JavaScriptCore/runtime/JSStaticScopeObject.cpp

@@ -59 +59 @@
 }
 
-bool JSStaticScopeObject::isDynamicScope() const
+bool JSStaticScopeObject::isDynamicScope(bool&) const
 {
     return false;

trunk/JavaScriptCore/runtime/JSStaticScopeObject.h

@@ -52 +52 @@
         virtual ~JSStaticScopeObject();
         virtual void markChildren(MarkStack&);
-        bool isDynamicScope() const;
+        bool isDynamicScope(bool& requiresDynamicChecks) const;
         virtual JSObject* toThisObject(ExecState*) const;
         virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&);

trunk/JavaScriptCore/runtime/JSVariableObject.h

@@ -53 +53 @@
         
         virtual bool isVariableObject() const;
-        virtual bool isDynamicScope() const = 0;
+        virtual bool isDynamicScope(bool& requiresDynamicChecks) const = 0;
 
         Register& registerAt(int index) const { return d->registers[index]; }