Unreviewed, build fix in GTK port

Constellation · Constellation · commit a9c33a90de94 · 2017-08-24T01:05:02.000Z
https://bugs.webkit.org/show_bug.cgi?id=174590 Source/JavaScriptCore: * bytecompiler/BytecodeGenerator.cpp: (JSC::BytecodeGenerator::emitCatch): * bytecompiler/BytecodeGenerator.h: Source/WTF: * wtf/SingleRootGraph.h: (WTF::SingleRootGraph::successors const): (WTF::SingleRootGraph::predecessors const): Canonical link: https://commits.webkit.org/192576@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@221124 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,12 @@
+2017-08-23  Yusuke Suzuki  <utatane.tea@gmail.com>
+
+        Unreviewed, build fix in GTK port
+        https://bugs.webkit.org/show_bug.cgi?id=174590
+
+        * bytecompiler/BytecodeGenerator.cpp:
+        (JSC::BytecodeGenerator::emitCatch):
+        * bytecompiler/BytecodeGenerator.h:
+
 2017-08-23  Saam Barati  <sbarati@apple.com>
 
         Support compiling catch in the DFG
diff --git a/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp b/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp
@@ -4023,7 +4023,7 @@ void BytecodeGenerator::popTry(TryData* tryData, Label& end)
 
 void BytecodeGenerator::emitCatch(RegisterID* exceptionRegister, RegisterID* thrownValueRegister, TryData* data)
 {
-    m_catchesToEmit.append({ data, exceptionRegister->index(), thrownValueRegister->index() });
+    m_catchesToEmit.append(CatchEntry { data, exceptionRegister->index(), thrownValueRegister->index() });
 }
 
 void BytecodeGenerator::restoreScopeRegister(int lexicalScopeIndex)
diff --git a/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h b/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h
@@ -1201,7 +1201,8 @@ namespace JSC {
         bool m_needsToUpdateArrowFunctionContext;
         DerivedContextType m_derivedContextType { DerivedContextType::None };
 
-        Vector<std::tuple<TryData*, int, int>> m_catchesToEmit;
+        using CatchEntry = std::tuple<TryData*, int, int>;
+        Vector<CatchEntry> m_catchesToEmit;
     };
 
 } // namespace JSC
diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
@@ -1,3 +1,12 @@
+2017-08-23  Yusuke Suzuki  <utatane.tea@gmail.com>
+
+        Unreviewed, build fix in GTK port
+        https://bugs.webkit.org/show_bug.cgi?id=174590
+
+        * wtf/SingleRootGraph.h:
+        (WTF::SingleRootGraph::successors const):
+        (WTF::SingleRootGraph::predecessors const):
+
 2017-08-23  Saam Barati  <sbarati@apple.com>
 
         Support compiling catch in the DFG
diff --git a/Source/WTF/wtf/SingleRootGraph.h b/Source/WTF/wtf/SingleRootGraph.h
@@ -206,8 +206,8 @@ class SingleRootGraph {
         if (node.isRoot())
             return m_rootSuccessorList;
         List result;
-        for (typename Graph::Node node : m_graph.successors(node.node()))
-            result.append(node);
+        for (typename Graph::Node successor : m_graph.successors(node.node()))
+            result.append(successor);
         return result;
     }
 
@@ -224,8 +224,8 @@ class SingleRootGraph {
         }
 
         List result;
-        for (typename Graph::Node node : m_graph.predecessors(node.node()))
-            result.append(node);
+        for (typename Graph::Node predecessor : m_graph.predecessors(node.node()))
+            result.append(predecessor);
         return result;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -4023,7 +4023,7 @@ void BytecodeGenerator::popTry(TryData* tryData, Label& end)`
`4023`	`4023`
`4024`	`4024`	`void BytecodeGenerator::emitCatch(RegisterID* exceptionRegister, RegisterID* thrownValueRegister, TryData* data)`
`4025`	`4025`	`{`
`4026`		`- m_catchesToEmit.append({ data, exceptionRegister->index(), thrownValueRegister->index() });`
	`4026`	`+ m_catchesToEmit.append(CatchEntry { data, exceptionRegister->index(), thrownValueRegister->index() });`
`4027`	`4027`	`}`
`4028`	`4028`
`4029`	`4029`	`void BytecodeGenerator::restoreScopeRegister(int lexicalScopeIndex)`
Original file line number	Diff line number	Diff line change
`@@ -206,8 +206,8 @@ class SingleRootGraph {`
`206`	`206`	`if (node.isRoot())`
`207`	`207`	`return m_rootSuccessorList;`
`208`	`208`	`List result;`
`209`		`- for (typename Graph::Node node : m_graph.successors(node.node()))`
`210`		`- result.append(node);`
	`209`	`+ for (typename Graph::Node successor : m_graph.successors(node.node()))`
	`210`	`+ result.append(successor);`
`211`	`211`	`return result;`
`212`	`212`	`}`
`213`	`213`
`@@ -224,8 +224,8 @@ class SingleRootGraph {`
`224`	`224`	`}`
`225`	`225`
`226`	`226`	`List result;`
`227`		`- for (typename Graph::Node node : m_graph.predecessors(node.node()))`
`228`		`- result.append(node);`
	`227`	`+ for (typename Graph::Node predecessor : m_graph.predecessors(node.node()))`
	`228`	`+ result.append(predecessor);`
`229`	`229`	`return result;`
`230`	`230`	`}`
`231`	`231`