207410 2020-02-07 14:45:54 -0800 [bmalloc] VMHeap can be merge into Heap 2020-02-08 02:36:14 -0800 1 1 1 Unclassified WebKit bmalloc WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 basuke basuke annulen basuke commit-queue ews-watchlist ggaren gyuyoung.kim ryuan.choi sergio webkit-bug-importer ysuzuki oldest_to_newest 1616383 0 basuke 2020-02-07 14:45:54 -0800 I don't know about the history of VMHeap, but it has only one member function in it and Heap is the only client of that function. No member variable is defined. It does nothing special with its class. It is safe to merge the function into Heap. 1616400 1 390132 basuke 2020-02-07 15:14:07 -0800 Created attachment 390132 PATCH 1616550 2 390132 ysuzuki 2020-02-08 01:52:29 -0800 Comment on attachment 390132 PATCH r=me, I think VMHeap is no longer necessary too. 1616551 3 390132 commit-queue 2020-02-08 02:35:44 -0800 Comment on attachment 390132 PATCH Clearing flags on attachment: 390132 Committed r256088: <https://trac.webkit.org/changeset/256088> 1616552 4 commit-queue 2020-02-08 02:35:46 -0800 All reviewed patches have been landed. Closing bug. 1616553 5 webkit-bug-importer 2020-02-08 02:36:14 -0800 <rdar://problem/59285145> 390132 2020-02-07 15:14:07 -0800 2020-02-08 02:35:44 -0800 PATCH bug-207410.diff text/plain 14747 basuke ZGlmZiAtLWdpdCBhL1NvdXJjZS9ibWFsbG9jL0NNYWtlTGlzdHMudHh0IGIvU291cmNlL2JtYWxs b2MvQ01ha2VMaXN0cy50eHQKaW5kZXggMGFkZDBhYzA3ZmIuLjU1MjJhODQ0YzJhIDEwMDY0NAot LS0gYS9Tb3VyY2UvYm1hbGxvYy9DTWFrZUxpc3RzLnR4dAorKysgYi9Tb3VyY2UvYm1hbGxvYy9D TWFrZUxpc3RzLnR4dApAQCAtMzEsNyArMzEsNiBAQCBzZXQoYm1hbGxvY19TT1VSQ0VTCiAgICAg Ym1hbGxvYy9PYmplY3RUeXBlLmNwcAogICAgIGJtYWxsb2MvUGVyUHJvY2Vzcy5jcHAKICAgICBi bWFsbG9jL1NjYXZlbmdlci5jcHAKLSAgICBibWFsbG9jL1ZNSGVhcC5jcHAKICAgICBibWFsbG9j L2JtYWxsb2MuY3BwCiApCiAKQEAgLTEyNyw3ICsxMjYsNiBAQCBzZXQoYm1hbGxvY19QVUJMSUNf SEVBREVSUwogICAgIGJtYWxsb2MvU3RkTGliRXh0cmFzLmgKICAgICBibWFsbG9jL1N5c2NhbGwu aAogICAgIGJtYWxsb2MvVk1BbGxvY2F0ZS5oCi0gICAgYm1hbGxvYy9WTUhlYXAuaAogICAgIGJt YWxsb2MvVmVjdG9yLmgKICAgICBibWFsbG9jL1pvbmUuaAogICAgIGJtYWxsb2MvYm1hbGxvYy5o CmRpZmYgLS1naXQgYS9Tb3VyY2UvYm1hbGxvYy9DaGFuZ2VMb2cgYi9Tb3VyY2UvYm1hbGxvYy9D aGFuZ2VMb2cKaW5kZXggNjkwZmQ2YzZiMjAuLjc2ZTdkMzY1MTNhIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvYm1hbGxvYy9DaGFuZ2VMb2cKKysrIGIvU291cmNlL2JtYWxsb2MvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMjMgQEAKKzIwMjAtMDItMDcgIEJhc3VrZSBTdXp1a2kgIDxiYXN1a2Uuc3V6dWtpQHNv bnkuY29tPgorCisgICAgICAgIFtibWFsbG9jXSBWTUhlYXAgY2FuIGJlIG1lcmdlIGludG8gSGVh cAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA3NDEw CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVk1IZWFw IGhhcyBvbmx5IG9uZSBtZW1iZXIgZnVuY3Rpb24gaW4gaXQgYW5kIEhlYXAgaXMgdGhlIG9ubHkg Y2xpZW50IG9mIHRoYXQuCisgICAgICAgIE5vIG1lbWJlciB2YXJpYWJsZSBpcyBkZWZpbmVkLiBJ dCBkb2VzIG5vdGhpbmcgc3BlY2lhbCB3aXRoIGl0cyBjb250ZXh0IGFzIGEgY2xhc3MuCisgICAg ICAgIEl0IGlzIHNhZmUgdG8gbWVyZ2UgdGhlIGZ1bmN0aW9uIGludG8gSGVhcC4KKworICAgICAg ICAqIENNYWtlTGlzdHMudHh0OgorICAgICAgICAqIGJtYWxsb2MueGNvZGVwcm9qL3Byb2plY3Qu cGJ4cHJvajoKKyAgICAgICAgKiBibWFsbG9jL0hlYXAuY3BwOgorICAgICAgICAoYm1hbGxvYzo6 SGVhcDo6YWxsb2NhdGVMYXJnZSk6CisgICAgICAgIChibWFsbG9jOjpIZWFwOjp0cnlBbGxvY2F0 ZUxhcmdlQ2h1bmspOiBNb3ZlZCBmcm9tIFZNSGVhcC4KKyAgICAgICAgKiBibWFsbG9jL0hlYXAu aDoKKyAgICAgICAgKiBibWFsbG9jL1ZNSGVhcC5jcHA6IFJlbW92ZWQuCisgICAgICAgICogYm1h bGxvYy9WTUhlYXAuaDogUmVtb3ZlZC4KKwogMjAyMC0wMi0wNSAgRG9uIE9sbXN0ZWFkICA8ZG9u Lm9sbXN0ZWFkQHNvbnkuY29tPgogCiAgICAgICAgIFtibWFsbG9jXSBBZGQgZGVjbHNwZWMgc3Vw cG9ydCBmb3IgZXhwb3J0IG1hY3JvcwpkaWZmIC0tZ2l0IGEvU291cmNlL2JtYWxsb2MvYm1hbGxv Yy54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qIGIvU291cmNlL2JtYWxsb2MvYm1hbGxvYy54Y29k ZXByb2ovcHJvamVjdC5wYnhwcm9qCmluZGV4IDNiODVlNzdmZmI4Li5kZmIxMmRlOWI0YyAxMDA2 NDQKLS0tIGEvU291cmNlL2JtYWxsb2MvYm1hbGxvYy54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9q CisrKyBiL1NvdXJjZS9ibWFsbG9jL2JtYWxsb2MueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagpA QCAtNzgsNyArNzgsNiBAQAogCQkwRjdFQjg1QTFGOTU1QTExMDBGMUFCQ0IgLyogRGVmZXJyZWRE ZWNvbW1pdElubGluZXMuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmls ZVJlZiA9IDBGN0VCODU5MUY5NTVBMEYwMEYxQUJDQiAvKiBEZWZlcnJlZERlY29tbWl0SW5saW5l cy5oICovOyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0gKFByaXZhdGUsICk7IH07IH07CiAJCTBG RDU1NzMzMUY3RURCN0IwMEIxRjBBMyAvKiBIZWFwS2luZC5jcHAgaW4gU291cmNlcyAqLyA9IHtp c2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAwRkQ1NTczMjFGN0VEQjdCMDBCMUYwQTMgLyog SGVhcEtpbmQuY3BwICovOyB9OwogCQkxNDAwMjc0OTE4Rjg5QzEzMDAxMTVDOTcgLyogSGVhcC5o IGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMTREQTMyMEMx ODg3NUIwOTAwNzI2OUUwIC8qIEhlYXAuaCAqLzsgc2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9IChQ cml2YXRlLCApOyB9OyB9OwotCQkxNDAwMjc0QTE4Rjg5QzIzMDAxMTVDOTcgLyogVk1IZWFwLmgg aW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxNDRGN0JGQzE4 QkZDNTE3MDAzNTM3RjMgLyogVk1IZWFwLmggKi87IHNldHRpbmdzID0ge0FUVFJJQlVURVMgPSAo UHJpdmF0ZSwgKTsgfTsgfTsKIAkJMTQwRkEwMDMxOUNFNDI5QzAwRkZEM0M4IC8qIEJ1bXBSYW5n ZS5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMTQwRkEw MDIxOUNFNDI5QzAwRkZEM0M4IC8qIEJ1bXBSYW5nZS5oICovOyBzZXR0aW5ncyA9IHtBVFRSSUJV VEVTID0gKFByaXZhdGUsICk7IH07IH07CiAJCTE0MEZBMDA1MTlDRTRCNjgwMEZGRDNDOCAvKiBM aW5lTWV0YWRhdGEuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJl ZiA9IDE0MEZBMDA0MTlDRTRCNjgwMEZGRDNDOCAvKiBMaW5lTWV0YWRhdGEuaCAqLzsgc2V0dGlu Z3MgPSB7QVRUUklCVVRFUyA9IChQcml2YXRlLCApOyB9OyB9OwogCQkxNDFEOUIwMDFDOEU1MUMw MDAwQUJCQTAgLyogTGlzdC5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBm aWxlUmVmID0gMTQxRDlBRkYxQzhFNTFDMDAwMEFCQkEwIC8qIExpc3QuaCAqLzsgc2V0dGluZ3Mg PSB7QVRUUklCVVRFUyA9IChQcml2YXRlLCApOyB9OyB9OwpAQCAtMTI1LDcgKzEyNCw2IEBACiAJ CTE0RjI3MUM1MThFQTM5N0UwMDhDMTUyRiAvKiBEZWFsbG9jYXRvci5jcHAgaW4gU291cmNlcyAq LyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxNDVGNjg1OTE3OURDOTAyMDBENjU1 OTggLyogRGVhbGxvY2F0b3IuY3BwICovOyB9OwogCQkxNEYyNzFDNzE4RUEzOTkwMDA4QzE1MkYg LyogSGVhcC5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYg PSAxNERBMzIwRTE4ODc1RDlGMDA3MjY5RTAgLyogSGVhcC5jcHAgKi87IH07CiAJCTE0RjI3MUM4 MThFQTM5OTAwMDhDMTUyRiAvKiBPYmplY3RUeXBlLmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9 IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDE0MTA1RTgzMThFMTQzNzQwMDNBMTA2RSAvKiBPYmpl Y3RUeXBlLmNwcCAqLzsgfTsKLQkJMTRGMjcxQzkxOEVBMzk5MDAwOEMxNTJGIC8qIFZNSGVhcC5j cHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxNDRGN0JG QjE4QkZDNTE3MDAzNTM3RjMgLyogVk1IZWFwLmNwcCAqLzsgfTsKIAkJNDQyNkUyODAxQzgzOEVF MDAwOEVCMDQyIC8qIExvZ2dpbmcuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRG aWxlOyBmaWxlUmVmID0gNDQyNkUyN0UxQzgzOEVFMDAwOEVCMDQyIC8qIExvZ2dpbmcuY3BwICov OyB9OwogCQk0NDI2RTI4MTFDODM4RUUwMDA4RUIwNDIgLyogTG9nZ2luZy5oIGluIEhlYWRlcnMg Ki8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gNDQyNkUyN0YxQzgzOEVFMDAwOEVC MDQyIC8qIExvZ2dpbmcuaCAqLzsgc2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9IChQcml2YXRlLCAp OyB9OyB9OwogCQk0NDI2RTI4MzFDODM5NTQ3MDA4RUIwNDIgLyogQlNvZnRMaW5raW5nLmggaW4g SGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA0NDI2RTI4MjFDODM5 NTQ3MDA4RUIwNDIgLyogQlNvZnRMaW5raW5nLmggKi87IH07CkBAIC0yNTMsOCArMjUxLDYgQEAK IAkJMTQ0QkUxMUUxQ0EzNDY1MjAwOTlDOEMwIC8qIE9iamVjdC5oICovID0ge2lzYSA9IFBCWEZp bGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNl Y29kZS5jLmg7IG5hbWUgPSBPYmplY3QuaDsgcGF0aCA9IGJtYWxsb2MvT2JqZWN0Lmg7IHNvdXJj ZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTE0NEMwN0YyMUM3QjcwMjYwMDUxQkI2QSAvKiBMYXJn ZU1hcC5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsg bGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IG5hbWUgPSBMYXJnZU1hcC5j cHA7IHBhdGggPSBibWFsbG9jL0xhcmdlTWFwLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+Ijsg fTsKIAkJMTQ0QzA3RjMxQzdCNzAyNjAwNTFCQjZBIC8qIExhcmdlTWFwLmggKi8gPSB7aXNhID0g UEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBz b3VyY2Vjb2RlLmMuaDsgbmFtZSA9IExhcmdlTWFwLmg7IHBhdGggPSBibWFsbG9jL0xhcmdlTWFw Lmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07Ci0JCTE0NEY3QkZCMThCRkM1MTcwMDM1MzdG MyAvKiBWTUhlYXAuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGlu ZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBuYW1lID0gVk1I ZWFwLmNwcDsgcGF0aCA9IGJtYWxsb2MvVk1IZWFwLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+ IjsgfTsKLQkJMTQ0RjdCRkMxOEJGQzUxNzAwMzUzN0YzIC8qIFZNSGVhcC5oICovID0ge2lzYSA9 IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0g c291cmNlY29kZS5jLmg7IG5hbWUgPSBWTUhlYXAuaDsgcGF0aCA9IGJtYWxsb2MvVk1IZWFwLmg7 IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTE0NTI0Nzg2MThCQzc1N0MwMEY4MDA5OCAv KiBTbWFsbExpbmUuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2Rpbmcg PSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBuYW1lID0gU21hbGxMaW5l Lmg7IHBhdGggPSBibWFsbG9jL1NtYWxsTGluZS5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9 OwogCQkxNDVGNjg1NTE3OURDOENBMDBENjU1OTggLyogQWxsb2NhdG9yLmNwcCAqLyA9IHtpc2Eg PSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9 IHNvdXJjZWNvZGUuY3BwLmNwcDsgbGluZUVuZGluZyA9IDA7IG5hbWUgPSBBbGxvY2F0b3IuY3Bw OyBwYXRoID0gYm1hbGxvYy9BbGxvY2F0b3IuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB4 Y0xhbmd1YWdlU3BlY2lmaWNhdGlvbklkZW50aWZpZXIgPSB4Y29kZS5sYW5nLmNwcDsgfTsKIAkJ MTQ1RjY4NTYxNzlEQzhDQTAwRDY1NTk4IC8qIEFsbG9jYXRvci5oICovID0ge2lzYSA9IFBCWEZp bGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNl Y29kZS5jLmg7IGxpbmVFbmRpbmcgPSAwOyBuYW1lID0gQWxsb2NhdG9yLmg7IHBhdGggPSBibWFs bG9jL0FsbG9jYXRvci5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB4Y0xhbmd1YWdlU3BlY2lm aWNhdGlvbklkZW50aWZpZXIgPSB4Y29kZS5sYW5nLm9iamNwcDsgfTsKQEAgLTUwMCw4ICs0OTYs NiBAQAogCQkJCTBGNUJGMTUwMUYyMkUxNTcwMDI5RDkxRCAvKiBTY2F2ZW5nZXIuY3BwICovLAog CQkJCTBGNUJGMTUxMUYyMkUxNTcwMDI5RDkxRCAvKiBTY2F2ZW5nZXIuaCAqLywKIAkJCQkxNDVG Njg3NDE3OURGODQxMDBENjU1OTggLyogU2l6ZXMuaCAqLywKLQkJCQkxNDRGN0JGQjE4QkZDNTE3 MDAzNTM3RjMgLyogVk1IZWFwLmNwcCAqLywKLQkJCQkxNDRGN0JGQzE4QkZDNTE3MDAzNTM3RjMg LyogVk1IZWFwLmggKi8sCiAJCQkJMTQ0MEFGQ0MxQTk1MjdBRjAwODM3RkFBIC8qIFpvbmUuY3Bw ICovLAogCQkJCTE0NDBBRkNBMUE5NTI2MTEwMDgzN0ZBQSAvKiBab25lLmggKi8sCiAJCQkpOwpA QCAtNjY4LDcgKzY2Miw2IEBACiAJCQkJMTRERDc4Q0UxOEY0OEQ3NTAwOTUwNzAyIC8qIFN5c2Nh bGwuaCBpbiBIZWFkZXJzICovLAogCQkJCTE0REQ3OENGMThGNDhENzUwMDk1MDcwMiAvKiBWZWN0 b3IuaCBpbiBIZWFkZXJzICovLAogCQkJCTE0REQ3OEQwMThGNDhENzUwMDk1MDcwMiAvKiBWTUFs bG9jYXRlLmggaW4gSGVhZGVycyAqLywKLQkJCQkxNDAwMjc0QTE4Rjg5QzIzMDAxMTVDOTcgLyog Vk1IZWFwLmggaW4gSGVhZGVycyAqLywKIAkJCQkxNDQwQUZDQjFBOTUyNjExMDA4MzdGQUEgLyog Wm9uZS5oIGluIEhlYWRlcnMgKi8sCiAJCQkpOwogCQkJcnVuT25seUZvckRlcGxveW1lbnRQb3N0 cHJvY2Vzc2luZyA9IDA7CkBAIC03ODYsNyArNzc5LDYgQEAKIAkJCQkwRjI2QTdBNTIwNTQ4MzEz MDA5MEExNDEgLyogUGVyUHJvY2Vzcy5jcHAgaW4gU291cmNlcyAqLywKIAkJCQlBRDE0QUQyQTIw MjUyOUM3MDA4OTBFM0IgLyogUHJvY2Vzc0NoZWNrLm1tIGluIFNvdXJjZXMgKi8sCiAJCQkJMEY1 QkYxNTIxRjIyRTE1NzAwMjlEOTFEIC8qIFNjYXZlbmdlci5jcHAgaW4gU291cmNlcyAqLywKLQkJ CQkxNEYyNzFDOTE4RUEzOTkwMDA4QzE1MkYgLyogVk1IZWFwLmNwcCBpbiBTb3VyY2VzICovLAog CQkJCTE0NDBBRkNEMUE5NTI3QUYwMDgzN0ZBQSAvKiBab25lLmNwcCBpbiBTb3VyY2VzICovLAog CQkJKTsKIAkJCXJ1bk9ubHlGb3JEZXBsb3ltZW50UG9zdHByb2Nlc3NpbmcgPSAwOwpkaWZmIC0t Z2l0IGEvU291cmNlL2JtYWxsb2MvYm1hbGxvYy9IZWFwLmNwcCBiL1NvdXJjZS9ibWFsbG9jL2Jt YWxsb2MvSGVhcC5jcHAKaW5kZXggNmQ3MTRmMGI3ZjIuLmYyYTNlOWExMmZlIDEwMDY0NAotLS0g YS9Tb3VyY2UvYm1hbGxvYy9ibWFsbG9jL0hlYXAuY3BwCisrKyBiL1NvdXJjZS9ibWFsbG9jL2Jt YWxsb2MvSGVhcC5jcHAKQEAgLTM4LDExICszOCwxNCBAQAogI2luY2x1ZGUgIlNjYXZlbmdlci5o IgogI2luY2x1ZGUgIlNtYWxsTGluZS5oIgogI2luY2x1ZGUgIlNtYWxsUGFnZS5oIgotI2luY2x1 ZGUgIlZNSGVhcC5oIgogI2luY2x1ZGUgImJtYWxsb2MuaCIKICNpbmNsdWRlIDx0aHJlYWQ+CiAj aW5jbHVkZSA8dmVjdG9yPgogCisjaWYgQk9TKERBUldJTikKKyNpbmNsdWRlICJab25lLmgiCisj ZW5kaWYKKwogbmFtZXNwYWNlIGJtYWxsb2MgewogCiBIZWFwOjpIZWFwKEhlYXBLaW5kIGtpbmQs IExvY2tIb2xkZXImKQpAQCAtNTc0LDcgKzU3Nyw3IEBAIHZvaWQqIEhlYXA6OmFsbG9jYXRlTGFy Z2UoVW5pcXVlTG9ja0hvbGRlciYgbG9jaywgc2l6ZV90IGFsaWdubWVudCwgc2l6ZV90IHNpemUs CiAKICAgICAgICAgQVNTRVJUX09SX1JFVFVSTl9PTl9GQUlMVVJFKCF1c2luZ0dpZ2FjYWdlKCkp OwogCi0gICAgICAgIHJhbmdlID0gVk1IZWFwOjpnZXQoKS0+dHJ5QWxsb2NhdGVMYXJnZUNodW5r KGFsaWdubWVudCwgc2l6ZSk7CisgICAgICAgIHJhbmdlID0gdHJ5QWxsb2NhdGVMYXJnZUNodW5r KGFsaWdubWVudCwgc2l6ZSk7CiAgICAgICAgIEFTU0VSVF9PUl9SRVRVUk5fT05fRkFJTFVSRShy YW5nZSk7CiAgICAgICAgIAogICAgICAgICBtX2xhcmdlRnJlZS5hZGQocmFuZ2UpOwpAQCAtNTkz LDYgKzU5NiwzMSBAQCB2b2lkKiBIZWFwOjphbGxvY2F0ZUxhcmdlKFVuaXF1ZUxvY2tIb2xkZXIm IGxvY2ssIHNpemVfdCBhbGlnbm1lbnQsIHNpemVfdCBzaXplLAogI3VuZGVmIEFTU0VSVF9PUl9S RVRVUk5fT05fRkFJTFVSRQogfQogCitMYXJnZVJhbmdlIEhlYXA6OnRyeUFsbG9jYXRlTGFyZ2VD aHVuayhzaXplX3QgYWxpZ25tZW50LCBzaXplX3Qgc2l6ZSkKK3sKKyAgICAvLyBXZSBhbGxvY2F0 ZSBWTSBpbiBhbGlnbmVkIG11bHRpcGxlcyB0byBpbmNyZWFzZSB0aGUgY2hhbmNlcyB0aGF0Cisg ICAgLy8gdGhlIE9TIHdpbGwgcHJvdmlkZSBjb250aWd1b3VzIHJhbmdlcyB0aGF0IHdlIGNhbiBt ZXJnZS4KKyAgICBzaXplX3Qgcm91bmRlZEFsaWdubWVudCA9IHJvdW5kVXBUb011bHRpcGxlT2Y8 Y2h1bmtTaXplPihhbGlnbm1lbnQpOworICAgIGlmIChyb3VuZGVkQWxpZ25tZW50IDwgYWxpZ25t ZW50KSAvLyBDaGVjayBmb3Igb3ZlcmZsb3cKKyAgICAgICAgcmV0dXJuIExhcmdlUmFuZ2UoKTsK KyAgICBhbGlnbm1lbnQgPSByb3VuZGVkQWxpZ25tZW50OworCisgICAgc2l6ZV90IHJvdW5kZWRT aXplID0gcm91bmRVcFRvTXVsdGlwbGVPZjxjaHVua1NpemU+KHNpemUpOworICAgIGlmIChyb3Vu ZGVkU2l6ZSA8IHNpemUpIC8vIENoZWNrIGZvciBvdmVyZmxvdworICAgICAgICByZXR1cm4gTGFy Z2VSYW5nZSgpOworICAgIHNpemUgPSByb3VuZGVkU2l6ZTsKKworICAgIHZvaWQqIG1lbW9yeSA9 IHRyeVZNQWxsb2NhdGUoYWxpZ25tZW50LCBzaXplKTsKKyAgICBpZiAoIW1lbW9yeSkKKyAgICAg ICAgcmV0dXJuIExhcmdlUmFuZ2UoKTsKKyAgICAKKyNpZiBCT1MoREFSV0lOKQorICAgIFBlclBy b2Nlc3M8Wm9uZT46OmdldCgpLT5hZGRSYW5nZShSYW5nZShtZW1vcnksIHNpemUpKTsKKyNlbmRp ZgorCisgICAgcmV0dXJuIExhcmdlUmFuZ2UobWVtb3J5LCBzaXplLCAwLCAwKTsKK30KKwogYm9v bCBIZWFwOjppc0xhcmdlKFVuaXF1ZUxvY2tIb2xkZXImLCB2b2lkKiBvYmplY3QpCiB7CiAgICAg cmV0dXJuIG1fb2JqZWN0VHlwZXMuZ2V0KE9iamVjdChvYmplY3QpLmNodW5rKCkpID09IE9iamVj dFR5cGU6OkxhcmdlOwpkaWZmIC0tZ2l0IGEvU291cmNlL2JtYWxsb2MvYm1hbGxvYy9IZWFwLmgg Yi9Tb3VyY2UvYm1hbGxvYy9ibWFsbG9jL0hlYXAuaAppbmRleCAyNmQ3NzQzZTI4Ni4uYTI5YTNk MjBhNmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9ibWFsbG9jL2JtYWxsb2MvSGVhcC5oCisrKyBiL1Nv dXJjZS9ibWFsbG9jL2JtYWxsb2MvSGVhcC5oCkBAIC00NywxMSArNDcsOSBAQAogCiBuYW1lc3Bh Y2UgYm1hbGxvYyB7CiAKLWNsYXNzIEJlZ2luVGFnOwogY2xhc3MgQnVsa0RlY29tbWl0OwogY2xh c3MgQnVtcEFsbG9jYXRvcjsKIGNsYXNzIERlYnVnSGVhcDsKLWNsYXNzIEVuZFRhZzsKIGNsYXNz IEhlYXBDb25zdGFudHM7CiBjbGFzcyBTY2F2ZW5nZXI7CiAKQEAgLTEyMSwxMCArMTE5LDcgQEAg cHJpdmF0ZToKICAgICB2b2lkIGFsbG9jYXRlU21hbGxDaHVuayhVbmlxdWVMb2NrSG9sZGVyJiwg c2l6ZV90IHBhZ2VDbGFzcywgRmFpbHVyZUFjdGlvbik7CiAgICAgdm9pZCBkZWFsbG9jYXRlU21h bGxDaHVuayhDaHVuayosIHNpemVfdCBwYWdlQ2xhc3MpOwogCi0gICAgdm9pZCBtZXJnZUxhcmdl KEJlZ2luVGFnKiYsIEVuZFRhZyomLCBSYW5nZSYpOwotICAgIHZvaWQgbWVyZ2VMYXJnZUxlZnQo RW5kVGFnKiYsIEJlZ2luVGFnKiYsIFJhbmdlJiwgYm9vbCYgaW5WTUhlYXApOwotICAgIHZvaWQg bWVyZ2VMYXJnZVJpZ2h0KEVuZFRhZyomLCBCZWdpblRhZyomLCBSYW5nZSYsIGJvb2wmIGluVk1I ZWFwKTsKLQorICAgIExhcmdlUmFuZ2UgdHJ5QWxsb2NhdGVMYXJnZUNodW5rKHNpemVfdCBhbGln bm1lbnQsIHNpemVfdCk7CiAgICAgTGFyZ2VSYW5nZSBzcGxpdEFuZEFsbG9jYXRlKFVuaXF1ZUxv Y2tIb2xkZXImLCBMYXJnZVJhbmdlJiwgc2l6ZV90IGFsaWdubWVudCwgc2l6ZV90KTsKIAogICAg IEhlYXBLaW5kIG1fa2luZDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9ibWFsbG9jL2JtYWxsb2MvVk1I ZWFwLmNwcCBiL1NvdXJjZS9ibWFsbG9jL2JtYWxsb2MvVk1IZWFwLmNwcApkZWxldGVkIGZpbGUg bW9kZSAxMDA2NDQKaW5kZXggZGY2MDVmZjQ2NmIuLjAwMDAwMDAwMDAwCi0tLSBhL1NvdXJjZS9i bWFsbG9jL2JtYWxsb2MvVk1IZWFwLmNwcAorKysgL2Rldi9udWxsCkBAIC0xLDY1ICswLDAgQEAK LS8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMTQtMjAxNyBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVz ZXJ2ZWQuCi0gKgotICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFy eSBmb3Jtcywgd2l0aCBvciB3aXRob3V0Ci0gKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQg cHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKLSAqIGFyZSBtZXQ6Ci0gKiAx LiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNv cHlyaWdodAotICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZv bGxvd2luZyBkaXNjbGFpbWVyLgotICogMi4gUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3Jt IG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKLSAqICAgIG5vdGljZSwgdGhpcyBs aXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKLSAq ICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRo ZSBkaXN0cmlidXRpb24uCi0gKgotICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBBUFBM RSBJTkMuIGBgQVMgSVMnJyBBTkQgQU5ZCi0gKiBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElF UywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFRIRQotICogSU1QTElFRCBXQVJSQU5U SUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSCi0gKiBQ VVJQT1NFIEFSRSBESVNDTEFJTUVELiAgSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBPUgot ICogQ09OVFJJQlVUT1JTIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lE RU5UQUwsIFNQRUNJQUwsCi0gKiBFWEVNUExBUlksIE9SIENPTlNFUVVFTlRJQUwgREFNQUdFUyAo SU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sCi0gKiBQUk9DVVJFTUVOVCBPRiBTVUJTVElU VVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwgREFUQSwgT1IKLSAqIFBST0ZJVFM7 IE9SIEJVU0lORVNTIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBUSEVP UlkKLSAqIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElU WSwgT1IgVE9SVAotICogKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lO RyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFCi0gKiBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElG IEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLiAKLSAqLwotCi0jaW5j bHVkZSAiUGVyUHJvY2Vzcy5oIgotI2luY2x1ZGUgIlZNSGVhcC5oIgotI2luY2x1ZGUgPHRocmVh ZD4KLQotbmFtZXNwYWNlIGJtYWxsb2MgewotCi1ERUZJTkVfU1RBVElDX1BFUl9QUk9DRVNTX1NU T1JBR0UoVk1IZWFwKTsKLQotVk1IZWFwOjpWTUhlYXAoY29uc3QgTG9ja0hvbGRlciYpCi17Ci19 Ci0KLUxhcmdlUmFuZ2UgVk1IZWFwOjp0cnlBbGxvY2F0ZUxhcmdlQ2h1bmsoc2l6ZV90IGFsaWdu bWVudCwgc2l6ZV90IHNpemUpCi17Ci0gICAgLy8gV2UgYWxsb2NhdGUgVk0gaW4gYWxpZ25lZCBt dWx0aXBsZXMgdG8gaW5jcmVhc2UgdGhlIGNoYW5jZXMgdGhhdAotICAgIC8vIHRoZSBPUyB3aWxs IHByb3ZpZGUgY29udGlndW91cyByYW5nZXMgdGhhdCB3ZSBjYW4gbWVyZ2UuCi0gICAgc2l6ZV90 IHJvdW5kZWRBbGlnbm1lbnQgPSByb3VuZFVwVG9NdWx0aXBsZU9mPGNodW5rU2l6ZT4oYWxpZ25t ZW50KTsKLSAgICBpZiAocm91bmRlZEFsaWdubWVudCA8IGFsaWdubWVudCkgLy8gQ2hlY2sgZm9y IG92ZXJmbG93Ci0gICAgICAgIHJldHVybiBMYXJnZVJhbmdlKCk7Ci0gICAgYWxpZ25tZW50ID0g cm91bmRlZEFsaWdubWVudDsKLQotICAgIHNpemVfdCByb3VuZGVkU2l6ZSA9IHJvdW5kVXBUb011 bHRpcGxlT2Y8Y2h1bmtTaXplPihzaXplKTsKLSAgICBpZiAocm91bmRlZFNpemUgPCBzaXplKSAv LyBDaGVjayBmb3Igb3ZlcmZsb3cKLSAgICAgICAgcmV0dXJuIExhcmdlUmFuZ2UoKTsKLSAgICBz aXplID0gcm91bmRlZFNpemU7Ci0KLSAgICB2b2lkKiBtZW1vcnkgPSB0cnlWTUFsbG9jYXRlKGFs aWdubWVudCwgc2l6ZSk7Ci0gICAgaWYgKCFtZW1vcnkpCi0gICAgICAgIHJldHVybiBMYXJnZVJh bmdlKCk7Ci0gICAgCi0gICAgQ2h1bmsqIGNodW5rID0gc3RhdGljX2Nhc3Q8Q2h1bmsqPihtZW1v cnkpOwotICAgIAotI2lmIEJPUyhEQVJXSU4pCi0gICAgUGVyUHJvY2Vzczxab25lPjo6Z2V0KCkt PmFkZFJhbmdlKFJhbmdlKGNodW5rLT5ieXRlcygpLCBzaXplKSk7Ci0jZW5kaWYKLQotICAgIHJl dHVybiBMYXJnZVJhbmdlKGNodW5rLT5ieXRlcygpLCBzaXplLCAwLCAwKTsKLX0KLQotfSAvLyBu YW1lc3BhY2UgYm1hbGxvYwpkaWZmIC0tZ2l0IGEvU291cmNlL2JtYWxsb2MvYm1hbGxvYy9WTUhl YXAuaCBiL1NvdXJjZS9ibWFsbG9jL2JtYWxsb2MvVk1IZWFwLmgKZGVsZXRlZCBmaWxlIG1vZGUg MTAwNjQ0CmluZGV4IDExZjEwZTM5ZDI0Li4wMDAwMDAwMDAwMAotLS0gYS9Tb3VyY2UvYm1hbGxv Yy9ibWFsbG9jL1ZNSGVhcC5oCisrKyAvZGV2L251bGwKQEAgLTEsNTggKzAsMCBAQAotLyoKLSAq IENvcHlyaWdodCAoQykgMjAxNC0yMDE3IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4K LSAqCi0gKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1z LCB3aXRoIG9yIHdpdGhvdXQKLSAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRl ZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwotICogYXJlIG1ldDoKLSAqIDEuIFJlZGlz dHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0 Ci0gKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5n IGRpc2NsYWltZXIuCi0gKiAyLiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCBy ZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAotICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2Yg Y29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQotICogICAgZG9j dW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3Ry aWJ1dGlvbi4KLSAqCi0gKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIElOQy4g YGBBUyBJUycnIEFORCBBTlkKLSAqIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNM VURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgVEhFCi0gKiBJTVBMSUVEIFdBUlJBTlRJRVMgT0Yg TUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIKLSAqIFBVUlBPU0Ug QVJFIERJU0NMQUlNRUQuICBJTiBOTyBFVkVOVCBTSEFMTCBBUFBMRSBJTkMuIE9SCi0gKiBDT05U UklCVVRPUlMgQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwg U1BFQ0lBTCwKLSAqIEVYRU1QTEFSWSwgT1IgQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJ TkcsIEJVVCBOT1QgTElNSVRFRCBUTywKLSAqIFBST0NVUkVNRU5UIE9GIFNVQlNUSVRVVEUgR09P RFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUgotICogUFJPRklUUzsgT1IgQlVT SU5FU1MgSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZIFRIRU9SWQotICog T0YgTElBQklMSVRZLCBXSEVUSEVSIElOIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBU T1JUCi0gKiAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElOIEFO WSBXQVkgT1VUIE9GIFRIRSBVU0UKLSAqIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNF RCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuIAotICovCi0KLSNpZm5kZWYgVk1I ZWFwX2gKLSNkZWZpbmUgVk1IZWFwX2gKLQotI2luY2x1ZGUgIkNodW5rLmgiCi0jaW5jbHVkZSAi Rml4ZWRWZWN0b3IuaCIKLSNpbmNsdWRlICJIZWFwS2luZC5oIgotI2luY2x1ZGUgIkxhcmdlUmFu Z2UuaCIKLSNpbmNsdWRlICJNYXAuaCIKLSNpbmNsdWRlICJTdGF0aWNQZXJQcm9jZXNzLmgiCi0j aW5jbHVkZSAiVmVjdG9yLmgiCi0jaWYgQk9TKERBUldJTikKLSNpbmNsdWRlICJab25lLmgiCi0j ZW5kaWYKLQotbmFtZXNwYWNlIGJtYWxsb2MgewotCi1jbGFzcyBCZWdpblRhZzsKLWNsYXNzIEVu ZFRhZzsKLWNsYXNzIEhlYXA7Ci0KLXR5cGVkZWYgZW51bSB7IFN5bmMsIEFzeW5jIH0gU2NhdmVu Z2VNb2RlOwotCi1jbGFzcyBWTUhlYXAgOiBwdWJsaWMgU3RhdGljUGVyUHJvY2VzczxWTUhlYXA+ IHsKLXB1YmxpYzoKLSAgICBWTUhlYXAoY29uc3QgTG9ja0hvbGRlciYpOwotICAgIAotICAgIExh cmdlUmFuZ2UgdHJ5QWxsb2NhdGVMYXJnZUNodW5rKHNpemVfdCBhbGlnbm1lbnQsIHNpemVfdCk7 Ci19OwotREVDTEFSRV9TVEFUSUNfUEVSX1BST0NFU1NfU1RPUkFHRShWTUhlYXApOwotCi19IC8v IG5hbWVzcGFjZSBibWFsbG9jCi0KLSNlbmRpZiAvLyBWTUhlYXBfaAo=