219316 2020-11-27 11:28:10 -0800 Fix build when ENABLE_RESOURCE_LOAD_STATISTICS is disabled 2020-11-27 12:38:16 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 don.olmstead don.olmstead webkit-bug-importer oldest_to_newest 1710355 0 don.olmstead 2020-11-27 11:28:10 -0800 ... 1710359 1 414962 don.olmstead 2020-11-27 11:38:15 -0800 Created attachment 414962 Patch 1710371 2 ews-feeder 2020-11-27 12:37:18 -0800 Committed r270205: <https://trac.webkit.org/changeset/270205> All reviewed patches have been landed. Closing bug and clearing flags on attachment 414962. 1710372 3 webkit-bug-importer 2020-11-27 12:38:16 -0800 <rdar://problem/71767576> 414962 2020-11-27 11:38:15 -0800 2020-11-27 12:37:18 -0800 Patch bug-219316.diff text/plain 9650 don.olmstead ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggZGM4YjNkZTQ5NWI3Li4zYjFjMmU1MGY3OGYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMzYgQEAKKzIwMjAtMTEtMjcgIERvbiBPbG1zdGVhZCAgPGRvbi5vbG1zdGVhZEBzb255LmNv bT4KKworICAgICAgICBGaXggYnVpbGQgd2hlbiBFTkFCTEVfUkVTT1VSQ0VfTE9BRF9TVEFUSVNU SUNTIGlzIGRpc2FibGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMTkzMTYKKworICAgICAgICBVbnJldmlld2VkIGJ1aWxkIGZpeC4KKworICAgICAg ICBBZGQgRU5BQkxFKFJFU09VUkNFX0xPQURfU1RBVElTVElDUykgZ3VhcmRzIGFyb3VuZCBOZXR3 b3JrU2Vzc2lvbiByZXF1ZXN0cyBmb3IKKyAgICAgICAgcmVzb3VyY2UgbG9hZCBzdGF0aXN0aWNz LiBNb3ZlIGZpcmVQcml2YXRlQ2xpY2tNZWFzdXJlbWVudFRpbWVySW1tZWRpYXRlbHkgb3V0IG9m CisgICAgICAgIGEgRU5BQkxFKFJFU09VUkNFX0xPQURfU1RBVElTVElDUykgZ3VhcmQgYW5kIHBs YWNlIGl0IHdoZXJlIGl0cyBvcmRlcmVkIGluIHRoZSBoZWFkZXIuCisKKyAgICAgICAgVGhpcyBv cmlnaW5hbGx5IGJyb2tlIHRoZSBQbGF5U3RhdGlvbiBidWlsZCBiZWZvcmUgRU5BQkxFX1JFU09V UkNFX0xPQURfU1RBVElTVElDUworICAgICAgICB3YXMgdHVybmVkIG9uLgorCisgICAgICAgIE5v IG5ldyB0ZXN0cy4gTm8gY2hhbmdlIGluIGJlaGF2aW9yLgorCisgICAgICAgICogTmV0d29ya1By b2Nlc3MvTmV0d29ya1Byb2Nlc3MuY3BwOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrUHJvY2Vz czo6c2ltdWxhdGVSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU2Vzc2lvblJlc3RhcnQpOgorICAgICAg ICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtTZXNzaW9uLmNwcDoKKyAgICAgICAgKFdlYktpdDo6 TmV0d29ya1Nlc3Npb246OmZpcmVQcml2YXRlQ2xpY2tNZWFzdXJlbWVudFRpbWVySW1tZWRpYXRl bHkpOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL1ByaXZhdGVDbGlja01lYXN1cmVtZW50TWFu YWdlci5jcHA6CisgICAgICAgIChXZWJLaXQ6OlByaXZhdGVDbGlja01lYXN1cmVtZW50TWFuYWdl cjo6c3RvcmVVbmF0dHJpYnV0ZWQpOgorICAgICAgICAoV2ViS2l0OjpQcml2YXRlQ2xpY2tNZWFz dXJlbWVudE1hbmFnZXI6OmF0dHJpYnV0ZSk6CisgICAgICAgIChXZWJLaXQ6OlByaXZhdGVDbGlj a01lYXN1cmVtZW50TWFuYWdlcjo6Y2xlYXJTZW50QXR0cmlidXRpb25zKToKKyAgICAgICAgKFdl YktpdDo6UHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRNYW5hZ2VyOjp1cGRhdGVUaW1lckxhc3RGaXJl ZCk6CisgICAgICAgIChXZWJLaXQ6OlByaXZhdGVDbGlja01lYXN1cmVtZW50TWFuYWdlcjo6Zmly ZVBlbmRpbmdBdHRyaWJ1dGlvblJlcXVlc3RzKToKKyAgICAgICAgKFdlYktpdDo6UHJpdmF0ZUNs aWNrTWVhc3VyZW1lbnRNYW5hZ2VyOjpjbGVhcik6CisgICAgICAgIChXZWJLaXQ6OlByaXZhdGVD bGlja01lYXN1cmVtZW50TWFuYWdlcjo6Y2xlYXJGb3JSZWdpc3RyYWJsZURvbWFpbik6CisgICAg ICAgIChXZWJLaXQ6OlByaXZhdGVDbGlja01lYXN1cmVtZW50TWFuYWdlcjo6Y2xlYXJFeHBpcmVk KToKKyAgICAgICAgKFdlYktpdDo6UHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRNYW5hZ2VyOjp0b1N0 cmluZyBjb25zdCk6CisgICAgICAgIChXZWJLaXQ6OlByaXZhdGVDbGlja01lYXN1cmVtZW50TWFu YWdlcjo6bWFya0FsbFVuYXR0cmlidXRlZEFzRXhwaXJlZEZvclRlc3RpbmcpOgorICAgICAgICAo V2ViS2l0OjpQcml2YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFnZXI6Om1hcmtBdHRyaWJ1dGVkUHJp dmF0ZUNsaWNrTWVhc3VyZW1lbnRzQXNFeHBpcmVkRm9yVGVzdGluZyk6CisKIDIwMjAtMTEtMjcg IEFkcmlhbiBQZXJleiBkZSBDYXN0cm8gIDxhcGVyZXpAaWdhbGlhLmNvbT4KIAogICAgICAgICBO b24tdW5pZmllZCBidWlsZCBmaXhlcywgbGF0ZSBOb3ZlbWJlciAyMDIwIGVkaXRpb24KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MuY3BwIGIv U291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5jcHAKaW5kZXggMjkx YTUyNjVjM2EwLi5mNmEyMzlhMWY2OGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29y a1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1By b2Nlc3MvTmV0d29ya1Byb2Nlc3MuY3BwCkBAIC0yNTcwLDYgKzI1NzAsNyBAQCB2b2lkIE5ldHdv cmtQcm9jZXNzOjpmaXJlUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRUaW1lckltbWVkaWF0ZWx5KFBB TDo6U2Vzc2lvbklECiAKIHZvaWQgTmV0d29ya1Byb2Nlc3M6OnNpbXVsYXRlUmVzb3VyY2VMb2Fk U3RhdGlzdGljc1Nlc3Npb25SZXN0YXJ0KFBBTDo6U2Vzc2lvbklEIHNlc3Npb25JRCwgQ29tcGxl dGlvbkhhbmRsZXI8dm9pZCgpPiYmIGNvbXBsZXRpb25IYW5kbGVyKQogeworI2lmIEVOQUJMRShS RVNPVVJDRV9MT0FEX1NUQVRJU1RJQ1MpCiAgICAgaWYgKGF1dG8qIHNlc3Npb24gPSBuZXR3b3Jr U2Vzc2lvbihzZXNzaW9uSUQpKSB7CiAgICAgICAgIHNlc3Npb24tPnJlY3JlYXRlUmVzb3VyY2VM b2FkU3RhdGlzdGljU3RvcmUoW3RoaXMsIHNlc3Npb25JRCwgY29tcGxldGlvbkhhbmRsZXIgPSBX VEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKV0gKCkgbXV0YWJsZSB7CiAgICAgICAgICAgICBmaXJl UHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRUaW1lckltbWVkaWF0ZWx5KHNlc3Npb25JRCk7CkBAIC0y NTc3LDYgKzI1NzgsNyBAQCB2b2lkIE5ldHdvcmtQcm9jZXNzOjpzaW11bGF0ZVJlc291cmNlTG9h ZFN0YXRpc3RpY3NTZXNzaW9uUmVzdGFydChQQUw6OlNlc3Npb25JRAogICAgICAgICB9KTsKICAg ICAgICAgcmV0dXJuOwogICAgIH0KKyNlbmRpZgogICAgIGNvbXBsZXRpb25IYW5kbGVyKCk7CiB9 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Nlc3Np b24uY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrU2Vzc2lvbi5jcHAK aW5kZXggYmM1NTVlZjIwYjMyLi44NDQ0Nzc0MGIxMzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Nlc3Npb24uY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQv TmV0d29ya1Byb2Nlc3MvTmV0d29ya1Nlc3Npb24uY3BwCkBAIC0xODgsMTEgKzE4OCw2IEBAIHZv aWQgTmV0d29ya1Nlc3Npb246OnNldFJlc291cmNlTG9hZFN0YXRpc3RpY3NFbmFibGVkKGJvb2wg ZW5hYmxlKQogICAgIGZvcndhcmRSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU2V0dGluZ3MoKTsKIH0K IAotdm9pZCBOZXR3b3JrU2Vzc2lvbjo6ZmlyZVByaXZhdGVDbGlja01lYXN1cmVtZW50VGltZXJJ bW1lZGlhdGVseSgpCi17Ci0gICAgbV9wcml2YXRlQ2xpY2tNZWFzdXJlbWVudC0+c3RhcnRUaW1l cigwX3MpOwotfQotCiB2b2lkIE5ldHdvcmtTZXNzaW9uOjpyZWNyZWF0ZVJlc291cmNlTG9hZFN0 YXRpc3RpY1N0b3JlKENvbXBsZXRpb25IYW5kbGVyPHZvaWQoKT4mJiBjb21wbGV0aW9uSGFuZGxl cikKIHsKICAgICBkZXN0cm95UmVzb3VyY2VMb2FkU3RhdGlzdGljcyhbdGhpcywgd2Vha1RoaXMg PSBtYWtlV2Vha1B0cigqdGhpcyksIGNvbXBsZXRpb25IYW5kbGVyID0gV1RGTW92ZShjb21wbGV0 aW9uSGFuZGxlcildICgpIG11dGFibGUgewpAQCAtMzUzLDYgKzM0OCwxMSBAQCB2b2lkIE5ldHdv cmtTZXNzaW9uOjptYXJrUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRzQXNFeHBpcmVkRm9yVGVzdGlu ZygpCiAgICAgbV9wcml2YXRlQ2xpY2tNZWFzdXJlbWVudC0+bWFya0FsbFVuYXR0cmlidXRlZEFz RXhwaXJlZEZvclRlc3RpbmcoKTsKIH0KIAordm9pZCBOZXR3b3JrU2Vzc2lvbjo6ZmlyZVByaXZh dGVDbGlja01lYXN1cmVtZW50VGltZXJJbW1lZGlhdGVseSgpCit7CisgICAgbV9wcml2YXRlQ2xp Y2tNZWFzdXJlbWVudC0+c3RhcnRUaW1lcigwX3MpOworfQorCiB2b2lkIE5ldHdvcmtTZXNzaW9u OjphZGRLZXB0QWxpdmVMb2FkKFJlZjxOZXR3b3JrUmVzb3VyY2VMb2FkZXI+JiYgbG9hZGVyKQog ewogICAgIEFTU0VSVChtX3Nlc3Npb25JRCA9PSBsb2FkZXItPnNlc3Npb25JRCgpKTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvUHJpdmF0ZUNsaWNrTWVhc3VyZW1l bnRNYW5hZ2VyLmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvUHJpdmF0ZUNsaWNr TWVhc3VyZW1lbnRNYW5hZ2VyLmNwcAppbmRleCA2NDgwZGFmMGNhMDQuLjk1Zjg1YmY2MDJmYSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9Qcml2YXRlQ2xpY2tNZWFz dXJlbWVudE1hbmFnZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvUHJp dmF0ZUNsaWNrTWVhc3VyZW1lbnRNYW5hZ2VyLmNwcApAQCAtNzQsOCArNzQsMTAgQEAgdm9pZCBQ cml2YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFnZXI6OnN0b3JlVW5hdHRyaWJ1dGVkKFByaXZhdGVD bGlja01lYXN1cmVtZW50JiYKICAgICAgICAgbV9uZXR3b3JrUHJvY2Vzcy0+YnJvYWRjYXN0Q29u c29sZU1lc3NhZ2UobV9zZXNzaW9uSUQsIE1lc3NhZ2VTb3VyY2U6OlByaXZhdGVDbGlja01lYXN1 cmVtZW50LCBNZXNzYWdlTGV2ZWw6OkVycm9yLCAiW1ByaXZhdGUgQ2xpY2sgTWVhc3VyZW1lbnRd IFN0b3JpbmcgYW4gYWQgY2xpY2suIl9zKTsKICAgICB9CiAKKyNpZiBFTkFCTEUoUkVTT1VSQ0Vf TE9BRF9TVEFUSVNUSUNTKQogICAgIGlmIChhdXRvKiByZXNvdXJjZUxvYWRTdGF0aXN0aWNzID0g bV9uZXR3b3JrU2Vzc2lvbi0+cmVzb3VyY2VMb2FkU3RhdGlzdGljcygpKQogICAgICAgICByZXNv dXJjZUxvYWRTdGF0aXN0aWNzLT5pbnNlcnRQcml2YXRlQ2xpY2tNZWFzdXJlbWVudChXVEZNb3Zl KGF0dHJpYnV0aW9uKSwgUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRBdHRyaWJ1dGlvblR5cGU6OlVu YXR0cmlidXRlZCk7CisjZW5kaWYKIH0KIAogdm9pZCBQcml2YXRlQ2xpY2tNZWFzdXJlbWVudE1h bmFnZXI6OmhhbmRsZUF0dHJpYnV0aW9uKEF0dHJpYnV0aW9uVHJpZ2dlckRhdGEmJiBhdHRyaWJ1 dGlvblRyaWdnZXJEYXRhLCBjb25zdCBVUkwmIHJlcXVlc3RVUkwsIGNvbnN0IFdlYkNvcmU6OlJl c291cmNlUmVxdWVzdCYgcmVkaXJlY3RSZXF1ZXN0KQpAQCAtMTEyLDYgKzExNCw3IEBAIHZvaWQg UHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRNYW5hZ2VyOjpzdGFydFRpbWVyKFNlY29uZHMgc2Vjb25k cykKIAogdm9pZCBQcml2YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFnZXI6OmF0dHJpYnV0ZShjb25z dCBTb3VyY2VTaXRlJiBzb3VyY2VTaXRlLCBjb25zdCBBdHRyaWJ1dGVPblNpdGUmIGF0dHJpYnV0 ZU9uU2l0ZSwgQXR0cmlidXRpb25UcmlnZ2VyRGF0YSYmIGF0dHJpYnV0aW9uVHJpZ2dlckRhdGEp CiB7CisjaWYgRU5BQkxFKFJFU09VUkNFX0xPQURfU1RBVElTVElDUykKICAgICBpZiAoYXV0byog cmVzb3VyY2VMb2FkU3RhdGlzdGljcyA9IG1fbmV0d29ya1Nlc3Npb24tPnJlc291cmNlTG9hZFN0 YXRpc3RpY3MoKSkgewogICAgICAgICByZXNvdXJjZUxvYWRTdGF0aXN0aWNzLT5hdHRyaWJ1dGVQ cml2YXRlQ2xpY2tNZWFzdXJlbWVudChzb3VyY2VTaXRlLCBhdHRyaWJ1dGVPblNpdGUsIFdURk1v dmUoYXR0cmlidXRpb25UcmlnZ2VyRGF0YSksIFt0aGlzXSAoYXV0byBvcHRpb25hbFNlY29uZHNV bnRpbFNlbmQpIHsKICAgICAgICAgICAgIGlmIChvcHRpb25hbFNlY29uZHNVbnRpbFNlbmQpIHsK QEAgLTEyOCw2ICsxMzEsNyBAQCB2b2lkIFByaXZhdGVDbGlja01lYXN1cmVtZW50TWFuYWdlcjo6 YXR0cmlidXRlKGNvbnN0IFNvdXJjZVNpdGUmIHNvdXJjZVNpdGUsIGNvbgogICAgICAgICAgICAg fQogICAgICAgICB9KTsKICAgICB9CisjZW5kaWYKIH0KIAogdm9pZCBQcml2YXRlQ2xpY2tNZWFz dXJlbWVudE1hbmFnZXI6OmZpcmVDb252ZXJzaW9uUmVxdWVzdChjb25zdCBQcml2YXRlQ2xpY2tN ZWFzdXJlbWVudCYgYXR0cmlidXRpb24pCkBAIC0xODMsMTggKzE4NywyMyBAQCB2b2lkIFByaXZh dGVDbGlja01lYXN1cmVtZW50TWFuYWdlcjo6ZmlyZUNvbnZlcnNpb25SZXF1ZXN0KGNvbnN0IFBy aXZhdGVDbGlja01lYQogCiB2b2lkIFByaXZhdGVDbGlja01lYXN1cmVtZW50TWFuYWdlcjo6Y2xl YXJTZW50QXR0cmlidXRpb25zKFZlY3RvcjxQcml2YXRlQ2xpY2tNZWFzdXJlbWVudD4mJiBzZW50 Q29udmVyc2lvbnMpCiB7CisjaWYgRU5BQkxFKFJFU09VUkNFX0xPQURfU1RBVElTVElDUykKICAg ICBpZiAoYXV0byogcmVzb3VyY2VMb2FkU3RhdGlzdGljcyA9IG1fbmV0d29ya1Nlc3Npb24tPnJl c291cmNlTG9hZFN0YXRpc3RpY3MoKSkKICAgICAgICAgcmVzb3VyY2VMb2FkU3RhdGlzdGljcy0+ Y2xlYXJTZW50QXR0cmlidXRpb25zKFdURk1vdmUoc2VudENvbnZlcnNpb25zKSk7CisjZW5kaWYK IH0KIAogdm9pZCBQcml2YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFnZXI6OnVwZGF0ZVRpbWVyTGFz dEZpcmVkKCkKIHsKKyNpZiBFTkFCTEUoUkVTT1VSQ0VfTE9BRF9TVEFUSVNUSUNTKQogICAgIGlm IChhdXRvKiByZXNvdXJjZUxvYWRTdGF0aXN0aWNzID0gbV9uZXR3b3JrU2Vzc2lvbi0+cmVzb3Vy Y2VMb2FkU3RhdGlzdGljcygpKQogICAgICAgICByZXNvdXJjZUxvYWRTdGF0aXN0aWNzLT51cGRh dGVUaW1lckxhc3RGaXJlZCgpOworI2VuZGlmCiB9CiAKIHZvaWQgUHJpdmF0ZUNsaWNrTWVhc3Vy ZW1lbnRNYW5hZ2VyOjpmaXJlUGVuZGluZ0F0dHJpYnV0aW9uUmVxdWVzdHMoKQogeworI2lmIEVO QUJMRShSRVNPVVJDRV9MT0FEX1NUQVRJU1RJQ1MpCiAgICAgYXV0byogcmVzb3VyY2VMb2FkU3Rh dGlzdGljcyA9IG1fbmV0d29ya1Nlc3Npb24tPnJlc291cmNlTG9hZFN0YXRpc3RpY3MoKTsKICAg ICBpZiAoIXJlc291cmNlTG9hZFN0YXRpc3RpY3MpCiAgICAgICAgIHJldHVybjsKQEAgLTIyNywz MiArMjM2LDQxIEBAIHZvaWQgUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRNYW5hZ2VyOjpmaXJlUGVu ZGluZ0F0dHJpYnV0aW9uUmVxdWVzdHMoKQogICAgICAgICBpZiAobmV4dFRpbWVUb0ZpcmUgPCBT ZWNvbmRzOjppbmZpbml0eSgpKQogICAgICAgICAgICAgc3RhcnRUaW1lcihuZXh0VGltZVRvRmly ZSk7CiAgICAgfSk7CisjZW5kaWYKIH0KIAogdm9pZCBQcml2YXRlQ2xpY2tNZWFzdXJlbWVudE1h bmFnZXI6OmNsZWFyKCkKIHsKICAgICBtX2ZpcmVQZW5kaW5nQXR0cmlidXRpb25SZXF1ZXN0c1Rp bWVyLnN0b3AoKTsKIAorI2lmIEVOQUJMRShSRVNPVVJDRV9MT0FEX1NUQVRJU1RJQ1MpCiAgICAg aWYgKGF1dG8qIHJlc291cmNlTG9hZFN0YXRpc3RpY3MgPSBtX25ldHdvcmtTZXNzaW9uLT5yZXNv dXJjZUxvYWRTdGF0aXN0aWNzKCkpCiAgICAgICAgIHJlc291cmNlTG9hZFN0YXRpc3RpY3MtPmNs ZWFyUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQoKTsKKyNlbmRpZgogfQogCiB2b2lkIFByaXZhdGVD bGlja01lYXN1cmVtZW50TWFuYWdlcjo6Y2xlYXJGb3JSZWdpc3RyYWJsZURvbWFpbihjb25zdCBS ZWdpc3RyYWJsZURvbWFpbiYgZG9tYWluKQogeworI2lmIEVOQUJMRShSRVNPVVJDRV9MT0FEX1NU QVRJU1RJQ1MpCiAgICAgaWYgKGF1dG8qIHJlc291cmNlTG9hZFN0YXRpc3RpY3MgPSBtX25ldHdv cmtTZXNzaW9uLT5yZXNvdXJjZUxvYWRTdGF0aXN0aWNzKCkpCiAgICAgICAgIHJlc291cmNlTG9h ZFN0YXRpc3RpY3MtPmNsZWFyUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRGb3JSZWdpc3RyYWJsZURv bWFpbihkb21haW4pOworI2VuZGlmCiB9CiAKIHZvaWQgUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRN YW5hZ2VyOjpjbGVhckV4cGlyZWQoKQogeworI2lmIEVOQUJMRShSRVNPVVJDRV9MT0FEX1NUQVRJ U1RJQ1MpCiAgICAgaWYgKGF1dG8qIHJlc291cmNlTG9hZFN0YXRpc3RpY3MgPSBtX25ldHdvcmtT ZXNzaW9uLT5yZXNvdXJjZUxvYWRTdGF0aXN0aWNzKCkpCiAgICAgICAgIHJlc291cmNlTG9hZFN0 YXRpc3RpY3MtPmNsZWFyRXhwaXJlZFByaXZhdGVDbGlja01lYXN1cmVtZW50KCk7CisjZW5kaWYK IH0KIAogdm9pZCBQcml2YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFnZXI6OnRvU3RyaW5nKENvbXBs ZXRpb25IYW5kbGVyPHZvaWQoU3RyaW5nKT4mJiBjb21wbGV0aW9uSGFuZGxlcikgY29uc3QKIHsK KyNpZiBFTkFCTEUoUkVTT1VSQ0VfTE9BRF9TVEFUSVNUSUNTKQogICAgIGlmIChhdXRvKiByZXNv dXJjZUxvYWRTdGF0aXN0aWNzID0gbV9uZXR3b3JrU2Vzc2lvbi0+cmVzb3VyY2VMb2FkU3RhdGlz dGljcygpKQogICAgICAgICByZXNvdXJjZUxvYWRTdGF0aXN0aWNzLT5wcml2YXRlQ2xpY2tNZWFz dXJlbWVudFRvU3RyaW5nKFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpKTsKKyNlbmRpZgogfQog CiB2b2lkIFByaXZhdGVDbGlja01lYXN1cmVtZW50TWFuYWdlcjo6c2V0Q29udmVyc2lvblVSTEZv clRlc3RpbmcoVVJMJiYgdGVzdFVSTCkKQEAgLTI2NSw4ICsyODMsMTAgQEAgdm9pZCBQcml2YXRl Q2xpY2tNZWFzdXJlbWVudE1hbmFnZXI6OnNldENvbnZlcnNpb25VUkxGb3JUZXN0aW5nKFVSTCYm IHRlc3RVUkwpCiAKIHZvaWQgUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRNYW5hZ2VyOjptYXJrQWxs VW5hdHRyaWJ1dGVkQXNFeHBpcmVkRm9yVGVzdGluZygpCiB7CisjaWYgRU5BQkxFKFJFU09VUkNF X0xPQURfU1RBVElTVElDUykKICAgICBpZiAoYXV0byogcmVzb3VyY2VMb2FkU3RhdGlzdGljcyA9 IG1fbmV0d29ya1Nlc3Npb24tPnJlc291cmNlTG9hZFN0YXRpc3RpY3MoKSkKICAgICAgICAgcmVz b3VyY2VMb2FkU3RhdGlzdGljcy0+bWFya0FsbFVuYXR0cmlidXRlZFByaXZhdGVDbGlja01lYXN1 cmVtZW50QXNFeHBpcmVkRm9yVGVzdGluZygpOworI2VuZGlmCiB9CiAKIGJvb2wgUHJpdmF0ZUNs aWNrTWVhc3VyZW1lbnRNYW5hZ2VyOjpkZWJ1Z01vZGVFbmFibGVkKCkgY29uc3QKQEAgLTI3Niwx MCArMjk2LDEyIEBAIGJvb2wgUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRNYW5hZ2VyOjpkZWJ1Z01v ZGVFbmFibGVkKCkgY29uc3QKIAogdm9pZCBQcml2YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFnZXI6 Om1hcmtBdHRyaWJ1dGVkUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRzQXNFeHBpcmVkRm9yVGVzdGlu ZyhDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYgY29tcGxldGlvbkhhbmRsZXIpCiB7CisjaWYg RU5BQkxFKFJFU09VUkNFX0xPQURfU1RBVElTVElDUykKICAgICBpZiAoYXV0byogcmVzb3VyY2VM b2FkU3RhdGlzdGljcyA9IG1fbmV0d29ya1Nlc3Npb24tPnJlc291cmNlTG9hZFN0YXRpc3RpY3Mo KSkgewogICAgICAgICByZXNvdXJjZUxvYWRTdGF0aXN0aWNzLT5tYXJrQXR0cmlidXRlZFByaXZh dGVDbGlja01lYXN1cmVtZW50c0FzRXhwaXJlZEZvclRlc3RpbmcoV1RGTW92ZShjb21wbGV0aW9u SGFuZGxlcikpOwogICAgICAgICByZXR1cm47CiAgICAgfQorI2VuZGlmCiAgICAgY29tcGxldGlv bkhhbmRsZXIoKTsKIH0KIAo=