Changeset 91607 in webkit for trunk/Source/JavaScriptCore/dfg/DFGOperations.cpp

Timestamp:

Jul 22, 2011, 3:08:52 PM (14 years ago)

Author:

[email protected]

Message:

​https://bugs.webkit.org/show_bug.cgi?id=65047
DFG JIT - Add support for op_resolve/op_resolve_base

Reviewed by Sam Weinig.

These are necessary for any significant eval code coverage
(and as such increase LayoutTest coverage).

• dfg/DFGAliasTracker.h:

(JSC::DFG::AliasTracker::recordResolve):

• Conservatively blow aliasing optimizations for now.

• dfg/DFGByteCodeParser.cpp:

(JSC::DFG::ByteCodeParser::parseBlock):

• Add support for op_resolve/op_resolve_base.

• dfg/DFGJITCodeGenerator.h:

(JSC::DFG::JITCodeGenerator::callOperation):

• Add call with exec, identifer aguments.

• dfg/DFGNode.h:
  • Add new node types.

(JSC::DFG::Node::hasIdentifier):

• Resolve nodes have identifiers, too!

• dfg/DFGNonSpeculativeJIT.cpp:

(JSC::DFG::NonSpeculativeJIT::compile):

• Add generation for new Nodes.

• dfg/DFGOperations.cpp:
• dfg/DFGOperations.h:
  • Added new operations.
• dfg/DFGSpeculativeJIT.cpp:

(JSC::DFG::SpeculativeJIT::compile):

• Add generation for new Nodes.

File:

• trunk/Source/JavaScriptCore/dfg/DFGOperations.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/dfg/DFGOperations.cpp

@@ -624 +624 @@
 }
 
+EncodedJSValue operationResolve(ExecState* exec, Identifier* propertyName)
+{
+    ScopeChainNode* scopeChain = exec->scopeChain();
+    ScopeChainIterator iter = scopeChain->begin();
+    ScopeChainIterator end = scopeChain->end();
+    ASSERT(iter != end);
+
+    do {
+        JSObject* record = iter->get();
+        PropertySlot slot(record);
+        if (record->getPropertySlot(exec, *propertyName, slot))
+            return JSValue::encode(slot.getValue(exec, *propertyName));
+    } while (++iter != end);
+
+    return throwVMError(exec, createUndefinedVariableError(exec, *propertyName));
+}
+
+EncodedJSValue operationResolveBase(ExecState* exec, Identifier* propertyName)
+{
+    return JSValue::encode(resolveBase(exec, *propertyName, exec->scopeChain(), false));
+}
+
+EncodedJSValue operationResolveBaseStrictPut(ExecState* exec, Identifier* propertyName)
+{
+    JSValue base = resolveBase(exec, *propertyName, exec->scopeChain(), true);
+    if (!base)
+        throwError(exec, createErrorForInvalidGlobalAssignment(exec, propertyName->ustring()));
+    return JSValue::encode(base);
+}
+
 void operationThrowHasInstanceError(ExecState* exec, EncodedJSValue encodedBase)
 {
     JSValue base = JSValue::decode(encodedBase);
 
-#ifndef NDEBUG
     // We should only call this function if base is not an object, or if it does not implement 'HasInstance'.
-    TypeInfo typeInfo(UnspecifiedType);
-    ASSERT(!base.isObject() || !(typeInfo = asObject(base)->structure()->typeInfo()).implementsHasInstance());
-#endif
+    ASSERT(!base.isObject() || !asObject(base)->structure()->typeInfo().implementsHasInstance());
 
     throwError(exec, createInvalidParamError(exec, "instanceof", base));