Bug 74306 – Fix Platform.h settings on non-IOS-simulator platforms

• Component: Web Template Framework
• Status: RESOLVED INVALID

[Andy Wingo]

r100037 was intended to update the ios Platform.h defines, but it unintentionally sets a number of Platform.h variables on other platforms.

[Andy Wingo]

Created attachment 118808 [details]
Patch

[David Kilzer (:ddkilzer)]

Comment on attachment 118808 [details]
Patch

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

> Source/JavaScriptCore/wtf/Platform.h:595
>  #if PLATFORM(IOS_SIMULATOR)
> -    #define ENABLE_INTERPRETER 1
> -    #define ENABLE_JIT 0
> -    #define ENABLE_YARR 0
> -    #define ENABLE_YARR_JIT 0
> -#else
> -    #define ENABLE_INTERPRETER 1
> -    #define ENABLE_JIT 1
> -    #define ENABLE_YARR 1
> -    #define ENABLE_YARR_JIT 1
> +#define ENABLE_INTERPRETER 1
> +#define ENABLE_JIT 0
> +#define ENABLE_YARR 0
> +#define ENABLE_YARR_JIT 0
>  #endif

This whole block is inside a #if PLATFORM(IOS)/#endif macro pair.  How are these macros being interpreted by other platforms?

Is there a mismatched #if/[#else/]#endif block above this?

> Source/JavaScriptCore/wtf/Platform.h:597
>  #endif

This is the end of the #if PLATFORM(IOS) macro.

[Andy Wingo]

I clearly was not thinking when I posted this patch.  I think I was used to reading platform.h as a series of mostly unnested blocks.  Sorry for the noise!