Changeset 128534 in webkit for trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp

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:

File:

• trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp (modified) (1 diff)

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();