Changeset 241267 in webkit

Timestamp:

Feb 11, 2019 10:10:25 AM (5 years ago)

Author:

mark.lam@apple.com

Message:

Remove the RELEASE_ASSERT check for duplicate cases in the BinarySwitch constructor.
​https://bugs.webkit.org/show_bug.cgi?id=194493
<rdar://problem/36380852>

Reviewed by Yusuke Suzuki.

Having duplicate cases in the BinarySwitch is not a correctness issue. It is
however not good for performance and memory usage. As such, a debug ASSERT will
do. We'll also do an audit of the clients of BinarySwitch to see if it's
possible to be instantiated with duplicate cases in
​https://bugs.webkit.org/show_bug.cgi?id=194492 later.

Also added some value dumps to the RELEASE_ASSERT to help debug the issue when we
see duplicate cases.

• jit/BinarySwitch.cpp:

(JSC::BinarySwitch::BinarySwitch):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• jit/BinarySwitch.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2019-02-10  Mark Lam  <mark.lam@apple.com>
+
+        Remove the RELEASE_ASSERT check for duplicate cases in the BinarySwitch constructor.
+        https://bugs.webkit.org/show_bug.cgi?id=194493
+        <rdar://problem/36380852>
+
+        Reviewed by Yusuke Suzuki.
+
+        Having duplicate cases in the BinarySwitch is not a correctness issue.  It is
+        however not good for performance and memory usage.  As such, a debug ASSERT will
+        do.  We'll also do an audit of the clients of BinarySwitch to see if it's
+        possible to be instantiated with duplicate cases in
+        https://bugs.webkit.org/show_bug.cgi?id=194492 later.
+
+        Also added some value dumps to the RELEASE_ASSERT to help debug the issue when we
+        see duplicate cases.
+
+        * jit/BinarySwitch.cpp:
+        (JSC::BinarySwitch::BinarySwitch):
+
 2019-02-10  Darin Adler  <darin@apple.com>
 

trunk/Source/JavaScriptCore/jit/BinarySwitch.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2013, 2015 Apple Inc. All rights reserved.
+ * Copyright (C) 2013-2019 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -60 +60 @@
     if (BinarySwitchInternal::verbose)
         dataLog("Sorted cases: ", listDump(m_cases), "\n");
-    
+
+#if !ASSERT_DISABLED
     for (unsigned i = 1; i < m_cases.size(); ++i)
-        RELEASE_ASSERT(m_cases[i - 1] < m_cases[i]);
-    
+        ASSERT(m_cases[i - 1] < m_cases[i], i, m_cases.size(), m_cases[i].value, m_cases[i].index);
+#endif
+
     build(0, false, m_cases.size());
 }