Changeset 203315 in webkit

Timestamp:

Jul 15, 2016, 6:14:57 PM (10 years ago)

Author:

mark.lam@apple.com

Message:

Assertion failures and crashes with missing TDZ checks for catch-node bindings.
​https://bugs.webkit.org/show_bug.cgi?id=158797

Reviewed by Saam Barati.

• bytecompiler/BytecodeGenerator.cpp:

(JSC::BytecodeGenerator::emitPushCatchScope):
(JSC::BytecodeGenerator::emitPopCatchScope):

• tests/stress/catch-clause-should-be-under-tdz1.js: Added.
• tests/stress/catch-clause-should-be-under-tdz2.js: Added.
• tests/stress/catch-clause-should-be-under-tdz3.js: Added.
• tests/stress/catch-clause-should-be-under-tdz4.js: Added.
• tests/stress/catch-clause-should-be-under-tdz5.js: Added.

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• bytecompiler/BytecodeGenerator.cpp (modified) (1 diff)
• tests/stress/catch-clause-should-be-under-tdz1.js (added)
• tests/stress/catch-clause-should-be-under-tdz2.js (added)
• tests/stress/catch-clause-should-be-under-tdz3.js (added)
• tests/stress/catch-clause-should-be-under-tdz4.js (added)
• tests/stress/catch-clause-should-be-under-tdz5.js (added)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2016-07-15  Mark Lam  <mark.lam@apple.com>
+
+        Assertion failures and crashes with missing TDZ checks for catch-node bindings.
+        https://bugs.webkit.org/show_bug.cgi?id=158797
+
+        Reviewed by Saam Barati.
+
+        * bytecompiler/BytecodeGenerator.cpp:
+        (JSC::BytecodeGenerator::emitPushCatchScope):
+        (JSC::BytecodeGenerator::emitPopCatchScope):
+        * tests/stress/catch-clause-should-be-under-tdz1.js: Added.
+        * tests/stress/catch-clause-should-be-under-tdz2.js: Added.
+        * tests/stress/catch-clause-should-be-under-tdz3.js: Added.
+        * tests/stress/catch-clause-should-be-under-tdz4.js: Added.
+        * tests/stress/catch-clause-should-be-under-tdz5.js: Added.
+
 2016-07-15  Geoffrey Garen  <ggaren@apple.com>
 

trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp

@@ -3863 +3863 @@
 void BytecodeGenerator::emitPushCatchScope(VariableEnvironment& environment)
 {
-    pushLexicalScopeInternal(environment, TDZCheckOptimization::Optimize, NestedScopeType::IsNotNested, nullptr, TDZRequirement::NotUnderTDZ, ScopeType::CatchScope, ScopeRegisterType::Block);
+    pushLexicalScopeInternal(environment, TDZCheckOptimization::Optimize, NestedScopeType::IsNotNested, nullptr, TDZRequirement::UnderTDZ, ScopeType::CatchScope, ScopeRegisterType::Block);
 }