Changeset 128534 in webkit for trunk/Source/JavaScriptCore/bytecompiler

Timestamp:

Sep 13, 2012, 5:43:04 PM (13 years ago)

Author:

[email protected]

Message:

Make global const initialisation explicit in the bytecode
​https://bugs.webkit.org/show_bug.cgi?id=96711

Reviewed by Gavin Barraclough.

Added op_init_global_const to make initialisation of global const
fields explicit. This will help us keep correct semantics in the
upcoming variable resolution refactoring.

• bytecode/CodeBlock.cpp:

(JSC::CodeBlock::dump):

• bytecode/Opcode.h:

(JSC):
(JSC::padOpcodeName):

• bytecompiler/BytecodeGenerator.cpp:

(JSC::BytecodeGenerator::emitInitGlobalConst):
(JSC):

• bytecompiler/BytecodeGenerator.h:

(BytecodeGenerator):

• bytecompiler/NodesCodegen.cpp:

(JSC::ConstDeclNode::emitCodeSingle):

• dfg/DFGByteCodeParser.cpp:

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

• dfg/DFGCapabilities.h:

(JSC::DFG::canCompileOpcode):

• interpreter/Interpreter.cpp:

(JSC::Interpreter::privateExecute):

• jit/JIT.cpp:

(JSC::JIT::privateCompileMainPass):
(JSC::JIT::privateCompileSlowCases):

• llint/LowLevelInterpreter32_64.asm:
• llint/LowLevelInterpreter64.asm:

Location:

trunk/Source/JavaScriptCore/bytecompiler

Files:

• BytecodeGenerator.cpp (modified) (1 diff)
• BytecodeGenerator.h (modified) (1 diff)
• NodesCodegen.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp

@@ -1658 +1658 @@
         return dst;
 
+    default:
+        ASSERT_NOT_REACHED();
+        return 0;
+    }
+}
+
+RegisterID* BytecodeGenerator::emitInitGlobalConst(const ResolveResult& resolveResult, const Identifier& identifier, RegisterID* value)
+{
+    ASSERT(m_codeType == GlobalCode);
+    switch (resolveResult.type()) {
+    case ResolveResult::IndexedGlobal:
+    case ResolveResult::ReadOnlyIndexedGlobal:
+        emitOpcode(op_init_global_const);
+        instructions().append(resolveResult.registerPointer());
+        instructions().append(value->index());
+        return value;
+
+    case ResolveResult::WatchedIndexedGlobal:
+        emitOpcode(op_init_global_const_check);
+        instructions().append(resolveResult.registerPointer());
+        instructions().append(value->index());
+        instructions().append(jsCast<JSGlobalObject*>(resolveResult.globalObject())->symbolTable()->get(identifier.impl()).addressOfIsWatched());
+        instructions().append(addConstant(identifier));
+        return value;
+        
     default:
         ASSERT_NOT_REACHED();

trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h

@@ -463 +463 @@
         RegisterID* emitGetStaticVar(RegisterID* dst, const ResolveResult&, const Identifier&);
         RegisterID* emitPutStaticVar(const ResolveResult&, const Identifier&, RegisterID* value);
+        RegisterID* emitInitGlobalConst(const ResolveResult&, const Identifier&, RegisterID* value);
 
         RegisterID* emitResolve(RegisterID* dst, const ResolveResult&, const Identifier& property);

trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp

@@ -1388 +1388 @@
     RefPtr<RegisterID> value = m_init ? generator.emitNode(m_init) : generator.emitLoad(0, jsUndefined());
 
-    if (resolveResult.isStatic())
+    if (resolveResult.isStatic()) {
+        if (generator.codeType() == GlobalCode)
+            return generator.emitInitGlobalConst(resolveResult, m_ident, value.get());
         return generator.emitPutStaticVar(resolveResult, m_ident, value.get());
-    
+    }
     if (generator.codeType() != EvalCode)
         return value.get();