Changeset 37285 in webkit for trunk/JavaScriptCore/VM/CTI.cpp

Timestamp:

Oct 4, 2008, 12:15:33 AM (17 years ago)

Author:

[email protected]

Message:

JavaScriptCore:

2008-10-03 Maciej Stachowiak <​[email protected]>

Reviewed by Cameron Zwarich.

• "this" object in methods called on primitives should be wrapper object ​https://bugs.webkit.org/show_bug.cgi?id=21362

I changed things so that functions which use "this" do a fast
version of toThisObject conversion if needed. Currently we miss
the conversion entirely, at least for primitive types. Using
TypeInfo and the primitive check, I made the fast case bail out
pretty fast.

This is inexplicably an 1.007x SunSpider speedup (and a wash on V8 benchmarks).

Also renamed some opcodes for clarity:

init ==> enter
init_activation ==> enter_with_activation

• VM/CTI.cpp: (JSC::CTI::privateCompileMainPass): (JSC::CTI::privateCompileSlowCases):
• VM/CodeBlock.cpp: (JSC::CodeBlock::dump):
• VM/CodeGenerator.cpp: (JSC::CodeGenerator::generate): (JSC::CodeGenerator::CodeGenerator):
• VM/Machine.cpp: (JSC::Machine::privateExecute): (JSC::Machine::cti_op_convert_this):
• VM/Machine.h:
• VM/Opcode.h:
• kjs/JSActivation.cpp: (JSC::JSActivation::JSActivation):
• kjs/JSActivation.h: (JSC::JSActivation::createStructureID):
• kjs/JSCell.h: (JSC::JSValue::needsThisConversion):
• kjs/JSGlobalData.cpp: (JSC::JSGlobalData::JSGlobalData):
• kjs/JSGlobalData.h:
• kjs/JSNumberCell.h: (JSC::JSNumberCell::createStructureID):
• kjs/JSStaticScopeObject.h: (JSC::JSStaticScopeObject::JSStaticScopeObject): (JSC::JSStaticScopeObject::createStructureID):
• kjs/JSString.h: (JSC::JSString::createStructureID):
• kjs/JSValue.h:
• kjs/TypeInfo.h: (JSC::TypeInfo::needsThisConversion):
• kjs/nodes.h: (JSC::ScopeNode::usesThis):

WebCore:

2008-10-03 Maciej Stachowiak <​[email protected]>

Reviewed by Cameron Zwarich.

• "this" object in methods called on primitives should be wrapper object ​https://bugs.webkit.org/show_bug.cgi?id=21362

Updated so toThis conversion for the split window is handled properly.

• bindings/scripts/CodeGeneratorJS.pm:

LayoutTests:

2008-10-03 Maciej Stachowiak <​[email protected]>

Reviewed by Cameron Zwarich.

• test case for: "this" object in methods called on primitives should be wrapper object

• fast/js/primitive-method-this-expected.txt: Added.
• fast/js/primitive-method-this.html: Added.
• fast/js/resources/primitive-method-this.js: Added.

File:

• trunk/JavaScriptCore/VM/CTI.cpp (modified) (4 diffs)

trunk/JavaScriptCore/VM/CTI.cpp

@@ -1965 +1965 @@
             break;
         }
-        case op_init: {
+        case op_enter: {
             // Even though CTI doesn't use them, we initialize our constant
             // registers to zap stale pointers, to avoid unnecessarily prolonging
@@ -1976 +1976 @@
             break;
         }
-        case op_init_activation: {
+        case op_enter_with_activation: {
             emitCall(i, Machine::cti_op_push_activation);
 
@@ -1992 +1992 @@
             emitCall(i, Machine::cti_op_init_arguments);
             i += 1;
+            break;
+        }
+        case op_convert_this: {
+            emitGetArg(instruction[i + 1].u.operand, X86::eax);
+
+            emitJumpSlowCaseIfNotJSCell(X86::eax, i);
+            m_jit.movl_mr(OBJECT_OFFSET(JSCell, m_structureID), X86::eax, X86::edx);
+            m_jit.testl_i32m(NeedsThisConversion, OBJECT_OFFSET(StructureID, m_typeInfo.m_flags), X86::edx);
+            m_slowCases.append(SlowCaseEntry(m_jit.emitUnlinkedJnz(), i));
+
+            i += 2;
             break;
         }
@@ -2038 +2049 @@
         unsigned i = iter->to;
         switch (m_machine->getOpcodeID(instruction[i].u.opcode)) {
+        case op_convert_this: {
+            m_jit.link(iter->from, m_jit.label());
+            m_jit.link((++iter)->from, m_jit.label());
+            emitPutArg(X86::eax, 0);
+            emitCall(i, Machine::cti_op_convert_this);
+            emitPutResult(instruction[i + 1].u.operand);
+            i += 2;
+            break;
+        }
         case op_add: {
             unsigned dst = instruction[i + 1].u.operand;