186322 2018-06-05 14:18:59 -0700 Switch to system malloc on iOS when nano malloc is disabled 2018-06-26 12:40:07 -0700 1 1 1 Unclassified WebKit bmalloc WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 saam saam ap benjamin commit-queue ews-watchlist fpizlo ggaren gskachkov jfbastien keith_miller mark.lam msaboff rmorisset simon.fraser ticaiolima webkit-bug-importer ysuzuki oldest_to_newest 1430224 0 saam 2018-06-05 14:18:59 -0700 ... 1430231 1 ggaren 2018-06-05 14:35:02 -0700 I don't think we should do this. 1430282 2 fpizlo 2018-06-05 16:47:57 -0700 (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. 1431062 3 webkit-bug-importer 2018-06-07 16:08:22 -0700 <rdar://problem/40914671> 1436374 4 343572 saam 2018-06-25 18:45:34 -0700 Created attachment 343572 patch 1436375 5 ews-watchlist 2018-06-25 18:48:28 -0700 Attachment 343572 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. 1436379 6 343572 saam 2018-06-25 19:28:50 -0700 Comment on attachment 343572 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 1436399 7 343572 keith_miller 2018-06-25 21:34:31 -0700 Comment on attachment 343572 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? 1436412 8 343572 saam 2018-06-25 23:16:18 -0700 Comment on attachment 343572 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. 1436430 9 343572 commit-queue 2018-06-26 00:38:13 -0700 Comment on attachment 343572 patch Clearing flags on attachment: 343572 Committed r233192: <https://trac.webkit.org/changeset/233192> 1436431 10 commit-queue 2018-06-26 00:38:15 -0700 All reviewed patches have been landed. Closing bug. 1436563 11 343572 simon.fraser 2018-06-26 10:28:46 -0700 Comment on attachment 343572 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 1436620 12 343572 saam 2018-06-26 12:15:52 -0700 Comment on attachment 343572 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 1436629 13 saam 2018-06-26 12:40:07 -0700 Committed: https://trac.webkit.org/changeset/233216/webkit - Fixes watchOS build - Fixes bad changelog title and bug id 343572 2018-06-25 18:45:34 -0700 2018-06-26 00:38:13 -0700 patch a-backup.diff text/plain 5333 saam SW5kZXg6IFNvdXJjZS9ibWFsbG9jL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvYm1h bGxvYy9DaGFuZ2VMb2cJKHJldmlzaW9uIDIzMzE4OCkKKysrIFNvdXJjZS9ibWFsbG9jL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI2IEBACisyMDE4LTA2LTI1ICBTYWFtIEJh cmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgorCisgICAgICAgIFdhc206IEFueSBmdW5jdGlvbiBh cmd1bWVudCBvZiB0eXBlIFZvaWQgc2hvdWxkIGJlIGEgdmFsaWRhdGlvbiBlcnJvcgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg2Nzk0CisgICAgICAg IDxyZGFyOi8vcHJvYmxlbS80MTE0MDI1Nz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBXZSBoYXZlIGV2aWRlbmNlIHNob3dpbmcgdGhhdCBwcm9jZXNz ZXMgd2l0aCBzbWFsbCBoZWFwcyB1c2luZyB0aGUKKyAgICAgICAgSlMgQVBJIGFyZSBtb3JlIHNw YWNlIGVmZmljaWVudCB3aGVuIHVzaW5nIHN5c3RlbSBtYWxsb2MuIE91ciBtYWluCisgICAgICAg IGh5cG90aGVzaXMgYXMgdG8gd2h5IHRoaXMgaXMsIGlzIHRoYXQgd2hlbiBkZWFsaW5nIHdpdGgg c21hbGwgaGVhcHMsCisgICAgICAgIG9uZSBtYWxsb2MgY2FuIGJlIG1vcmUgZWZmaWNpZW50IGF0 IG9wdGltaXppbmcgbWVtb3J5IHVzYWdlIHRoYW4KKyAgICAgICAgdHdvIG1hbGxvY3MuCisKKyAg ICAgICAgKiBibWFsbG9jL0JQbGF0Zm9ybS5oOgorICAgICAgICAqIGJtYWxsb2MvRW52aXJvbm1l bnQuY3BwOgorICAgICAgICAoYm1hbGxvYzo6aXNOYW5vTWFsbG9jRW5hYmxlZCk6CisgICAgICAg IChibWFsbG9jOjpFbnZpcm9ubWVudDo6Y29tcHV0ZUlzRGVidWdIZWFwRW5hYmxlZCk6CisgICAg ICAgICogYm1hbGxvYy9Qcm9jZXNzQ2hlY2suaDoKKyAgICAgICAgKGJtYWxsb2M6OnNob3VsZFBy b2Nlc3NVbmNvbmRpdGlvbmFsbHlVc2VCbWFsbG9jKToKKyAgICAgICAgKiBibWFsbG9jL1Byb2Nl c3NDaGVjay5tbToKKyAgICAgICAgKGJtYWxsb2M6OnNob3VsZFByb2Nlc3NVbmNvbmRpdGlvbmFs bHlVc2VCbWFsbG9jKToKKwogMjAxOC0wNi0yNCAgWXVzdWtlIFN1enVraSAgPHV0YXRhbmUudGVh QGdtYWlsLmNvbT4KIAogICAgICAgICBbYm1hbGxvY11bTGludXhdIFJlbW92ZSBzdGF0aWMgaW5p dGlhbGl6ZXJzIGZvciBQZXJQcm9jZXNzPD46OnNfb2JqZWN0CkluZGV4OiBTb3VyY2UvYm1hbGxv Yy9ibWFsbG9jL0JQbGF0Zm9ybS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9ibWFsbG9jL2JtYWxs b2MvQlBsYXRmb3JtLmgJKHJldmlzaW9uIDIzMzE2MSkKKysrIFNvdXJjZS9ibWFsbG9jL2JtYWxs b2MvQlBsYXRmb3JtLmgJKHdvcmtpbmcgY29weSkKQEAgLTcxLDYgKzcxLDEwIEBACiAjZGVmaW5l IEJQTEFURk9STV9XQVRDSE9TIDEKICNlbmRpZgogCisjaWYgZGVmaW5lZChUQVJHRVRfT1NfVFYp ICYmIFRBUkdFVF9PU19UVgorI2RlZmluZSBCUExBVEZPUk1fQVBQTEVUViAxCisjZW5kaWYKKwog LyogPT09PSBQb2xpY3kgZGVjaXNpb24gbWFjcm9zOiB0aGVzZSBkZWZpbmUgcG9saWN5IGNob2lj ZXMgZm9yIGEgcGFydGljdWxhciBwb3J0LiA9PT09ICovCiAKIC8qIEJVU0UoKSAtIHVzZSBhIHBh cnRpY3VsYXIgdGhpcmQtcGFydHkgbGlicmFyeSBvciBvcHRpb25hbCBPUyBzZXJ2aWNlICovCkBA IC0yMzMsMyArMjM3LDExIEBACiAKIC8qIFRoaXMgaXMgdXNlZCBmb3IgZGVidWdnaW5nIHdoZW4g aGFja2luZyBvbiBob3cgYm1hbGxvYyBjYWxjdWxhdGVzIGl0cyBwaHlzaWNhbCBmb290cHJpbnQu ICovCiAjZGVmaW5lIEVOQUJMRV9QSFlTSUNBTF9QQUdFX01BUCAwCisKKyNpZiAoKEJQTEFURk9S TShJT1MpICYmIF9fSVBIT05FX09TX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDEyMDAwMCkgfHwg KEJQTEFURk9STShXQVRDSE9TKSAmJiBfX1dBVENIX09TX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49 IDUwMDAwKSB8fCAoQlBMQVRGT1JNKEFQUExFVFYpICYmIF9fVFZfT1NfVkVSU0lPTl9NSU5fUkVR VUlSRUQgPj0gMTIwMDAwKSkgXAorICAgICYmIChCQ1BVKEFSTTY0KSB8fCBCQ1BVKEFSTSkpCisj ZGVmaW5lIEJVU0VfQ0hFQ0tfTkFOT19NQUxMT0MgMQorI2Vsc2UKKyNkZWZpbmUgQlVTRV9DSEVD S19OQU5PX01BTExPQyAwCisjZW5kaWYKKwpJbmRleDogU291cmNlL2JtYWxsb2MvYm1hbGxvYy9F bnZpcm9ubWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL2JtYWxsb2MvYm1hbGxvYy9FbnZp cm9ubWVudC5jcHAJKHJldmlzaW9uIDIzMzE2MSkKKysrIFNvdXJjZS9ibWFsbG9jL2JtYWxsb2Mv RW52aXJvbm1lbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNSw2ICsyNSw3IEBACiAKICNpbmNs dWRlICJCUGxhdGZvcm0uaCIKICNpbmNsdWRlICJFbnZpcm9ubWVudC5oIgorI2luY2x1ZGUgIlBy b2Nlc3NDaGVjay5oIgogI2luY2x1ZGUgPGNzdGRsaWI+CiAjaW5jbHVkZSA8Y3N0cmluZz4KICNp ZiBCT1MoREFSV0lOKQpAQCAtMzMsNiArMzQsMTUgQEAKICNpbmNsdWRlIDxkbGZjbi5oPgogI2Vu ZGlmCiAKKyNpZiBCVVNFKENIRUNLX05BTk9fTUFMTE9DKQorZXh0ZXJuICJDIiB7CisjaWYgX19o YXNfaW5jbHVkZSg8bWFsbG9jX3ByaXZhdGUuaD4pCisjaW5jbHVkZSA8bWFsbG9jX3ByaXZhdGUu aD4KKyNlbmRpZgoraW50IG1hbGxvY19lbmdhZ2VkX25hbm8odm9pZCk7Cit9CisjZW5kaWYKKwog bmFtZXNwYWNlIGJtYWxsb2MgewogCiBzdGF0aWMgYm9vbCBpc01hbGxvY0Vudmlyb25tZW50VmFy aWFibGVTZXQoKQpAQCAtMTA3LDYgKzExNywxNCBAQCBzdGF0aWMgYm9vbCBpc1Nhbml0aXplckVu YWJsZWQoKQogI2VuZGlmCiB9CiAKKyNpZiBCVVNFKENIRUNLX05BTk9fTUFMTE9DKQorc3RhdGlj IGJvb2wgaXNOYW5vTWFsbG9jRW5hYmxlZCgpCit7CisgICAgaW50IHJlc3VsdCA9ICEhbWFsbG9j X2VuZ2FnZWRfbmFubygpOworICAgIHJldHVybiByZXN1bHQ7Cit9CisjZW5kaWYKKwogRW52aXJv bm1lbnQ6OkVudmlyb25tZW50KHN0ZDo6bG9ja19ndWFyZDxNdXRleD4mKQogICAgIDogbV9pc0Rl YnVnSGVhcEVuYWJsZWQoY29tcHV0ZUlzRGVidWdIZWFwRW5hYmxlZCgpKQogewpAQCAtMTIwLDYg KzEzOCwxMCBAQCBib29sIEVudmlyb25tZW50Ojpjb21wdXRlSXNEZWJ1Z0hlYXBFbmFiCiAgICAg ICAgIHJldHVybiB0cnVlOwogICAgIGlmIChpc1Nhbml0aXplckVuYWJsZWQoKSkKICAgICAgICAg cmV0dXJuIHRydWU7CisjaWYgQlVTRShDSEVDS19OQU5PX01BTExPQykKKyAgICBpZiAoIWlzTmFu b01hbGxvY0VuYWJsZWQoKSAmJiAhc2hvdWxkUHJvY2Vzc1VuY29uZGl0aW9uYWxseVVzZUJtYWxs b2MoKSkKKyAgICAgICAgcmV0dXJuIHRydWU7CisjZW5kaWYKICAgICByZXR1cm4gZmFsc2U7CiB9 CiAKSW5kZXg6IFNvdXJjZS9ibWFsbG9jL2JtYWxsb2MvUHJvY2Vzc0NoZWNrLmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL2JtYWxsb2MvYm1hbGxvYy9Qcm9jZXNzQ2hlY2suaAkocmV2aXNpb24gMjMz MTYxKQorKysgU291cmNlL2JtYWxsb2MvYm1hbGxvYy9Qcm9jZXNzQ2hlY2suaAkod29ya2luZyBj b3B5KQpAQCAtMzksNCArMzksMTAgQEAgYm9vbCBnaWdhY2FnZUVuYWJsZWRGb3JQcm9jZXNzKCk7 CiBpbmxpbmUgYm9vbCBnaWdhY2FnZUVuYWJsZWRGb3JQcm9jZXNzKCkgeyByZXR1cm4gdHJ1ZTsg fQogI2VuZGlmCiAKKyNpZiBCVVNFKENIRUNLX05BTk9fTUFMTE9DKQorYm9vbCBzaG91bGRQcm9j ZXNzVW5jb25kaXRpb25hbGx5VXNlQm1hbGxvYygpOworI2Vsc2UKK2lubGluZSBib29sIHNob3Vs ZFByb2Nlc3NVbmNvbmRpdGlvbmFsbHlVc2VCbWFsbG9jKCkgeyByZXR1cm4gdHJ1ZTsgfQorI2Vu ZGlmCisKIH0KSW5kZXg6IFNvdXJjZS9ibWFsbG9jL2JtYWxsb2MvUHJvY2Vzc0NoZWNrLm1tCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9ibWFsbG9jL2JtYWxsb2MvUHJvY2Vzc0NoZWNrLm1tCShyZXZp c2lvbiAyMzMxNjEpCisrKyBTb3VyY2UvYm1hbGxvYy9ibWFsbG9jL1Byb2Nlc3NDaGVjay5tbQko d29ya2luZyBjb3B5KQpAQCAtMjgsNiArMjgsNyBAQAogI2lmICFCUExBVEZPUk0oV0FUQ0hPUykK IAogI2ltcG9ydCA8Rm91bmRhdGlvbi9Gb3VuZGF0aW9uLmg+CisjaW1wb3J0IDxtdXRleD4KIAog bmFtZXNwYWNlIGJtYWxsb2MgewogCkBAIC01Miw2ICs1MywyNyBAQCBib29sIGdpZ2FjYWdlRW5h YmxlZEZvclByb2Nlc3MoKQogICAgIHJldHVybiBpc09wdEluQmluYXJ5OwogfQogCisjaWYgQlVT RShDSEVDS19OQU5PX01BTExPQykKK2Jvb2wgc2hvdWxkUHJvY2Vzc1VuY29uZGl0aW9uYWxseVVz ZUJtYWxsb2MoKQoreworICAgIHN0YXRpYyBib29sIHJlc3VsdDsKKyAgICBzdGF0aWMgc3RkOjpv bmNlX2ZsYWcgb25jZUZsYWc7CisgICAgc3RkOjpjYWxsX29uY2Uob25jZUZsYWcsIFsmXSAoKSB7 CisgICAgICAgIGlmIChOU1N0cmluZyAqYXBwTmFtZSA9IFtbTlNCdW5kbGUgbWFpbkJ1bmRsZV0g YnVuZGxlSWRlbnRpZmllcl0pIHsKKyAgICAgICAgICAgIGF1dG8gY29udGFpbnMgPSBbJl0gKE5T U3RyaW5nICpzdHJpbmcpIHsKKyAgICAgICAgICAgICAgICByZXR1cm4gW2FwcE5hbWUgcmFuZ2VP ZlN0cmluZzpzdHJpbmcgb3B0aW9uczpOU0Nhc2VJbnNlbnNpdGl2ZVNlYXJjaF0ubG9jYXRpb24g IT0gTlNOb3RGb3VuZDsKKyAgICAgICAgICAgIH07CisgICAgICAgICAgICByZXN1bHQgPSBjb250 YWlucyhAImNvbS5hcHBsZS5XZWJLaXQiKSB8fCBjb250YWlucyhAInNhZmFyaSIpOworICAgICAg ICB9IGVsc2UgeworICAgICAgICAgICAgTlNTdHJpbmcgKnByb2Nlc3NOYW1lID0gW1tOU1Byb2Nl c3NJbmZvIHByb2Nlc3NJbmZvXSBwcm9jZXNzTmFtZV07CisgICAgICAgICAgICByZXN1bHQgPSBb cHJvY2Vzc05hbWUgaXNFcXVhbFRvU3RyaW5nOkAianNjIl0gfHwgW3Byb2Nlc3NOYW1lIGlzRXF1 YWxUb1N0cmluZzpAIndhc20iXTsKKyAgICAgICAgfQorICAgIH0pOworCisgICAgcmV0dXJuIHJl c3VsdDsKK30KKyNlbmRpZgorCiB9CiAKICNlbmRpZgo=