Changeset 239898 in webkit

Timestamp:

Jan 12, 2019, 1:49:17 AM (8 years ago)

Author:

yusukesuzuki@slowstart.org

Message:

Unreviewed, fix scope check assertions
​https://bugs.webkit.org/show_bug.cgi?id=193308

• bytecode/CodeBlock.cpp:

(JSC::CodeBlock::notifyLexicalBindingShadowing):

• runtime/JSGlobalObject.cpp:

(JSC::JSGlobalObject::notifyLexicalBindingShadowing):

• runtime/ProgramExecutable.cpp:

(JSC::ProgramExecutable::initializeGlobalProperties):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• bytecode/CodeBlock.cpp (modified) (4 diffs)
• runtime/JSGlobalObject.cpp (modified) (2 diffs)
• runtime/ProgramExecutable.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2019-01-12  Yusuke Suzuki  <yusukesuzuki@slowstart.org>
+
+        Unreviewed, fix scope check assertions
+        https://bugs.webkit.org/show_bug.cgi?id=193308
+
+        * bytecode/CodeBlock.cpp:
+        (JSC::CodeBlock::notifyLexicalBindingShadowing):
+        * runtime/JSGlobalObject.cpp:
+        (JSC::JSGlobalObject::notifyLexicalBindingShadowing):
+        * runtime/ProgramExecutable.cpp:
+        (JSC::ProgramExecutable::initializeGlobalProperties):
+
 2019-01-11  John Wilander  <wilander@apple.com>
 

trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp

@@ -2677 +2677 @@
     JSGlobalObject* globalObject = m_globalObject.get();
 
-    auto throwScope = DECLARE_THROW_SCOPE(vm);
+    auto scope = DECLARE_THROW_SCOPE(vm);
 
     ConcurrentJSLocker locker(m_lock);
@@ -2694 +2694 @@
                     // It should immediately find the lexical binding because that's the reason why we perform this rewriting now.
                     ResolveOp op = JSScope::abstractResolve(m_globalObject->globalExec(), bytecode.localScopeDepth, globalObject->globalScope(), ident, Get, bytecode.resolveType, InitializationMode::NotInitialization);
-                    EXCEPTION_ASSERT_UNUSED(throwScope, !throwScope.exception());
+                    scope.releaseAssertNoException();
                     ASSERT(op.type == GlobalLexicalVarWithVarInjectionChecks || op.type == GlobalLexicalVar);
                     metadata.resolveType = needsVarInjectionChecks(originalResolveType) ? GlobalLexicalVarWithVarInjectionChecks : GlobalLexicalVar;
@@ -2718 +2718 @@
                     // It should immediately find the lexical binding because that's the reason why we perform this rewriting now.
                     ResolveOp op = JSScope::abstractResolve(m_globalObject->globalExec(), bytecode.localScopeDepth, globalObject->globalScope(), ident, Get, bytecode.getPutInfo.resolveType(), InitializationMode::NotInitialization);
-                    EXCEPTION_ASSERT_UNUSED(throwScope, !throwScope.exception());
+                    scope.releaseAssertNoException();
                     ASSERT(op.type == GlobalLexicalVarWithVarInjectionChecks || op.type == GlobalLexicalVar);
                     metadata.getPutInfo = GetPutInfo(bytecode.getPutInfo.resolveMode(), needsVarInjectionChecks(originalResolveType) ? GlobalLexicalVarWithVarInjectionChecks : GlobalLexicalVar, bytecode.getPutInfo.initializationMode());
@@ -2739 +2739 @@
                     // It should immediately find the lexical binding because that's the reason why we perform this rewriting now.
                     ResolveOp op = JSScope::abstractResolve(m_globalObject->globalExec(), bytecode.symbolTableOrScopeDepth, globalObject->globalScope(), ident, Put, bytecode.getPutInfo.resolveType(), bytecode.getPutInfo.initializationMode());
-                    EXCEPTION_ASSERT_UNUSED(throwScope, !throwScope.exception());
+                    scope.releaseAssertNoException();
                     ASSERT(op.type == GlobalLexicalVarWithVarInjectionChecks || op.type == GlobalLexicalVar || op.type == Dynamic);
 

trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp

@@ -1854 +1854 @@
 void JSGlobalObject::notifyLexicalBindingShadowing(VM& vm, const IdentifierSet& set)
 {
+    auto scope = DECLARE_THROW_SCOPE(vm);
 #if ENABLE(DFG_JIT)
     for (const auto& key : set)
@@ -1862 +1863 @@
             return;
         codeBlock->notifyLexicalBindingShadowing(vm, set);
+        scope.assertNoException();
     });
+    scope.release();
 }
 

trunk/Source/JavaScriptCore/runtime/ProgramExecutable.cpp

@@ -208 +208 @@
     }
 
-    if (!shadowedProperties.isEmpty())
+    if (!shadowedProperties.isEmpty()) {
         globalObject->notifyLexicalBindingShadowing(vm, WTFMove(shadowedProperties));
+        throwScope.assertNoException();
+    }
 
     return nullptr;