Changeset 37285 in webkit for trunk/JavaScriptCore/VM/CodeGenerator.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/CodeGenerator.cpp (modified) (5 diffs)

trunk/JavaScriptCore/VM/CodeGenerator.cpp

@@ -138 +138 @@
 
     if (m_codeType == FunctionCode && m_codeBlock->needsFullScopeChain) {
-        ASSERT(globalData()->machine->getOpcodeID(m_codeBlock->instructions[0].u.opcode) == op_init);
-        m_codeBlock->instructions[0] = globalData()->machine->getOpcode(op_init_activation);
+        ASSERT(globalData()->machine->getOpcodeID(m_codeBlock->instructions[0].u.opcode) == op_enter);
+        m_codeBlock->instructions[0] = globalData()->machine->getOpcode(op_enter_with_activation);
     }
 
@@ -217 +217 @@
     , m_lastOpcodeID(op_end)
 {
-    emitOpcode(op_init);
+    emitOpcode(op_enter);
     codeBlock->globalData = m_globalData;
 
@@ -290 +290 @@
     , m_lastOpcodeID(op_end)
 {
-    emitOpcode(op_init);
+    emitOpcode(op_enter);
     codeBlock->globalData = m_globalData;
 
@@ -322 +322 @@
     ++m_nextParameter;
     ++m_codeBlock->numParameters;
+
+    if (functionBody->usesThis()) {
+        emitOpcode(op_convert_this);
+        instructions().append(m_thisRegister.index());
+    }
     
     for (size_t i = 0; i < parameterCount; ++i)
@@ -343 +348 @@
     , m_lastOpcodeID(op_end)
 {
-    emitOpcode(op_init);
+    emitOpcode(op_enter);
     codeBlock->globalData = m_globalData;
     m_codeBlock->numParameters = 1; // Allocate space for "this"