Bug 178134 - Fix compilation when MASM_PROBE (and therefore DFG) are disabled
Summary: Fix compilation when MASM_PROBE (and therefore DFG) are disabled
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: JavaScriptCore (show other bugs)
Version: Other
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Nobody
URL:
Keywords: InRadar
Depends on:
Blocks:
 
Reported: 2017-10-10 10:29 PDT by Guillaume Emont
Modified: 2017-10-10 16:15 PDT (History)
8 users (show)

See Also:

Attachments
Patch (2.55 KB, patch)
2017-10-10 10:37 PDT, Guillaume Emont 		no flags Details | Formatted Diff | Diff
Patch (2.54 KB, patch)
2017-10-10 14:27 PDT, Guillaume Emont 		no flags Details | Formatted Diff | Diff
Show Obsolete (1) 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 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>