Bug 72348 – DFG::SpeculativeJIT and DFG::JITCodeGenerator should be combined

• Status: RESOLVED
• Resolution: FIXED
• Component: JavaScriptCore

[Filip Pizlo]

The separation between these two classes made sense when there was a DFG:NonSpeculativeJIT.  But there isn't one anymore, and the separation is getting in the way of further progress.

[Filip Pizlo]

This blocks https://bugs.webkit.org/show_bug.cgi?id=72347 because that bug requires that the appendCallWithXYZ methods know about speculation checks.  Those methods are currently in JITCodeGenerator.  It's probably best if we just move everything out of JITCodeGenerator and into SpeculativeJIT.

[Filip Pizlo]

Created attachment 115090 [details]
the patch

[WebKit Review Bot]

Attachment 115090 [details] did not pass style-queue:

Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'LayoutTests/fast/js/script-tests/dfg-inlin..." exit_code: 1

Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp:1285:  One line control clauses should not use braces.  [whitespace/braces] [4]
Source/JavaScriptCore/dfg/DFGSpeculativeJIT.h:1877:  Missing space inside { }.  [whitespace/braces] [5]
Total errors found: 2 in 7 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[Gyuyoung Kim]

Comment on attachment 115090 [details]
the patch

Attachment 115090 [details] did not pass efl-ews (efl):
Output: http://queues.webkit.org/results/10486195

[Collabora GTK+ EWS bot]

Comment on attachment 115090 [details]
the patch

Attachment 115090 [details] did not pass gtk-ews (gtk):
Output: http://queues.webkit.org/results/10484184

[Filip Pizlo]

Created attachment 115091 [details]
the patch

Fixed some build systems.

Fixed style.

Fixed a merge goof where my previous patch was removing some LayoutTest.

[Early Warning System Bot]

Comment on attachment 115091 [details]
the patch

Attachment 115091 [details] did not pass qt-ews (qt):
Output: http://queues.webkit.org/results/10485233

[Filip Pizlo]

Landed in http://trac.webkit.org/changeset/100244

[Filip Pizlo]

(In reply to comment #7)
> (From update of attachment 115091 [details])
> Attachment 115091 [details] did not pass qt-ews (qt):
> Output: http://queues.webkit.org/results/10485233

I'm assuming this was just due to JSValueOperand not being forward-declared in SpeculativeJIT.h.  Watching the bots to make sure this is the case...