Bug 74306 - Fix Platform.h settings on non-IOS-simulator platforms
Summary: Fix Platform.h settings on non-IOS-simulator platforms
Status: RESOLVED INVALID
Alias: None
Product: WebKit
Classification: Unclassified
Component: Web Template Framework (show other bugs)
Version: 528+ (Nightly build)
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Nobody
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-12-12 09:09 PST by Andy Wingo
Modified: 2011-12-12 09:29 PST (History)
2 users (show)

See Also:


Attachments
Patch (1.42 KB, patch)
2011-12-12 09:11 PST, Andy Wingo
ddkilzer: review-
Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Andy Wingo 2011-12-12 09:09:20 PST
r100037 was intended to update the ios Platform.h defines, but it unintentionally sets a number of Platform.h variables on other platforms.
Comment 1 Andy Wingo 2011-12-12 09:11:01 PST
Created attachment 118808 [details]
Patch
Comment 2 David Kilzer (:ddkilzer) 2011-12-12 09:26:07 PST
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.
Comment 3 Andy Wingo 2011-12-12 09:29:49 PST
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!