Changeset 162390 in webkit

Timestamp:

Jan 20, 2014 4:46:17 PM (10 years ago)

Author:

fpizlo@apple.com

Message:

op_captured_mov and op_new_captured_func in UnlinkedCodeBlocks should use the IdentifierMap instead of the strings directly
​https://bugs.webkit.org/show_bug.cgi?id=127311
<rdar://problem/15853958>

Reviewed by Andreas Kling.

This makes UnlinkedCodeBlocks use 32-bit instruction streams again.

• bytecode/CodeBlock.cpp:

(JSC::CodeBlock::CodeBlock):

• bytecode/UnlinkedCodeBlock.h:

(JSC::UnlinkedInstruction::UnlinkedInstruction):

• bytecompiler/BytecodeGenerator.cpp:

(JSC::BytecodeGenerator::addVar):
(JSC::BytecodeGenerator::emitInitLazyRegister):
(JSC::BytecodeGenerator::createArgumentsIfNecessary):

• bytecompiler/BytecodeGenerator.h:

(JSC::BytecodeGenerator::watchableVariable):
(JSC::BytecodeGenerator::hasWatchableVariable):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• bytecode/CodeBlock.cpp (modified) (1 diff)
• bytecode/UnlinkedCodeBlock.h (modified) (1 diff)
• bytecompiler/BytecodeGenerator.cpp (modified) (3 diffs)
• bytecompiler/BytecodeGenerator.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2014-01-20  Filip Pizlo  <fpizlo@apple.com>
+
+        op_captured_mov and op_new_captured_func in UnlinkedCodeBlocks should use the IdentifierMap instead of the strings directly
+        https://bugs.webkit.org/show_bug.cgi?id=127311
+        <rdar://problem/15853958>
+
+        Reviewed by Andreas Kling.
+        
+        This makes UnlinkedCodeBlocks use 32-bit instruction streams again.
+
+        * bytecode/CodeBlock.cpp:
+        (JSC::CodeBlock::CodeBlock):
+        * bytecode/UnlinkedCodeBlock.h:
+        (JSC::UnlinkedInstruction::UnlinkedInstruction):
+        * bytecompiler/BytecodeGenerator.cpp:
+        (JSC::BytecodeGenerator::addVar):
+        (JSC::BytecodeGenerator::emitInitLazyRegister):
+        (JSC::BytecodeGenerator::createArgumentsIfNecessary):
+        * bytecompiler/BytecodeGenerator.h:
+        (JSC::BytecodeGenerator::watchableVariable):
+        (JSC::BytecodeGenerator::hasWatchableVariable):
+
 2014-01-20  Mark Lam  <mark.lam@apple.com>
 

trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp

@@ -1816 +1816 @@
         case op_captured_mov:
         case op_new_captured_func: {
-            StringImpl* uid = pc[i + 3].u.uid;
-            if (!uid)
+            if (pc[i + 3].u.index == UINT_MAX) {
+                instructions[i + 3].u.watchpointSet = 0;
                 break;
+            }
+            StringImpl* uid = identifier(pc[i + 3].u.index).impl();
             RELEASE_ASSERT(didCloneSymbolTable);
             ConcurrentJITLocker locker(m_symbolTable->m_lock);

trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.h

@@ -229 +229 @@
     UnlinkedInstruction(OpcodeID opcode) { u.opcode = opcode; }
     UnlinkedInstruction(int operand) { u.operand = operand; }
-    UnlinkedInstruction(StringImpl* uid) { u.uid = uid; }
     union {
         OpcodeID opcode;
         int32_t operand;
-        StringImpl* uid;
+        unsigned index;
     } u;
 };

trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp

@@ -133 +133 @@
     if (watchMode == IsWatchable) {
         while (m_watchableVariables.size() < static_cast<size_t>(m_codeBlock->m_numVars))
-            m_watchableVariables.append(nullptr);
-        m_watchableVariables.append(ident.impl());
+            m_watchableVariables.append(Identifier());
+        m_watchableVariables.append(ident);
     }
     
@@ -470 +470 @@
     emitOpcode(op_init_lazy_reg);
     instructions().append(reg->index());
-    ASSERT(!watchableVariable(reg->index()));
+    ASSERT(!hasWatchableVariable(reg->index()));
     return reg;
 }
@@ -1629 +1629 @@
     emitOpcode(op_create_arguments);
     instructions().append(m_codeBlock->argumentsRegister().offset());
-    ASSERT(!watchableVariable(m_codeBlock->argumentsRegister().offset()));
+    ASSERT(!hasWatchableVariable(m_codeBlock->argumentsRegister().offset()));
 }
 

trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h

@@ -592 +592 @@
         RegisterID* createLazyRegisterIfNecessary(RegisterID*);
         
-        StringImpl* watchableVariable(int operand)
+        unsigned watchableVariable(int operand)
         {
             VirtualRegister reg(operand);
             if (!reg.isLocal())
-                return 0;
+                return UINT_MAX;
             if (static_cast<size_t>(reg.toLocal()) >= m_watchableVariables.size())
-                return 0;
-            return m_watchableVariables[reg.toLocal()];
+                return UINT_MAX;
+            Identifier& ident = m_watchableVariables[reg.toLocal()];
+            if (ident.isNull())
+                return UINT_MAX;
+            return addConstant(ident);
+        }
+        
+        bool hasWatchableVariable(int operand)
+        {
+            return watchableVariable(operand) != UINT_MAX;
         }
         
@@ -621 +629 @@
         RegisterID* m_emptyValueRegister;
         RegisterID* m_globalObjectRegister;
-        Vector<StringImpl*, 16> m_watchableVariables;
+        Vector<Identifier, 16> m_watchableVariables;
         SegmentedVector<RegisterID, 32> m_constantPoolRegisters;
         SegmentedVector<RegisterID, 32> m_calleeRegisters;