Bug 178134

Summary: Fix compilation when MASM_PROBE (and therefore DFG) are disabled
Product: WebKit Reporter: Guillaume Emont <guijemont>
Component: JavaScriptCoreAssignee: Nobody <webkit-unassigned>
Status: RESOLVED FIXED    
Severity: Normal CC: aperez, buildbot, commit-queue, keith_miller, mark.lam, msaboff, sbarati, webkit-bug-importer
Priority: P2 Keywords: InRadar
Version: Other   
Hardware: Unspecified   
OS: Unspecified   
Attachments:
Description Flags
Patch
none
Patch none

Description Guillaume Emont 2017-10-10 10:29:59 PDT
Since r222871, JavaScriptCore does not compile if MASM_PROBE is disabled. Some code provided in this revision need to be protected by #if ENABLED(MASM_PROBE).
Comment 1 Guillaume Emont 2017-10-10 10:37:34 PDT
Created attachment 323318 [details]
Patch

Patch fixing the issue.
Comment 2 Adrian Perez 2017-10-10 11:12:35 PDT
Comment on attachment 323318 [details]
Patch

Informal review: r+
Comment 3 Saam Barati 2017-10-10 12:21:21 PDT
Comment on attachment 323318 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=323318&action=review

> Source/JavaScriptCore/bytecode/CodeBlock.cpp:2323
> +#if ENABLE(MASM_PROBE)

This should be:
#if ENABLE(DFGJIT)
or whatever the correct ENABLE name is

> Source/JavaScriptCore/bytecode/CodeBlock.h:80
> +#if ENABLE(MASM_PROBE)

ditto

> Source/JavaScriptCore/bytecode/CodeBlock.h:774
> +#if ENABLE(MASM_PROBE)
>      OptimizeAction updateOSRExitCounterAndCheckIfNeedToReoptimize(DFG::OSRExitState&);
> +#endif

ditto
Comment 4 Guillaume Emont 2017-10-10 14:27:45 PDT
Created attachment 323351 [details]
Patch

New version using ENABLE(DFG_JIT)
Comment 5 WebKit Commit Bot 2017-10-10 16:14:16 PDT
Comment on attachment 323351 [details]
Patch

Clearing flags on attachment: 323351

Committed r223155: <http://trac.webkit.org/changeset/223155>
Comment 6 WebKit Commit Bot 2017-10-10 16:14:17 PDT
All reviewed patches have been landed.  Closing bug.
Comment 7 Radar WebKit Bug Importer 2017-10-10 16:15:36 PDT
<rdar://problem/34922580>