Bug 151617 – Fix the !ENABLE(DFG_JIT) build after r190735

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

[Csaba Osztrogonác]

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.

[Csaba Osztrogonác]

Any idea how to fix this build break properly?

[Filip Pizlo]

(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).

[Csaba Osztrogonác]

Created attachment 266614 [details]
Patch

[WebKit Commit Bot]

Comment on attachment 266614 [details]
Patch

Clearing flags on attachment: 266614

Committed r193423: <http://trac.webkit.org/changeset/193423>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.