Changeset 39737 in webkit for trunk/JavaScriptCore/bytecompiler

Timestamp:

Jan 8, 2009, 9:41:01 PM (16 years ago)

Author:

[email protected]

Message:

2009-01-08 Sam Weinig <​[email protected]>

Revert r39720. It broke Interpreted mode.

Location:

trunk/JavaScriptCore/bytecompiler

Files:

• BytecodeGenerator.cpp (modified) (10 diffs)
• BytecodeGenerator.h (modified) (3 diffs)

trunk/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp

@@ -116 +116 @@
 
 #ifndef NDEBUG
-static bool s_dumpsGeneratedCode = false;
+bool BytecodeGenerator::s_dumpsGeneratedCode = false;
 #endif
 
@@ -212 +212 @@
     : m_shouldEmitDebugHooks(!!debugger)
     , m_shouldEmitProfileHooks(scopeChain.globalObject()->supportsProfiling())
+    , m_regeneratingForExceptionInfo(false)
     , m_scopeChain(&scopeChain)
     , m_symbolTable(symbolTable)
@@ -225 +226 @@
     , m_lastOpcodeID(op_end)
     , m_emitNodeDepth(0)
-    , m_regeneratingForExceptionInfo(false)
-    , m_codeBlockBeingRegeneratedFrom(0)
 {
     if (m_shouldEmitDebugHooks)
@@ -296 +295 @@
     : m_shouldEmitDebugHooks(!!debugger)
     , m_shouldEmitProfileHooks(scopeChain.globalObject()->supportsProfiling())
+    , m_regeneratingForExceptionInfo(false)
     , m_scopeChain(&scopeChain)
     , m_symbolTable(symbolTable)
@@ -307 +307 @@
     , m_lastOpcodeID(op_end)
     , m_emitNodeDepth(0)
-    , m_regeneratingForExceptionInfo(false)
-    , m_codeBlockBeingRegeneratedFrom(0)
 {
     if (m_shouldEmitDebugHooks)
@@ -369 +367 @@
     : m_shouldEmitDebugHooks(!!debugger)
     , m_shouldEmitProfileHooks(scopeChain.globalObject()->supportsProfiling())
+    , m_regeneratingForExceptionInfo(false)
     , m_scopeChain(&scopeChain)
     , m_symbolTable(symbolTable)
@@ -376 +375 @@
     , m_finallyDepth(0)
     , m_dynamicScopeDepth(0)
-    , m_baseScopeDepth(codeBlock->baseScopeDepth())
+    , m_baseScopeDepth(scopeChain.localDepth())
     , m_codeType(EvalCode)
     , m_globalData(&scopeChain.globalObject()->globalExec()->globalData())
     , m_lastOpcodeID(op_end)
     , m_emitNodeDepth(0)
-    , m_regeneratingForExceptionInfo(false)
-    , m_codeBlockBeingRegeneratedFrom(0)
 {
     if (m_shouldEmitDebugHooks || m_baseScopeDepth)
@@ -995 +992 @@
     }
 
+    if (index != missingSymbolMarker()) {
+        // Directly index the property lookup across multiple scopes.  Yay!
+        return emitGetScopedVar(dst, depth, index, globalObject);
+    }
+
     if (globalObject) {
-        bool forceGlobalResolve = false;
-        if (m_regeneratingForExceptionInfo) {
 #if ENABLE(JIT)
-            forceGlobalResolve = m_codeBlockBeingRegeneratedFrom->hasGlobalResolveInfoAtBytecodeOffset(instructions().size());
-#else
-            forceGlobalResolve = m_codeBlockBeingRegeneratedFrom->hasGlobalResolveInstructionAtBytecodeOffset(instructions().size());
-#endif
-        }
-
-        if (index != missingSymbolMarker() && !forceGlobalResolve) {
-            // Directly index the property lookup across multiple scopes.
-            return emitGetScopedVar(dst, depth, index, globalObject);
-        }
-
-#if ENABLE(JIT)
-        m_codeBlock->addGlobalResolveInfo(instructions().size());
+        m_codeBlock->addGlobalResolveInfo();
 #else
         m_codeBlock->addGlobalResolveInstruction(instructions().size());
@@ -1024 +1012 @@
     }
 
-    if (index != missingSymbolMarker()) {
-        // Directly index the property lookup across multiple scopes.
-        return emitGetScopedVar(dst, depth, index, globalObject);
-    }
-
     // In this case we are at least able to drop a few scope chains from the
     // lookup chain, although we still need to hash from then on.
@@ -1041 +1024 @@
 {
     if (globalObject) {
+        // op_get_global_var must be the same length as op_resolve_global.
         emitOpcode(op_get_global_var);
         instructions().append(dst->index());
         instructions().append(asCell(globalObject));
         instructions().append(index);
+        instructions().append(0);
+        instructions().append(0);
         return dst;
     }

trunk/JavaScriptCore/bytecompiler/BytecodeGenerator.h

@@ -330 +330 @@
         CodeType codeType() const { return m_codeType; }
 
-        void setRegeneratingForExceptionInfo(CodeBlock* originalCodeBlock)
-        {
-            m_regeneratingForExceptionInfo = true;
-            m_codeBlockBeingRegeneratedFrom = originalCodeBlock;
-        }
+        void setRegeneratingForExceptionInfo() { m_regeneratingForExceptionInfo = true; }
 
     private:
@@ -426 +422 @@
         bool m_shouldEmitDebugHooks;
         bool m_shouldEmitProfileHooks;
+
+        bool m_regeneratingForExceptionInfo;
 
         const ScopeChain* m_scopeChain;
@@ -468 +466 @@
         OpcodeID m_lastOpcodeID;
 
+#ifndef NDEBUG
+        static bool s_dumpsGeneratedCode;
+#endif
+
         unsigned m_emitNodeDepth;
-
-        bool m_regeneratingForExceptionInfo;
-        CodeBlock* m_codeBlockBeingRegeneratedFrom;
 
         static const unsigned s_maxEmitNodeDepth = 10000;