111261 2013-03-03 00:18:52 -0800 REGRESSION(144520): Does not compile on chromium-win 2013-03-03 00:35:35 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 110995 1 abarth abarth oldest_to_newest 845949 0 abarth 2013-03-03 00:18:52 -0800 REGRESSION(144520): Does not compile on chromium-win 845951 1 191129 abarth 2013-03-03 00:20:12 -0800 Created attachment 191129 Patch 845952 2 abarth 2013-03-03 00:22:53 -0800 179>C:\b\build\slave\webkit-win-latest-rel\build\src\third_party\WebKit\Source\WTF\wtf/OwnPtrCommon.h(63):error C2248: 'WebCore::RenderBlock::RenderBlockRareData' : cannot access protected struct declared in class 'WebCore::RenderBlock' 179> c:\b\build\slave\webkit-win-latest-rel\build\src\third_party\webkit\source\webcore\rendering\RenderBlock.h(1214) : see declaration of 'WebCore::RenderBlock::RenderBlockRareData' 179> c:\b\build\slave\webkit-win-latest-rel\build\src\third_party\webkit\source\webcore\rendering\RenderBlock.h(83) : see declaration of 'WebCore::RenderBlock' 179> C:\b\build\slave\webkit-win-latest-rel\build\src\third_party\WebKit\Source\WTF\wtf/PassOwnPtr.h(56) : see reference to function template instantiation 'void WTF::deleteOwnedPtr<WebCore::RenderBlock::RenderBlockRareData>(T *)' being compiled 179> with 179> [ 179> T=WebCore::RenderBlock::RenderBlockRareData 179> ] 179> C:\b\build\slave\webkit-win-latest-rel\build\src\third_party\WebKit\Source\WTF\wtf/PassOwnPtr.h(56) : while compiling class template member function 'WTF::PassOwnPtr<T>::~PassOwnPtr(void)' 179> with 179> [ 179> T=WebCore::RenderBlock::RenderBlockRareData 179> ] 179> c:\b\build\slave\webkit-win-latest-rel\build\src\third_party\webkit\source\webcore\rendering\RenderBlock.h(336) : see reference to class template instantiation 'WTF::PassOwnPtr<T>' being compiled 179> with 179> [ 179> T=WebCore::RenderBlock::RenderBlockRareData 179> ] 845953 3 abarth 2013-03-03 00:23:19 -0800 See. for example, http://build.chromium.org/p/chromium.webkit/builders/WebKit%20Win%20Builder/builds/36652/steps/compile/logs/stdio#error1 845956 4 191129 abarth 2013-03-03 00:35:33 -0800 Comment on attachment 191129 Patch Clearing flags on attachment: 191129 Committed r144561: <http://trac.webkit.org/changeset/144561> 845957 5 abarth 2013-03-03 00:35:35 -0800 All reviewed patches have been landed. Closing bug. 191129 2013-03-03 00:20:12 -0800 2013-03-03 00:35:33 -0800 Patch bug-111261-20130303001621.patch text/plain 9528 abarth U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ0NTU3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGY5YmNhNDlmYzE3MGNm ZDU2YjI3NmVkYjE3MzllYzkzYzMyOGEzOC4uNTgzNjAwYzIxMTdlZWZjMDUzODFlZDg2MzVlN2Rm YWYxN2Y1NDQ5MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDEzLTAzLTAzICBBZGFt IEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUkVHUkVTU0lPTigxNDQ1MjAp OiBEb2VzIG5vdCBjb21waWxlIG9uIGNocm9taXVtLXdpbgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTExMjYxCisKKyAgICAgICAgVW5yZXZpZXdlZCBy b2xsb3V0IG9mIGh0dHA6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0LzE0NDUyMC4gVGhpcwor ICAgICAgICBwYXRjaCBkb2VzIG5vdCBjb21waWxlIGZvciBjaHJvbWl1bS13aW4uIFNlZSB0aGUg YnVnIGZvciB0aGUgY29tcGlsZQorICAgICAgICBlcnJvci4KKworICAgICAgICAqIHJlbmRlcmlu Zy9FeGNsdXNpb25TaGFwZUluc2lkZUluZm8uY3BwOgorICAgICAgICAqIHJlbmRlcmluZy9FeGNs dXNpb25TaGFwZUluc2lkZUluZm8uaDoKKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAoTGlu ZVNlZ21lbnRSYW5nZSk6CisgICAgICAgIChXZWJDb3JlOjpMaW5lU2VnbWVudFJhbmdlOjpMaW5l U2VnbWVudFJhbmdlKToKKyAgICAgICAgKFdlYkNvcmU6OkV4Y2x1c2lvblNoYXBlSW5zaWRlSW5m bzo6aXNFbmFibGVkRm9yKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwOgor ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6OndpbGxCZURlc3Ryb3llZCk6CisgICAgICAg IChXZWJDb3JlOjpSZW5kZXJCbG9jazo6ZXhjbHVzaW9uU2hhcGVJbnNpZGVJbmZvKToKKyAgICAg ICAgKFdlYkNvcmUpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6OnVwZGF0ZUV4Y2x1 c2lvblNoYXBlSW5zaWRlSW5mb0FmdGVyU3R5bGVDaGFuZ2UpOgorICAgICAgICAqIHJlbmRlcmlu Zy9SZW5kZXJCbG9jay5oOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgIChSZW5kZXJCbG9j ayk6CisgICAgICAgIChSZW5kZXJCbG9ja1JhcmVEYXRhKToKKyAgICAgICAgKiByZW5kZXJpbmcv UmVuZGVyQmxvY2tMaW5lTGF5b3V0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmNvbnN0cnVjdEJp ZGlSdW5zRm9yTGluZSk6CisKIDIwMTMtMDMtMDIgIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUu Y29tPgogCiAgICAgICAgIEFub3RoZXIgdHJ5IGF0IGZpeGluZyB0aGUgYnVpbGQuCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvRXhjbHVzaW9uU2hhcGVJbnNpZGVJbmZvLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9FeGNsdXNpb25TaGFwZUluc2lkZUluZm8uY3Bw CmluZGV4IDBkZmIyN2UzZTExNGZiNTkwMjRjZWM5NmE3N2ZmYzc4ZWU4NjgxOTYuLjM0ODAxOTZi NTU2YTg3ZDIzODkzNjgwMzhmZGQ4MDRiNzc5OTA1MTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9FeGNsdXNpb25TaGFwZUluc2lkZUluZm8uY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9FeGNsdXNpb25TaGFwZUluc2lkZUluZm8uY3BwCkBAIC0zMiwyMyAr MzIsOSBAQAogCiAjaWYgRU5BQkxFKENTU19FWENMVVNJT05TKQogCi0jaW5jbHVkZSAiSW5saW5l SXRlcmF0b3IuaCIKICNpbmNsdWRlICJSZW5kZXJCbG9jay5oIgogCiBuYW1lc3BhY2UgV2ViQ29y ZSB7Ci0KLUxpbmVTZWdtZW50UmFuZ2U6OkxpbmVTZWdtZW50UmFuZ2UoY29uc3QgSW5saW5lSXRl cmF0b3ImIHN0YXJ0LCBjb25zdCBJbmxpbmVJdGVyYXRvciYgZW5kKQotICAgIDogc3RhcnQoc3Rh cnQucm9vdCgpLCBzdGFydC5vYmplY3QoKSwgc3RhcnQub2Zmc2V0KCkpCi0gICAgLCBlbmQoZW5k LnJvb3QoKSwgZW5kLm9iamVjdCgpLCBlbmQub2Zmc2V0KCkpCi0gICAgewotICAgIH0KLQotYm9v bCBFeGNsdXNpb25TaGFwZUluc2lkZUluZm86OmlzRW5hYmxlZEZvcihjb25zdCBSZW5kZXJCbG9j ayogcmVuZGVyZXIpCi17Ci0gICAgRXhjbHVzaW9uU2hhcGVWYWx1ZSogc2hhcGVWYWx1ZSA9IHJl bmRlcmVyLT5zdHlsZSgpLT5yZXNvbHZlZFNoYXBlSW5zaWRlKCk7Ci0gICAgcmV0dXJuIChzaGFw ZVZhbHVlICYmIHNoYXBlVmFsdWUtPnR5cGUoKSA9PSBFeGNsdXNpb25TaGFwZVZhbHVlOjpTSEFQ RSkgPyBzaGFwZVZhbHVlLT5zaGFwZSgpIDogMDsKLX0KLQogYm9vbCBFeGNsdXNpb25TaGFwZUlu c2lkZUluZm86OmNvbXB1dGVTZWdtZW50c0ZvckxpbmUoTGF5b3V0VW5pdCBsaW5lVG9wLCBMYXlv dXRVbml0IGxpbmVIZWlnaHQpCiB7CiAgICAgQVNTRVJUKGxpbmVIZWlnaHQgPj0gMCk7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvRXhjbHVzaW9uU2hhcGVJbnNpZGVJbmZv LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvRXhjbHVzaW9uU2hhcGVJbnNpZGVJbmZvLmgK aW5kZXggNzA0YzA5MWZhOWVlZDI1MDhiOTBhY2U5YWVkZjBmZGExYTA4Nzk4ZC4uYWQ4NjhlNTM0 N2I0MzVmNmVmOGNjNDg5NzQwNDg5YjA5ZjkwYjY4ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL0V4Y2x1c2lvblNoYXBlSW5zaWRlSW5mby5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9FeGNsdXNpb25TaGFwZUluc2lkZUluZm8uaApAQCAtMzMsNDAgKzMzLDM0 IEBACiAjaWYgRU5BQkxFKENTU19FWENMVVNJT05TKQogCiAjaW5jbHVkZSAiRXhjbHVzaW9uU2hh cGVJbmZvLmgiCisjaW5jbHVkZSAiSW5saW5lSXRlcmF0b3IuaCIKICNpbmNsdWRlIDx3dGYvUGFz c093blB0ci5oPgogI2luY2x1ZGUgPHd0Zi9WZWN0b3IuaD4KIAogbmFtZXNwYWNlIFdlYkNvcmUg ewogCi1jbGFzcyBJbmxpbmVJdGVyYXRvcjsKIGNsYXNzIFJlbmRlckJsb2NrOwotY2xhc3MgUmVu ZGVyT2JqZWN0OwogCi1zdHJ1Y3QgTGluZVNlZ21lbnRJdGVyYXRvciB7Ci0gICAgUmVuZGVyT2Jq ZWN0KiByb290OwotICAgIFJlbmRlck9iamVjdCogb2JqZWN0OwotICAgIHVuc2lnbmVkIG9mZnNl dDsKLSAgICBMaW5lU2VnbWVudEl0ZXJhdG9yKFJlbmRlck9iamVjdCogcm9vdCwgUmVuZGVyT2Jq ZWN0KiBvYmplY3QsIHVuc2lnbmVkIG9mZnNldCkKLSAgICAgICAgOiByb290KHJvb3QpCi0gICAg ICAgICwgb2JqZWN0KG9iamVjdCkKLSAgICAgICAgLCBvZmZzZXQob2Zmc2V0KQorc3RydWN0IExp bmVTZWdtZW50UmFuZ2UgeworICAgIElubGluZUl0ZXJhdG9yIHN0YXJ0OworICAgIElubGluZUl0 ZXJhdG9yIGVuZDsKKyAgICBMaW5lU2VnbWVudFJhbmdlKElubGluZUl0ZXJhdG9yIHN0YXJ0LCBJ bmxpbmVJdGVyYXRvciBlbmQpCisgICAgICAgIDogc3RhcnQoc3RhcnQpCisgICAgICAgICwgZW5k KGVuZCkKICAgICB7CiAgICAgfQogfTsKLQotc3RydWN0IExpbmVTZWdtZW50UmFuZ2UgewotICAg IExpbmVTZWdtZW50SXRlcmF0b3Igc3RhcnQ7Ci0gICAgTGluZVNlZ21lbnRJdGVyYXRvciBlbmQ7 Ci0gICAgTGluZVNlZ21lbnRSYW5nZShjb25zdCBJbmxpbmVJdGVyYXRvciYgc3RhcnQsIGNvbnN0 IElubGluZUl0ZXJhdG9yJiBlbmQpOwotfTsKLQogdHlwZWRlZiBWZWN0b3I8TGluZVNlZ21lbnRS YW5nZT4gU2VnbWVudFJhbmdlTGlzdDsKIAotY2xhc3MgRXhjbHVzaW9uU2hhcGVJbnNpZGVJbmZv IDogcHVibGljIEV4Y2x1c2lvblNoYXBlSW5mbzxSZW5kZXJCbG9jaywgJlJlbmRlclN0eWxlOjpy ZXNvbHZlZFNoYXBlSW5zaWRlPiB7CitjbGFzcyBFeGNsdXNpb25TaGFwZUluc2lkZUluZm8gOiBw dWJsaWMgRXhjbHVzaW9uU2hhcGVJbmZvPFJlbmRlckJsb2NrLCAmUmVuZGVyU3R5bGU6OnJlc29s dmVkU2hhcGVJbnNpZGU+LCBwdWJsaWMgTWFwcGVkSW5mbzxSZW5kZXJCbG9jaywgRXhjbHVzaW9u U2hhcGVJbnNpZGVJbmZvPiB7CiBwdWJsaWM6CiAgICAgc3RhdGljIFBhc3NPd25QdHI8RXhjbHVz aW9uU2hhcGVJbnNpZGVJbmZvPiBjcmVhdGVJbmZvKGNvbnN0IFJlbmRlckJsb2NrKiByZW5kZXJl cikgeyByZXR1cm4gYWRvcHRQdHIobmV3IEV4Y2x1c2lvblNoYXBlSW5zaWRlSW5mbyhyZW5kZXJl cikpOyB9CiAKLSAgICBzdGF0aWMgYm9vbCBpc0VuYWJsZWRGb3IoY29uc3QgUmVuZGVyQmxvY2sq IHJlbmRlcmVyKTsKKyAgICBzdGF0aWMgYm9vbCBpc0VuYWJsZWRGb3IoY29uc3QgUmVuZGVyQmxv Y2sqIHJlbmRlcmVyKQorICAgIHsKKyAgICAgICAgRXhjbHVzaW9uU2hhcGVWYWx1ZSogc2hhcGVW YWx1ZSA9IHJlbmRlcmVyLT5zdHlsZSgpLT5yZXNvbHZlZFNoYXBlSW5zaWRlKCk7CisgICAgICAg IHJldHVybiAoc2hhcGVWYWx1ZSAmJiBzaGFwZVZhbHVlLT50eXBlKCkgPT0gRXhjbHVzaW9uU2hh cGVWYWx1ZTo6U0hBUEUpID8gc2hhcGVWYWx1ZS0+c2hhcGUoKSA6IDA7CisgICAgfQogICAgIGJv b2wgbGluZU92ZXJsYXBzU2hhcGVCb3VuZHMoKSBjb25zdCB7IHJldHVybiBsb2dpY2FsTGluZVRv cCgpIDwgc2hhcGVMb2dpY2FsQm90dG9tKCkgJiYgbG9naWNhbExpbmVCb3R0b20oKSA+PSBzaGFw ZUxvZ2ljYWxUb3AoKTsgfQogCiAgICAgYm9vbCBoYXNTZWdtZW50cygpIGNvbnN0CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcAppbmRleCA2MTRjMDcxNzVlYWIyNWI2ZTI3 ZTI1MGVlMjE3MTlmZDI1YTc2YWVlLi4xM2E5N2UzNjFiZGQ0ZjlmNjI0MGRmNTZkOWM3YTMzYmQx NTEwNzljIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2su Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAKQEAgLTI5 Niw2ICsyOTYsMTAgQEAgdm9pZCBSZW5kZXJCbG9jazo6d2lsbEJlRGVzdHJveWVkKCkKICAgICBp ZiAobGluZUdyaWRCb3goKSkKICAgICAgICAgbGluZUdyaWRCb3goKS0+ZGVzdHJveShyZW5kZXJB cmVuYSgpKTsKIAorI2lmIEVOQUJMRShDU1NfRVhDTFVTSU9OUykKKyAgICBFeGNsdXNpb25TaGFw ZUluc2lkZUluZm86OnJlbW92ZUluZm8odGhpcyk7CisjZW5kaWYKKwogICAgIGlmIChVTkxJS0VM WShnRGVsYXllZFVwZGF0ZVNjcm9sbEluZm9TZXQgIT0gMCkpCiAgICAgICAgIGdEZWxheWVkVXBk YXRlU2Nyb2xsSW5mb1NldC0+cmVtb3ZlKHRoaXMpOwogCkBAIC0xMzkwLDYgKzEzOTQsMTEgQEAg dm9pZCBSZW5kZXJCbG9jazo6bGF5b3V0KCkKIH0KIAogI2lmIEVOQUJMRShDU1NfRVhDTFVTSU9O UykKK0V4Y2x1c2lvblNoYXBlSW5zaWRlSW5mbyogUmVuZGVyQmxvY2s6OmV4Y2x1c2lvblNoYXBl SW5zaWRlSW5mbygpIGNvbnN0Cit7CisgICAgcmV0dXJuIHN0eWxlKCktPnJlc29sdmVkU2hhcGVJ bnNpZGUoKSAmJiBFeGNsdXNpb25TaGFwZUluc2lkZUluZm86OmlzRW5hYmxlZEZvcih0aGlzKSA/ IEV4Y2x1c2lvblNoYXBlSW5zaWRlSW5mbzo6aW5mbyh0aGlzKSA6IDA7Cit9CisKIHZvaWQgUmVu ZGVyQmxvY2s6OnVwZGF0ZUV4Y2x1c2lvblNoYXBlSW5zaWRlSW5mb0FmdGVyU3R5bGVDaGFuZ2Uo Y29uc3QgRXhjbHVzaW9uU2hhcGVWYWx1ZSogc2hhcGVJbnNpZGUsIGNvbnN0IEV4Y2x1c2lvblNo YXBlVmFsdWUqIG9sZFNoYXBlSW5zaWRlKQogewogICAgIC8vIEZJWE1FOiBBIGZ1dHVyZSBvcHRp bWl6YXRpb24gd291bGQgZG8gYSBkZWVwIGNvbXBhcmlzb24gZm9yIGVxdWFsaXR5LgpAQCAtMTM5 NywxMCArMTQwNiwxMCBAQCB2b2lkIFJlbmRlckJsb2NrOjp1cGRhdGVFeGNsdXNpb25TaGFwZUlu c2lkZUluZm9BZnRlclN0eWxlQ2hhbmdlKGNvbnN0IEV4Y2x1c2lvbgogICAgICAgICByZXR1cm47 CiAKICAgICBpZiAoc2hhcGVJbnNpZGUpIHsKLSAgICAgICAgRXhjbHVzaW9uU2hhcGVJbnNpZGVJ bmZvKiBleGNsdXNpb25TaGFwZUluc2lkZUluZm8gPSBlbnN1cmVFeGNsdXNpb25TaGFwZUluc2lk ZUluZm8oKTsKKyAgICAgICAgRXhjbHVzaW9uU2hhcGVJbnNpZGVJbmZvKiBleGNsdXNpb25TaGFw ZUluc2lkZUluZm8gPSBFeGNsdXNpb25TaGFwZUluc2lkZUluZm86OmVuc3VyZUluZm8odGhpcyk7 CiAgICAgICAgIGV4Y2x1c2lvblNoYXBlSW5zaWRlSW5mby0+ZGlydHlTaGFwZVNpemUoKTsKICAg ICB9IGVsc2UKLSAgICAgICAgc2V0RXhjbHVzaW9uU2hhcGVJbnNpZGVJbmZvKG51bGxwdHIpOwor ICAgICAgICBFeGNsdXNpb25TaGFwZUluc2lkZUluZm86OnJlbW92ZUluZm8odGhpcyk7CiB9CiAj ZW5kaWYKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2Nr LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suaAppbmRleCAyMDAzNDc4 NmViMzhhNzUwN2VhZDljNWUxMTg2ZjYwMDU2YTIxN2U0Li40OGMyMWYzOTg0NmY5ZDczNTA2NTAw ZTlkMmJkYzJhOTlmMzc3NjE1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyQmxvY2suaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2su aApAQCAtMzUsNyArMzUsNiBAQAogI2luY2x1ZGUgPHd0Zi9MaXN0SGFzaFNldC5oPgogCiAjaWYg RU5BQkxFKENTU19FWENMVVNJT05TKQotI2luY2x1ZGUgIkV4Y2x1c2lvblNoYXBlSW5zaWRlSW5m by5oIgogI2luY2x1ZGUgIkV4Y2x1c2lvblNoYXBlVmFsdWUuaCIKICNlbmRpZgogCkBAIC01NSw2 ICs1NCw3IEBAIGNsYXNzIExpbmVJbmZvOwogY2xhc3MgUmVuZGVyUnVieVJ1bjsKICNpZiBFTkFC TEUoQ1NTX0VYQ0xVU0lPTlMpCiBjbGFzcyBCYXNpY1NoYXBlOworY2xhc3MgRXhjbHVzaW9uU2hh cGVJbnNpZGVJbmZvOwogI2VuZGlmCiBjbGFzcyBUZXh0TGF5b3V0OwogY2xhc3MgV29yZE1lYXN1 cmVtZW50OwpAQCAtNDQ2LDIyICs0NDYsNyBAQCBwdWJsaWM6CiAjZW5kaWYKIAogI2lmIEVOQUJM RShDU1NfRVhDTFVTSU9OUykKLSAgICBFeGNsdXNpb25TaGFwZUluc2lkZUluZm8qIGVuc3VyZUV4 Y2x1c2lvblNoYXBlSW5zaWRlSW5mbygpCi0gICAgewotICAgICAgICBpZiAoIW1fcmFyZURhdGEg fHwgIW1fcmFyZURhdGEtPm1fc2hhcGVJbnNpZGVJbmZvKQotICAgICAgICAgICAgc2V0RXhjbHVz aW9uU2hhcGVJbnNpZGVJbmZvKEV4Y2x1c2lvblNoYXBlSW5zaWRlSW5mbzo6Y3JlYXRlSW5mbyh0 aGlzKSk7Ci0gICAgICAgIHJldHVybiBtX3JhcmVEYXRhLT5tX3NoYXBlSW5zaWRlSW5mby5nZXQo KTsKLSAgICB9Ci0gICAgRXhjbHVzaW9uU2hhcGVJbnNpZGVJbmZvKiBleGNsdXNpb25TaGFwZUlu c2lkZUluZm8oKSBjb25zdAotICAgIHsKLSAgICAgICAgcmV0dXJuIG1fcmFyZURhdGEgJiYgbV9y YXJlRGF0YS0+bV9zaGFwZUluc2lkZUluZm8gJiYgRXhjbHVzaW9uU2hhcGVJbnNpZGVJbmZvOjpp c0VuYWJsZWRGb3IodGhpcykgPyBtX3JhcmVEYXRhLT5tX3NoYXBlSW5zaWRlSW5mby5nZXQoKSA6 IDA7Ci0gICAgfQotICAgIHZvaWQgc2V0RXhjbHVzaW9uU2hhcGVJbnNpZGVJbmZvKFBhc3NPd25Q dHI8RXhjbHVzaW9uU2hhcGVJbnNpZGVJbmZvPiB2YWx1ZSkKLSAgICB7Ci0gICAgICAgIGlmICgh bV9yYXJlRGF0YSkKLSAgICAgICAgICAgIG1fcmFyZURhdGEgPSBhZG9wdFB0cihuZXcgUmVuZGVy QmxvY2tSYXJlRGF0YSh0aGlzKSk7Ci0gICAgICAgIG1fcmFyZURhdGEtPm1fc2hhcGVJbnNpZGVJ bmZvID0gdmFsdWU7Ci0gICAgfQorICAgIEV4Y2x1c2lvblNoYXBlSW5zaWRlSW5mbyogZXhjbHVz aW9uU2hhcGVJbnNpZGVJbmZvKCkgY29uc3Q7CiAgICAgRXhjbHVzaW9uU2hhcGVJbnNpZGVJbmZv KiBsYXlvdXRFeGNsdXNpb25TaGFwZUluc2lkZUluZm8oKSBjb25zdDsKICAgICBib29sIGFsbG93 c0V4Y2x1c2lvblNoYXBlSW5zaWRlSW5mb1NoYXJpbmcoKSBjb25zdCB7IHJldHVybiAhaXNJbmxp bmUoKSAmJiAhaXNGbG9hdGluZygpOyB9CiAjZW5kaWYKQEAgLTEyNTAsOSArMTIzNSw2IEBAIHBy b3RlY3RlZDoKICAgICAgICAgUm9vdElubGluZUJveCogbV9saW5lR3JpZEJveDsKIAogICAgICAg ICBSb290SW5saW5lQm94KiBtX2xpbmVCcmVha1RvQXZvaWRXaWRvdzsKLSNpZiBFTkFCTEUoQ1NT X0VYQ0xVU0lPTlMpCi0gICAgICAgIE93blB0cjxFeGNsdXNpb25TaGFwZUluc2lkZUluZm8+IG1f c2hhcGVJbnNpZGVJbmZvOwotI2VuZGlmCiAgICAgICAgIGJvb2wgbV9zaG91bGRCcmVha0F0TGlu ZVRvQXZvaWRXaWRvdyA6IDE7CiAgICAgICAgIGJvb2wgbV9kaXNjYXJkTWFyZ2luQmVmb3JlIDog MTsKICAgICAgICAgYm9vbCBtX2Rpc2NhcmRNYXJnaW5BZnRlciA6IDE7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tMaW5lTGF5b3V0LmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0xpbmVMYXlvdXQuY3BwCmluZGV4IGExZTI5 MTMxMmY5YWVlODkxN2Q4NjYwMGY2ODUzOTk3NTIzZmE1OWQuLjIxMjA4OTlkZmFkNmIxMGMzMmU5 MzJhNDMzOWNjMzE2ZjI3Y2NkYWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJCbG9ja0xpbmVMYXlvdXQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJCbG9ja0xpbmVMYXlvdXQuY3BwCkBAIC0xMjg0LDEwICsxMjg0LDggQEAgc3RhdGlj IGlubGluZSB2b2lkIGNvbnN0cnVjdEJpZGlSdW5zRm9yTGluZShjb25zdCBSZW5kZXJCbG9jayog YmxvY2ssIElubGluZUJpZGkKICAgICBBU1NFUlQoc2VnbWVudFJhbmdlcy5zaXplKCkpOwogCiAg ICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBzZWdtZW50UmFuZ2VzLnNpemUoKTsgaSsrKSB7Ci0g ICAgICAgIExpbmVTZWdtZW50SXRlcmF0b3IgaXRlcmF0b3IgPSBzZWdtZW50UmFuZ2VzW2ldLnN0 YXJ0OwotICAgICAgICBJbmxpbmVJdGVyYXRvciBzZWdtZW50U3RhcnQoaXRlcmF0b3Iucm9vdCwg aXRlcmF0b3Iub2JqZWN0LCBpdGVyYXRvci5vZmZzZXQpOwotICAgICAgICBpdGVyYXRvciA9IHNl Z21lbnRSYW5nZXNbaV0uZW5kOwotICAgICAgICBJbmxpbmVJdGVyYXRvciBzZWdtZW50RW5kKGl0 ZXJhdG9yLnJvb3QsIGl0ZXJhdG9yLm9iamVjdCwgaXRlcmF0b3Iub2Zmc2V0KTsKKyAgICAgICAg SW5saW5lSXRlcmF0b3Igc2VnbWVudFN0YXJ0ID0gc2VnbWVudFJhbmdlc1tpXS5zdGFydDsKKyAg ICAgICAgSW5saW5lSXRlcmF0b3Igc2VnbWVudEVuZCA9IHNlZ21lbnRSYW5nZXNbaV0uZW5kOwog ICAgICAgICBpZiAoaSkgewogICAgICAgICAgICAgQVNTRVJUKHNlZ21lbnRTdGFydC5tX29iaik7 CiAgICAgICAgICAgICBCaWRpUnVuKiBzZWdtZW50TWFya2VyID0gY3JlYXRlUnVuKHNlZ21lbnRT dGFydC5tX3Bvcywgc2VnbWVudFN0YXJ0Lm1fcG9zLCBzZWdtZW50U3RhcnQubV9vYmosIHRvcFJl c29sdmVyKTsK