Changeset 210119 in webkit

Timestamp:

Dec 22, 2016, 3:23:51 PM (8 years ago)

Author:

mark.lam@apple.com

Message:

BytecodeGenerator::m_finallyDepth should be unsigned.
​https://bugs.webkit.org/show_bug.cgi?id=166438

Reviewed by Saam Barati.

Also removed FinallyContext::m_finallyDepth because it is not used.

• bytecompiler/BytecodeGenerator.cpp:

(JSC::BytecodeGenerator::pushFinallyControlFlowScope):
(JSC::BytecodeGenerator::labelScopeDepth):

• bytecompiler/BytecodeGenerator.h:

(JSC::FinallyContext::FinallyContext):
(JSC::FinallyContext::finallyLabel):
(JSC::FinallyContext::depth): Deleted.

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• bytecompiler/BytecodeGenerator.cpp (modified) (2 diffs)
• bytecompiler/BytecodeGenerator.h (modified) (4 diffs)

trunk/Source/JavaScriptCore/ChangeLog ¶

@@ +1 @@
+2016-12-22  Mark Lam  <mark.lam@apple.com>
+
+        BytecodeGenerator::m_finallyDepth should be unsigned.
+        https://bugs.webkit.org/show_bug.cgi?id=166438
+
+        Reviewed by Saam Barati.
+
+        Also removed FinallyContext::m_finallyDepth because it is not used.
+
+        * bytecompiler/BytecodeGenerator.cpp:
+        (JSC::BytecodeGenerator::pushFinallyControlFlowScope):
+        (JSC::BytecodeGenerator::labelScopeDepth):
+        * bytecompiler/BytecodeGenerator.h:
+        (JSC::FinallyContext::FinallyContext):
+        (JSC::FinallyContext::finallyLabel):
+        (JSC::FinallyContext::depth): Deleted.
+
 2016-12-22  Mark Lam  <mark.lam@apple.com>
 

trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp ¶

@@ -3688 +3688 @@
         m_labelScopes.removeLast();
 
-    ControlFlowScope scope(ControlFlowScope::Finally, currentLexicalScopeIndex(), FinallyContext(m_currentFinallyContext, finallyLabel, m_finallyDepth));
+    ControlFlowScope scope(ControlFlowScope::Finally, currentLexicalScopeIndex(), FinallyContext(m_currentFinallyContext, finallyLabel));
     m_controlFlowScopeStack.append(WTFMove(scope));
 
@@ -3887 +3887 @@
 int BytecodeGenerator::labelScopeDepth() const
 {
-    int depth = localScopeDepth() + m_finallyDepth;
-    ASSERT(depth == static_cast<int>(m_controlFlowScopeStack.size()));
+    unsigned depth = localScopeDepth() + m_finallyDepth;
+    ASSERT(depth == m_controlFlowScopeStack.size());
     return depth;
 }

trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h ¶

@@ -122 +122 @@
     struct FinallyContext {
         FinallyContext() { }
-        FinallyContext(FinallyContext* outerContext, Label* finallyLabel, int finallyDepth)
+        FinallyContext(FinallyContext* outerContext, Label* finallyLabel)
             : m_outerContext(outerContext)
             , m_finallyLabel(finallyLabel)
-            , m_finallyDepth(finallyDepth)
-        {
-            ASSERT(m_finallyDepth >= 0);
+        {
             ASSERT(m_jumps.isEmpty());
         }
@@ -133 +131 @@
         FinallyContext* outerContext() const { return m_outerContext; }
         Label* finallyLabel() const { return m_finallyLabel; }
-        int depth() const { return m_finallyDepth; }
 
         uint32_t numberOfBreaksOrContinues() const { return m_numberOfBreaksOrContinues.unsafeGet(); }
@@ -152 +149 @@
         FinallyContext* m_outerContext { nullptr };
         Label* m_finallyLabel { nullptr };
-        int m_finallyDepth { 0 };
         Checked<uint32_t, WTF::CrashOnOverflow> m_numberOfBreaksOrContinues;
         bool m_handlesReturns { false };
@@ -1092 +1088 @@
         SegmentedVector<Label, 32> m_labels;
         LabelScopeStore m_labelScopes;
-        int m_finallyDepth { 0 };
+        unsigned m_finallyDepth { 0 };
         int m_localScopeDepth { 0 };
         const CodeType m_codeType;