Bug 151617 - Fix the !ENABLE(DFG_JIT) build after r190735
Summary: Fix the !ENABLE(DFG_JIT) build after r190735
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: JavaScriptCore (show other bugs)
Version: Other
Hardware: Unspecified Unspecified
: P1 Critical
Assignee: Csaba Osztrogonác
URL:
Keywords:
Depends on:
Blocks: 149601
  Show dependency tree / graph
 
Reported: 2015-11-26 04:25 PST by Csaba Osztrogonác
Modified: 2015-12-04 10:08 PST (History)
7 users (show)

See Also:

Attachments
Patch (1.62 KB, patch)
2015-12-04 03:08 PST, Csaba Osztrogonác 		no flags Details | Formatted Diff | Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Csaba Osztrogonác 2015-11-26 04:25:49 PST 
https://trac.webkit.org/changeset/190735 broke the !ENABLE(DFG_JIT) build:

../../Source/JavaScriptCore/jit/GCAwareJITStubRoutine.cpp: In member function 'virtual void JSC::GCAwareJITStubRoutineWithExceptionHandler::observeZeroRefCount()':
../../Source/JavaScriptCore/jit/GCAwareJITStubRoutine.cpp:119:64: error: invalid use of incomplete type 'class JSC::DFG::CommonData'
In file included from ../../Source/JavaScriptCore/runtime/Executable.h:37:0,
                 from ../../Source/JavaScriptCore/runtime/JSFunctionInlines.h:29,
                 from ../../Source/JavaScriptCore/bytecode/PolymorphicAccess.h:32,
                 from ../../Source/JavaScriptCore/bytecode/StructureStubInfo.h:36,
                 from ../../Source/JavaScriptCore/bytecode/ByValInfo.h:35,
                 from ../../Source/JavaScriptCore/bytecode/CodeBlock.h:34,
                 from ../../Source/JavaScriptCore/jit/GCAwareJITStubRoutine.cpp:31:
../../Source/JavaScriptCore/jit/JITCode.h:39:7: error: forward declaration of 'class JSC::DFG::CommonData'


It is obvious that using dfgCommon() outside of ENABLE(DFG_JIT) is incorrect. 
But I don't know what would be the proper behaviour here without DFG JIT.
Comment 1 Csaba Osztrogonác 2015-11-30 22:12:16 PST 
Any idea how to fix this build break properly?
Comment 2 Filip Pizlo 2015-11-30 22:25:51 PST 
(In reply to comment #1)
> Any idea how to fix this build break properly?

I believe that the entire "if (m_codeBlockWithExceptionHandler) {...}" block could be inside #if ENABLE(DFG_JIT).
Comment 3 Csaba Osztrogonác 2015-12-04 03:08:48 PST 
Created attachment 266614 [details]
Patch
Comment 4 WebKit Commit Bot 2015-12-04 10:08:44 PST 
Comment on attachment 266614 [details]
Patch

Clearing flags on attachment: 266614

Committed r193423: <http://trac.webkit.org/changeset/193423>
Comment 5 WebKit Commit Bot 2015-12-04 10:08:48 PST 
All reviewed patches have been landed.  Closing bug.