Bug 72348 - DFG::SpeculativeJIT and DFG::JITCodeGenerator should be combined
Summary: DFG::SpeculativeJIT and DFG::JITCodeGenerator should be combined
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: JavaScriptCore (show other bugs)
Version: 528+ (Nightly build)
Hardware: All All
: P2 Normal
Assignee: Nobody
URL:
Keywords:
Depends on:
Blocks: 72347
  Show dependency treegraph
 
Reported: 2011-11-14 20:15 PST by Filip Pizlo
Modified: 2011-11-14 23:05 PST (History)
4 users (show)

See Also:


Attachments
the patch (435.39 KB, patch)
2011-11-14 20:34 PST, Filip Pizlo
gyuyoung.kim: commit-queue-
Details | Formatted Diff | Diff
the patch (436.29 KB, patch)
2011-11-14 20:41 PST, Filip Pizlo
barraclough: review+
webkit-ews: commit-queue-
Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Filip Pizlo 2011-11-14 20:15:50 PST
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.
Comment 1 Filip Pizlo 2011-11-14 20:17:00 PST
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.
Comment 2 Filip Pizlo 2011-11-14 20:34:54 PST
Created attachment 115090 [details]
the patch
Comment 3 WebKit Review Bot 2011-11-14 20:37:31 PST
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.
Comment 4 Gyuyoung Kim 2011-11-14 20:39:32 PST
Comment on attachment 115090 [details]
the patch

Attachment 115090 [details] did not pass efl-ews (efl):
Output: http://queues.webkit.org/results/10486195
Comment 5 Collabora GTK+ EWS bot 2011-11-14 20:40:38 PST
Comment on attachment 115090 [details]
the patch

Attachment 115090 [details] did not pass gtk-ews (gtk):
Output: http://queues.webkit.org/results/10484184
Comment 6 Filip Pizlo 2011-11-14 20:41:28 PST
Created attachment 115091 [details]
the patch

Fixed some build systems.

Fixed style.

Fixed a merge goof where my previous patch was removing some LayoutTest.
Comment 7 Early Warning System Bot 2011-11-14 22:58:46 PST
Comment on attachment 115091 [details]
the patch

Attachment 115091 [details] did not pass qt-ews (qt):
Output: http://queues.webkit.org/results/10485233
Comment 8 Filip Pizlo 2011-11-14 23:04:25 PST
Landed in http://trac.webkit.org/changeset/100244
Comment 9 Filip Pizlo 2011-11-14 23:05:00 PST
(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...