Changeset 174899 in webkit

Timestamp:

Oct 20, 2014 12:13:32 PM (10 years ago)

Author:

mark.lam@apple.com

Message:

[Follow up] Web Process crash when starting the web inspector after r174025.
<​https://webkit.org/b/137340>

Reviewed by Geoffrey Garen.

Applied Geoff's feedback to clean up some code for better clarity after
r174856.

• dfg/DFGFixupPhase.cpp:

(JSC::DFG::FixupPhase::insertCheck):

• dfg/DFGInsertionSet.h:

(JSC::DFG::InsertionSet::insertOutOfOrder):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• dfg/DFGFixupPhase.cpp (modified) (1 diff)
• dfg/DFGInsertionSet.h (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2014-10-20  Mark Lam  <mark.lam@apple.com>
+
+        [Follow up] Web Process crash when starting the web inspector after r174025.
+        <https://webkit.org/b/137340>
+
+        Reviewed by Geoffrey Garen.
+
+        Applied Geoff's feedback to clean up some code for better clarity after
+        r174856.
+
+        * dfg/DFGFixupPhase.cpp:
+        (JSC::DFG::FixupPhase::insertCheck):
+        * dfg/DFGInsertionSet.h:
+        (JSC::DFG::InsertionSet::insertOutOfOrder):
+
 2014-10-20  Mark Lam  <mark.lam@apple.com>
 

trunk/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp

@@ -1743 +1743 @@
             // The checked node is within the same bytecode. Hence, the earliest
             // position we can insert the check is right after the checked node.
-            indexInBlock = indexOfNode(node, indexInBlock);
-            indexInBlock++;
+            indexInBlock = indexOfNode(node, indexInBlock) + 1;
         } else {
             // The checked node is from a preceding bytecode. Hence, the earliest

trunk/Source/JavaScriptCore/dfg/DFGInsertionSet.h

@@ -121 +121 @@
         size_t targetIndex = insertion.index();
         size_t entry = m_insertions.size();
-        if (entry) {
-            do {
-                entry--;
-                if (m_insertions[entry].index() <= targetIndex) {
-                    entry++;
-                    break;
-                }
-            } while (entry);
+        while (entry) {
+            entry--;
+            if (m_insertions[entry].index() <= targetIndex) {
+                entry++;
+                break;
+            }
         }
         m_insertions.insert(entry, insertion);