Changeset 161437 in webkit

Timestamp:

Jan 7, 2014 11:10:51 AM (10 years ago)

Author:

rgabor@webkit.org

Message:

pushFinallyContext saves wrong m_labelScopes size
​https://bugs.webkit.org/show_bug.cgi?id=124529

Remove free label scopes before saving finally context.

Reviewed by Geoffrey Garen.

Source/JavaScriptCore:

• bytecompiler/BytecodeGenerator.cpp:

(JSC::BytecodeGenerator::pushFinallyContext):

LayoutTests:

• js/script-tests/try-return-finally-break.js: Added.

(foo):

• js/try-return-finally-break-expected.txt: Added.
• js/try-return-finally-break.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/js/script-tests/try-return-finally-break.js (added)
• LayoutTests/js/try-return-finally-break-expected.txt (added)
• LayoutTests/js/try-return-finally-break.html (added)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-01-07  Gabor Rapcsanyi  <rgabor@webkit.org>
+
+        pushFinallyContext saves wrong m_labelScopes size
+        https://bugs.webkit.org/show_bug.cgi?id=124529
+
+        Remove free label scopes before saving finally context.
+
+        Reviewed by Geoffrey Garen.
+
+        * js/script-tests/try-return-finally-break.js: Added.
+        (foo):
+        * js/try-return-finally-break-expected.txt: Added.
+        * js/try-return-finally-break.html: Added.
+
 2014-01-07  Bear Travis  <betravis@adobe.com>
 

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2014-01-07  Gabor Rapcsanyi  <rgabor@webkit.org>
+
+        pushFinallyContext saves wrong m_labelScopes size
+        https://bugs.webkit.org/show_bug.cgi?id=124529
+
+        Remove free label scopes before saving finally context.
+
+        Reviewed by Geoffrey Garen.
+
+        * bytecompiler/BytecodeGenerator.cpp:
+        (JSC::BytecodeGenerator::pushFinallyContext):
+
 2014-01-06  Mark Hahnenberg  <mhahnenberg@apple.com>
 

trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp

@@ -1955 +1955 @@
 void BytecodeGenerator::pushFinallyContext(StatementNode* finallyBlock)
 {
+    // Reclaim free label scopes.
+    while (m_labelScopes.size() && !m_labelScopes.last().refCount())
+        m_labelScopes.removeLast();
+
     ControlFlowContext scope;
     scope.isFinallyBlock = true;