Bug 190878 – Add BPLATFORM(IOS_FAMILY)

• Status: RESOLVED
• Resolution: FIXED
• Component: bmalloc

[Alexey Proskuryakov]

Just like in WTF, BPLATFORM(IOS) is a misnomer. Change that to strictly match iOS, and add BPLATFORM(IOS_FAMILY).

[Alexey Proskuryakov]

Created attachment 353038 [details]
proposed patch

Mostly mechanical. It may be worth verifying if BUSE_CHECK_NANO_MALLOC and GIGACAGE_ENABLED are defined correctly. I believe that I kept the behavior unchanged, but it's surprising that gigacage is only enabled on iOS proper.

 #if ((BOS(DARWIN) || BOS(LINUX)) && \
-    (BCPU(X86_64) || (BCPU(ARM64) && !defined(__ILP32__) && (!BPLATFORM(IOS) || __IPHONE_OS_VERSION_MIN_REQUIRED >= 110300))))
+    (BCPU(X86_64) || (BCPU(ARM64) && !defined(__ILP32__) && (!BPLATFORM(IOS_FAMILY) || BPLATFORM(IOS)))))
 #define GIGACAGE_ENABLED 1

[Saam Barati]

Comment on attachment 353038 [details]
proposed patch

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

r=me

> Source/bmalloc/bmalloc/BPlatform.h:-241
> -#if ((BPLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 120000) || (BPLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 50000) || (BPLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 120000)) \

Do we not care about building for  iOS 11 anymore? I have no use for this, but does our perf infrastructure care?

[Saam Barati]

(In reply to Alexey Proskuryakov from comment #1)
> Created attachment 353038 [details]
> proposed patch
> 
> Mostly mechanical. It may be worth verifying if BUSE_CHECK_NANO_MALLOC and
> GIGACAGE_ENABLED are defined correctly. I believe that I kept the behavior
> unchanged, but it's surprising that gigacage is only enabled on iOS proper.
> 
>  #if ((BOS(DARWIN) || BOS(LINUX)) && \
> -    (BCPU(X86_64) || (BCPU(ARM64) && !defined(__ILP32__) &&
> (!BPLATFORM(IOS) || __IPHONE_OS_VERSION_MIN_REQUIRED >= 110300))))
> +    (BCPU(X86_64) || (BCPU(ARM64) && !defined(__ILP32__) &&
> (!BPLATFORM(IOS_FAMILY) || BPLATFORM(IOS)))))
>  #define GIGACAGE_ENABLED 1

They look correct to me

[Saam Barati]

Comment on attachment 353038 [details]
proposed patch

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

> Source/bmalloc/bmalloc/BPlatform.h:56
> +#if TARGET_OS_IOS

This is true for iPhone/iPad?

[Alexey Proskuryakov]

> Do we not care about building for  iOS 11 anymore? I have no use for this, but does our perf infrastructure care?

No, iOS 11 build is not longer supported by trunk. I'll be cleaning up more of the checks for older OS versions next.

> > +#if TARGET_OS_IOS
> 
> This is true for iPhone/iPad?

Yes, these and only these (plus simulators of course).

[Alexey Proskuryakov]

Committed http://trac.webkit.org/r237399

[Radar WebKit Bug Importer]

<rdar://problem/45532352>