Title: [215028] releases/WebKitGTK/webkit-2.14/Source/_javascript_Core
Revision
215028
Author
carlo...@webkit.org
Date
2017-04-06 05:44:18 -0700 (Thu, 06 Apr 2017)

Log Message

Merge r213275 - Incorrect RELEASE_ASSERT in JSGlobalObject::addStaticGlobals()
https://bugs.webkit.org/show_bug.cgi?id=169034

Reviewed by Mark Lam.

It should not assign to offset, but compare to offset.

* runtime/JSGlobalObject.cpp:
(JSC::JSGlobalObject::addStaticGlobals):

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/ChangeLog (215027 => 215028)


--- releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/ChangeLog	2017-04-06 12:43:31 UTC (rev 215027)
+++ releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/ChangeLog	2017-04-06 12:44:18 UTC (rev 215028)
@@ -1,3 +1,15 @@
+2017-03-02  Tomas Popela  <tpop...@redhat.com>
+
+        Incorrect RELEASE_ASSERT in JSGlobalObject::addStaticGlobals()
+        https://bugs.webkit.org/show_bug.cgi?id=169034
+
+        Reviewed by Mark Lam.
+
+        It should not assign to offset, but compare to offset.
+
+        * runtime/JSGlobalObject.cpp:
+        (JSC::JSGlobalObject::addStaticGlobals):
+
 2017-02-09  Mark Lam  <mark....@apple.com>
 
         B3::Procedure::deleteOrphans() should neutralize upsilons with dead phis.

Modified: releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/runtime/JSGlobalObject.cpp (215027 => 215028)


--- releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/runtime/JSGlobalObject.cpp	2017-04-06 12:43:31 UTC (rev 215027)
+++ releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/runtime/JSGlobalObject.cpp	2017-04-06 12:44:18 UTC (rev 215028)
@@ -1151,7 +1151,7 @@
         {
             ConcurrentJITLocker locker(symbolTable()->m_lock);
             ScopeOffset offset = symbolTable()->takeNextScopeOffset(locker);
-            RELEASE_ASSERT(offset = startOffset + i);
+            RELEASE_ASSERT(offset == startOffset + i);
             SymbolTableEntry newEntry(VarOffset(offset), global.attributes);
             newEntry.prepareToWatch();
             watchpointSet = newEntry.watchpointSet();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to