Title: [210655] branches/safari-603-branch/Source/_javascript_Core
Revision
210655
Author
matthew_han...@apple.com
Date
2017-01-12 08:45:53 -0800 (Thu, 12 Jan 2017)

Log Message

Merge r210530. rdar://problem/29909896

Modified Paths

Diff

Modified: branches/safari-603-branch/Source/_javascript_Core/ChangeLog (210654 => 210655)


--- branches/safari-603-branch/Source/_javascript_Core/ChangeLog	2017-01-12 16:45:51 UTC (rev 210654)
+++ branches/safari-603-branch/Source/_javascript_Core/ChangeLog	2017-01-12 16:45:53 UTC (rev 210655)
@@ -1,5 +1,15 @@
 2017-01-12  Matthew Hanson  <matthew_han...@apple.com>
 
+        Merge r210530. rdar://problem/29909896
+
+    2017-01-09  Filip Pizlo  <fpi...@apple.com>
+
+            Unreviewed, fix cloop.
+
+            * dfg/DFGPlanInlines.h:
+
+2017-01-12  Matthew Hanson  <matthew_han...@apple.com>
+
         Merge r210521. rdar://problem/29909896
 
     2017-01-08  Filip Pizlo  <fpi...@apple.com>

Modified: branches/safari-603-branch/Source/_javascript_Core/dfg/DFGPlanInlines.h (210654 => 210655)


--- branches/safari-603-branch/Source/_javascript_Core/dfg/DFGPlanInlines.h	2017-01-12 16:45:51 UTC (rev 210654)
+++ branches/safari-603-branch/Source/_javascript_Core/dfg/DFGPlanInlines.h	2017-01-12 16:45:53 UTC (rev 210655)
@@ -29,6 +29,8 @@
 
 namespace JSC { namespace DFG {
 
+#if ENABLE(DFG_JIT)
+
 template<typename Func>
 void Plan::iterateCodeBlocksForGC(const Func& func)
 {
@@ -45,5 +47,7 @@
         func(profiledDFGCodeBlock);
 }
 
+#endif // ENABLE(DFG_JIT)
+
 } } // namespace JSC::DFG
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to