141472 2015-02-11 05:54:57 -0800 bmalloc buildfix on 32 bit Linux (x86/ARM) 2015-02-11 08:12:20 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P1 Blocker --- 140162 1 ossy ossy cgarcia clopez commit-queue ggaren gyuyoung.kim ossy oldest_to_newest 1068333 0 ossy 2015-02-11 05:54:57 -0800 bmalloc buildfix on 32 bit Linux (x86/ARM) 1068334 1 246386 ossy 2015-02-11 05:56:14 -0800 Created attachment 246386 Patch 1068336 2 246386 ossy 2015-02-11 05:58:17 -0800 Comment on attachment 246386 Patch It works on 32 bit, but breaks the 64 bit :-/ 1068337 3 246386 ossy 2015-02-11 06:04:11 -0800 Comment on attachment 246386 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=246386&action=review > Source/bmalloc/bmalloc/FixedVector.h:62 > - void clear() { shrink(0ul); } > + void clear() { shrink(0u); } The original 0ul fails on 32bit: ../../Source/bmalloc/bmalloc/FixedVector.h: In instantiation of 'void bmalloc::FixedVector<T, Capacity>::clear() [with T = void*; unsigned int Capacity = 256u]': ../../Source/bmalloc/bmalloc/Deallocator.cpp:91:23: required from here ../../Source/bmalloc/bmalloc/FixedVector.h:62:30: error: call of overloaded 'shrink(long unsigned int)' is ambiguous ../../Source/bmalloc/bmalloc/FixedVector.h:62:30: note: candidates are: ../../Source/bmalloc/bmalloc/FixedVector.h:112:13: note: void bmalloc::FixedVector<T, Capacity>::shrink(T*) [with T = void*; unsigned int Capacity = 256u] ../../Source/bmalloc/bmalloc/FixedVector.h:105:13: note: void bmalloc::FixedVector<T, Capacity>::shrink(size_t) [with T = void*; unsigned int Capacity = 256u; size_t = unsigned int] The modified 0u fails on 64 bit: ./../Source/bmalloc/bmalloc/FixedVector.h: In instantiation of 'void bmalloc::FixedVector<T, Capacity>::clear() [with T = void*; long unsigned int Capacity = 256ul]': ../../Source/bmalloc/bmalloc/Deallocator.cpp:91:23: required from here ../../Source/bmalloc/bmalloc/FixedVector.h:62:29: error: call of overloaded 'shrink(unsigned int)' is ambiguous ../../Source/bmalloc/bmalloc/FixedVector.h:62:29: note: candidates are: ../../Source/bmalloc/bmalloc/FixedVector.h:112:13: note: void bmalloc::FixedVector<T, Capacity>::shrink(T*) [with T = void*; long unsigned int Capacity = 256ul] ../../Source/bmalloc/bmalloc/FixedVector.h:105:13: note: void bmalloc::FixedVector<T, Capacity>::shrink(size_t) [with T = void*; long unsigned int Capacity = 256ul; size_t = long unsigned int] 1068338 4 246387 ossy 2015-02-11 06:13:10 -0800 Created attachment 246387 Patch try to make 32 and 64 bit happy in the same time 1068351 5 246387 gyuyoung.kim 2015-02-11 07:26:46 -0800 Comment on attachment 246387 Patch rs=me. I think this patch isn't change behavior. 1068356 6 gyuyoung.kim 2015-02-11 07:34:45 -0800 (In reply to comment #5) > Comment on attachment 246387 [details] > Patch > > rs=me. I think this patch isn't change behavior. typo: s/isn't/doesn't/g 1068359 7 246387 commit-queue 2015-02-11 08:12:15 -0800 Comment on attachment 246387 Patch Clearing flags on attachment: 246387 Committed r179927: <http://trac.webkit.org/changeset/179927> 1068360 8 commit-queue 2015-02-11 08:12:20 -0800 All reviewed patches have been landed. Closing bug. 246386 2015-02-11 05:56:14 -0800 2015-02-11 06:13:04 -0800 Patch bug-141472-20150211055615.patch text/plain 2582 ossy U3VidmVyc2lvbiBSZXZpc2lvbjogMTc5OTIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvYm1hbGxvYy9D aGFuZ2VMb2cgYi9Tb3VyY2UvYm1hbGxvYy9DaGFuZ2VMb2cKaW5kZXggMTljZjgyNDAwYTkxNWI5 OTYxZTJlMzc4MGM2ODlkZmNjOGVjOGQ2ZS4uMzRiNTI4MGU5MTY3NThhNTFmNjc3OWY2ODQ3MWUz Mzg1YTcyNmY1NiAxMDA2NDQKLS0tIGEvU291cmNlL2JtYWxsb2MvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9ibWFsbG9jL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE1LTAyLTExICBDc2Fi YSBPc3p0cm9nb27DoWMgIDxvc3N5QHdlYmtpdC5vcmc+CisKKyAgICAgICAgYm1hbGxvYyBidWls ZGZpeCBvbiAzMiBiaXQgTGludXggKHg4Ni9BUk0pCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDE0NzIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIGJtYWxsb2MvQWxnb3JpdGhtLmg6CisgICAgICAgIChi bWFsbG9jOjpyb3VuZFVwVG9NdWx0aXBsZU9mKToKKyAgICAgICAgKiBibWFsbG9jL0ZpeGVkVmVj dG9yLmg6CisgICAgICAgIChibWFsbG9jOjpGaXhlZFZlY3Rvcjo6Y2xlYXIpOgorICAgICAgICAq IGJtYWxsb2MvU2l6ZXMuaDoKKyAgICAgICAgKGJtYWxsb2M6OlNpemVzOjpzaXplQ2xhc3MpOgor CiAyMDE1LTAyLTExICBHeXV5b3VuZyBLaW0gIDxneXV5b3VuZy5raW1Ac2Ftc3VuZy5jb20+CiAK ICAgICAgICAgW0VGTF1bR1RLXSBVc2UgYm1hbGxvYyBpbnN0ZWFkIG9mIHRjbWFsbG9jCmRpZmYg LS1naXQgYS9Tb3VyY2UvYm1hbGxvYy9ibWFsbG9jL0FsZ29yaXRobS5oIGIvU291cmNlL2JtYWxs b2MvYm1hbGxvYy9BbGdvcml0aG0uaAppbmRleCBiMDcwMGRkNmIyZjAxZjVhYTAxYWZhYTEwZTQy ZDhhOWQ2MGU2YWViLi5kYjQwYjZmNjU0N2Q4NmUyNWY2MTFjYTMyMWM2ZWEyMmQ5ZmQyMDlhIDEw MDY0NAotLS0gYS9Tb3VyY2UvYm1hbGxvYy9ibWFsbG9jL0FsZ29yaXRobS5oCisrKyBiL1NvdXJj ZS9ibWFsbG9jL2JtYWxsb2MvQWxnb3JpdGhtLmgKQEAgLTcwLDcgKzcwLDcgQEAgaW5saW5lIGNv bnN0ZXhwciBib29sIGlzUG93ZXJPZlR3byhzaXplX3Qgc2l6ZSkKIHRlbXBsYXRlPHR5cGVuYW1l IFQ+IGlubGluZSBUIHJvdW5kVXBUb011bHRpcGxlT2Yoc2l6ZV90IGRpdmlzb3IsIFQgeCkKIHsK ICAgICBCQVNTRVJUKGlzUG93ZXJPZlR3byhkaXZpc29yKSk7Ci0gICAgcmV0dXJuIHJlaW50ZXJw cmV0X2Nhc3Q8VD4oKHJlaW50ZXJwcmV0X2Nhc3Q8dWludHB0cl90Pih4KSArIChkaXZpc29yIC0g MXVsKSkgJiB+KGRpdmlzb3IgLSAxdWwpKTsKKyAgICByZXR1cm4gcmVpbnRlcnByZXRfY2FzdDxU PigocmVpbnRlcnByZXRfY2FzdDx1aW50cHRyX3Q+KHgpICsgKGRpdmlzb3IgLSAxKSkgJiB+KGRp dmlzb3IgLSAxKSk7CiB9CiAKIHRlbXBsYXRlPHNpemVfdCBkaXZpc29yLCB0eXBlbmFtZSBUPiBp bmxpbmUgY29uc3RleHByIFQgcm91bmRVcFRvTXVsdGlwbGVPZihUIHgpCmRpZmYgLS1naXQgYS9T b3VyY2UvYm1hbGxvYy9ibWFsbG9jL0ZpeGVkVmVjdG9yLmggYi9Tb3VyY2UvYm1hbGxvYy9ibWFs bG9jL0ZpeGVkVmVjdG9yLmgKaW5kZXggZDQyZTE1MTY5ZTI5MWQwZTJlMTU5Y2ZmNGRjMWU2MThj MjVkZGFiMy4uOTAzNDJkNzM5Mjg3N2IyZjE2MmZhNDhmNWFkYTE4Yzc5M2UzMDNkYiAxMDA2NDQK LS0tIGEvU291cmNlL2JtYWxsb2MvYm1hbGxvYy9GaXhlZFZlY3Rvci5oCisrKyBiL1NvdXJjZS9i bWFsbG9jL2JtYWxsb2MvRml4ZWRWZWN0b3IuaApAQCAtNTksNyArNTksNyBAQCBwdWJsaWM6CiAg ICAgdm9pZCBzaHJpbmsoVCopOwogICAgIHZvaWQgc2hyaW5rKHNpemVfdCk7CiAKLSAgICB2b2lk IGNsZWFyKCkgeyBzaHJpbmsoMHVsKTsgfQorICAgIHZvaWQgY2xlYXIoKSB7IHNocmluaygwdSk7 IH0KICAgICBib29sIGlzRW1wdHkoKSB7IHJldHVybiAhbV9zaXplOyB9CiAKIHByaXZhdGU6CmRp ZmYgLS1naXQgYS9Tb3VyY2UvYm1hbGxvYy9ibWFsbG9jL1NpemVzLmggYi9Tb3VyY2UvYm1hbGxv Yy9ibWFsbG9jL1NpemVzLmgKaW5kZXggNTVkYjI4YWRmYjQ0N2NkZjQ2YzZlODI1NTY5YTllZjU1 NzYwNWU0Zi4uOWJjNTliMzI2NDE5NTM1ZThlZDQ4ODQxMzgyNWJjMDIwZDVkYjI1YSAxMDA2NDQK LS0tIGEvU291cmNlL2JtYWxsb2MvYm1hbGxvYy9TaXplcy5oCisrKyBiL1NvdXJjZS9ibWFsbG9j L2JtYWxsb2MvU2l6ZXMuaApAQCAtMTAwLDcgKzEwMCw3IEBAIG5hbWVzcGFjZSBTaXplcyB7CiAg ICAgaW5saW5lIHNpemVfdCBzaXplQ2xhc3Moc2l6ZV90IHNpemUpCiAgICAgewogICAgICAgICBz dGF0aWMgY29uc3Qgc2l6ZV90IHNpemVDbGFzc01hc2sgPSAobWVkaXVtTWF4IC8gYWxpZ25tZW50 KSAtIDE7Ci0gICAgICAgIHJldHVybiBtYXNrKChzaXplIC0gMXVsKSAvIGFsaWdubWVudCwgc2l6 ZUNsYXNzTWFzayk7CisgICAgICAgIHJldHVybiBtYXNrKChzaXplIC0gMSkgLyBhbGlnbm1lbnQs IHNpemVDbGFzc01hc2spOwogICAgIH0KIAogICAgIGlubGluZSBzaXplX3Qgb2JqZWN0U2l6ZShz aXplX3Qgc2l6ZUNsYXNzKQo= 246387 2015-02-11 06:13:10 -0800 2015-02-11 08:12:15 -0800 Patch bug-141472-20150211061310.patch text/plain 2602 ossy U3VidmVyc2lvbiBSZXZpc2lvbjogMTc5OTIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvYm1hbGxvYy9D aGFuZ2VMb2cgYi9Tb3VyY2UvYm1hbGxvYy9DaGFuZ2VMb2cKaW5kZXggMTljZjgyNDAwYTkxNWI5 OTYxZTJlMzc4MGM2ODlkZmNjOGVjOGQ2ZS4uMzRiNTI4MGU5MTY3NThhNTFmNjc3OWY2ODQ3MWUz Mzg1YTcyNmY1NiAxMDA2NDQKLS0tIGEvU291cmNlL2JtYWxsb2MvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9ibWFsbG9jL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE1LTAyLTExICBDc2Fi YSBPc3p0cm9nb27DoWMgIDxvc3N5QHdlYmtpdC5vcmc+CisKKyAgICAgICAgYm1hbGxvYyBidWls ZGZpeCBvbiAzMiBiaXQgTGludXggKHg4Ni9BUk0pCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDE0NzIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIGJtYWxsb2MvQWxnb3JpdGhtLmg6CisgICAgICAgIChi bWFsbG9jOjpyb3VuZFVwVG9NdWx0aXBsZU9mKToKKyAgICAgICAgKiBibWFsbG9jL0ZpeGVkVmVj dG9yLmg6CisgICAgICAgIChibWFsbG9jOjpGaXhlZFZlY3Rvcjo6Y2xlYXIpOgorICAgICAgICAq IGJtYWxsb2MvU2l6ZXMuaDoKKyAgICAgICAgKGJtYWxsb2M6OlNpemVzOjpzaXplQ2xhc3MpOgor CiAyMDE1LTAyLTExICBHeXV5b3VuZyBLaW0gIDxneXV5b3VuZy5raW1Ac2Ftc3VuZy5jb20+CiAK ICAgICAgICAgW0VGTF1bR1RLXSBVc2UgYm1hbGxvYyBpbnN0ZWFkIG9mIHRjbWFsbG9jCmRpZmYg LS1naXQgYS9Tb3VyY2UvYm1hbGxvYy9ibWFsbG9jL0FsZ29yaXRobS5oIGIvU291cmNlL2JtYWxs b2MvYm1hbGxvYy9BbGdvcml0aG0uaAppbmRleCBiMDcwMGRkNmIyZjAxZjVhYTAxYWZhYTEwZTQy ZDhhOWQ2MGU2YWViLi5kYjQwYjZmNjU0N2Q4NmUyNWY2MTFjYTMyMWM2ZWEyMmQ5ZmQyMDlhIDEw MDY0NAotLS0gYS9Tb3VyY2UvYm1hbGxvYy9ibWFsbG9jL0FsZ29yaXRobS5oCisrKyBiL1NvdXJj ZS9ibWFsbG9jL2JtYWxsb2MvQWxnb3JpdGhtLmgKQEAgLTcwLDcgKzcwLDcgQEAgaW5saW5lIGNv bnN0ZXhwciBib29sIGlzUG93ZXJPZlR3byhzaXplX3Qgc2l6ZSkKIHRlbXBsYXRlPHR5cGVuYW1l IFQ+IGlubGluZSBUIHJvdW5kVXBUb011bHRpcGxlT2Yoc2l6ZV90IGRpdmlzb3IsIFQgeCkKIHsK ICAgICBCQVNTRVJUKGlzUG93ZXJPZlR3byhkaXZpc29yKSk7Ci0gICAgcmV0dXJuIHJlaW50ZXJw cmV0X2Nhc3Q8VD4oKHJlaW50ZXJwcmV0X2Nhc3Q8dWludHB0cl90Pih4KSArIChkaXZpc29yIC0g MXVsKSkgJiB+KGRpdmlzb3IgLSAxdWwpKTsKKyAgICByZXR1cm4gcmVpbnRlcnByZXRfY2FzdDxU PigocmVpbnRlcnByZXRfY2FzdDx1aW50cHRyX3Q+KHgpICsgKGRpdmlzb3IgLSAxKSkgJiB+KGRp dmlzb3IgLSAxKSk7CiB9CiAKIHRlbXBsYXRlPHNpemVfdCBkaXZpc29yLCB0eXBlbmFtZSBUPiBp bmxpbmUgY29uc3RleHByIFQgcm91bmRVcFRvTXVsdGlwbGVPZihUIHgpCmRpZmYgLS1naXQgYS9T b3VyY2UvYm1hbGxvYy9ibWFsbG9jL0ZpeGVkVmVjdG9yLmggYi9Tb3VyY2UvYm1hbGxvYy9ibWFs bG9jL0ZpeGVkVmVjdG9yLmgKaW5kZXggZDQyZTE1MTY5ZTI5MWQwZTJlMTU5Y2ZmNGRjMWU2MThj MjVkZGFiMy4uNDUxMjA5MjYxZTQ0OTAxYWZmZjE1MDY2MDI4NGY3Y2FhMTMwMzhmOSAxMDA2NDQK LS0tIGEvU291cmNlL2JtYWxsb2MvYm1hbGxvYy9GaXhlZFZlY3Rvci5oCisrKyBiL1NvdXJjZS9i bWFsbG9jL2JtYWxsb2MvRml4ZWRWZWN0b3IuaApAQCAtNTksNyArNTksNyBAQCBwdWJsaWM6CiAg ICAgdm9pZCBzaHJpbmsoVCopOwogICAgIHZvaWQgc2hyaW5rKHNpemVfdCk7CiAKLSAgICB2b2lk IGNsZWFyKCkgeyBzaHJpbmsoMHVsKTsgfQorICAgIHZvaWQgY2xlYXIoKSB7IHNocmluayhzdGF0 aWNfY2FzdDxzaXplX3Q+KDApKTsgfQogICAgIGJvb2wgaXNFbXB0eSgpIHsgcmV0dXJuICFtX3Np emU7IH0KIAogcHJpdmF0ZToKZGlmZiAtLWdpdCBhL1NvdXJjZS9ibWFsbG9jL2JtYWxsb2MvU2l6 ZXMuaCBiL1NvdXJjZS9ibWFsbG9jL2JtYWxsb2MvU2l6ZXMuaAppbmRleCA1NWRiMjhhZGZiNDQ3 Y2RmNDZjNmU4MjU1NjlhOWVmNTU3NjA1ZTRmLi45YmM1OWIzMjY0MTk1MzVlOGVkNDg4NDEzODI1 YmMwMjBkNWRiMjVhIDEwMDY0NAotLS0gYS9Tb3VyY2UvYm1hbGxvYy9ibWFsbG9jL1NpemVzLmgK KysrIGIvU291cmNlL2JtYWxsb2MvYm1hbGxvYy9TaXplcy5oCkBAIC0xMDAsNyArMTAwLDcgQEAg bmFtZXNwYWNlIFNpemVzIHsKICAgICBpbmxpbmUgc2l6ZV90IHNpemVDbGFzcyhzaXplX3Qgc2l6 ZSkKICAgICB7CiAgICAgICAgIHN0YXRpYyBjb25zdCBzaXplX3Qgc2l6ZUNsYXNzTWFzayA9ICht ZWRpdW1NYXggLyBhbGlnbm1lbnQpIC0gMTsKLSAgICAgICAgcmV0dXJuIG1hc2soKHNpemUgLSAx dWwpIC8gYWxpZ25tZW50LCBzaXplQ2xhc3NNYXNrKTsKKyAgICAgICAgcmV0dXJuIG1hc2soKHNp emUgLSAxKSAvIGFsaWdubWVudCwgc2l6ZUNsYXNzTWFzayk7CiAgICAgfQogCiAgICAgaW5saW5l IHNpemVfdCBvYmplY3RTaXplKHNpemVfdCBzaXplQ2xhc3MpCg==