Bug 186322 – Switch to system malloc on iOS when nano malloc is disabled

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

[Saam Barati]

...

[Geoffrey Garen]

I don't think we should do this.

[Filip Pizlo]

(In reply to Geoffrey Garen from comment #1)
> I don't think we should do this.

We have data that it's either a space progression or is space-neutral, and that it's time-neutral.  So, I think we should do it.

[Radar WebKit Bug Importer]

<rdar://problem/40914671>

[Saam Barati]

Created attachment 343572 [details]
patch

[EWS Watchlist]

Attachment 343572 [details] did not pass style-queue:


ERROR: Source/bmalloc/bmalloc/Environment.cpp:42:  malloc_engaged_nano is incorrectly named. Don't use underscores in your identifier names.  [readability/naming/underscores] [4]
Total errors found: 1 in 5 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[Saam Barati]

Comment on attachment 343572 [details]
patch

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

> 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)) \

I can simplify this and just make this IOS since the other two are true if this is IOS

[Keith Miller]

Comment on attachment 343572 [details]
patch

View in context: https://bugs.webkit.org/attachment.cgi?id=343572&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)) \
> 
> I can simplify this and just make this IOS since the other two are true if this is IOS

I'm confused is __TV_OS_VERSION_MIN_REQUIRED defined on iOS? Or are you saying that if __IPHONE_OS_VERSION_MIN_REQUIRED >= 120000 then __TV_OS_VERSION_MIN_REQUIRED will be >= 120000 also?

> Source/bmalloc/bmalloc/ProcessCheck.mm:62
> +        if (NSString *appName = [[NSBundle mainBundle] bundleIdentifier]) {

Maybe we should look for an environment variable too?

[Saam Barati]

Comment on attachment 343572 [details]
patch

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

>>> 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)) \
>> 
>> I can simplify this and just make this IOS since the other two are true if this is IOS
> 
> I'm confused is __TV_OS_VERSION_MIN_REQUIRED defined on iOS? Or are you saying that if __IPHONE_OS_VERSION_MIN_REQUIRED >= 120000 then __TV_OS_VERSION_MIN_REQUIRED will be >= 120000 also?

I realized this is actually required. I'm not going to simplify this.

Keith, I'm not sure what you're question is here, __TV_OS_VERSION_MIN_REQUIRED is 120000 for the newest tvOS version

>> Source/bmalloc/bmalloc/ProcessCheck.mm:62
>> +        if (NSString *appName = [[NSBundle mainBundle] bundleIdentifier]) {
> 
> Maybe we should look for an environment variable too?

Seems unnecessary ATM since we have malloc environment variables. We should do that in the future if we use this for more things that controlling system malloc.

[WebKit Commit Bot]

Comment on attachment 343572 [details]
patch

Clearing flags on attachment: 343572

Committed r233192: <https://trac.webkit.org/changeset/233192>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.

[Simon Fraser (smfr)]

Comment on attachment 343572 [details]
patch

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

> Source/bmalloc/ChangeLog:3
> +        Wasm: Any function argument of type Void should be a validation error

This seems like the wrong title

[Saam Barati]

Comment on attachment 343572 [details]
patch

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

>> Source/bmalloc/ChangeLog:3
>> +        Wasm: Any function argument of type Void should be a validation error
> 
> This seems like the wrong title

Ugh, yeah, I used the wrong bug ID in prepare-ChangeLog

[Saam Barati]

Committed: https://trac.webkit.org/changeset/233216/webkit
- Fixes watchOS build
- Fixes bad changelog title and bug id