95623 2012-08-31 16:09:19 -0700 Remove use of ClassInfo in SpeculativeJIT::emitBranch 2012-08-31 17:38:16 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mhahnenberg mhahnenberg fpizlo webkit.review.bot oldest_to_newest 710051 0 mhahnenberg 2012-08-31 16:09:19 -0700 More removing ClassInfo stuff. 710052 1 161787 mhahnenberg 2012-08-31 16:11:30 -0700 Created attachment 161787 Patch 710096 2 161787 webkit.review.bot 2012-08-31 17:38:14 -0700 Comment on attachment 161787 Patch Clearing flags on attachment: 161787 Committed r127343: <http://trac.webkit.org/changeset/127343> 710097 3 webkit.review.bot 2012-08-31 17:38:16 -0700 All reviewed patches have been landed. Closing bug. 161787 2012-08-31 16:11:30 -0700 2012-08-31 17:38:14 -0700 Patch bug-95623-20120831161117.patch text/plain 11334 mhahnenberg SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTI3MzMxKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBA CisyMDEyLTA4LTMxICBNYXJrIEhhaG5lbmJlcmcgIDxtaGFobmVuYmVyZ0BhcHBsZS5jb20+CisK KyAgICAgICAgUmVtb3ZlIHVzZSBvZiBDbGFzc0luZm8gaW4gU3BlY3VsYXRpdmVKSVQ6OmVtaXRC cmFuY2gKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk1 NjIzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBk ZmcvREZHQWJzdHJhY3RTdGF0ZS5jcHA6CisgICAgICAgIChKU0M6OkRGRzo6QWJzdHJhY3RTdGF0 ZTo6ZXhlY3V0ZSk6CisgICAgICAgICogZGZnL0RGR1NwZWN1bGF0aXZlSklULmg6CisgICAgICAg IChTcGVjdWxhdGl2ZUpJVCk6CisgICAgICAgICogZGZnL0RGR1NwZWN1bGF0aXZlSklUMzJfNjQu Y3BwOgorICAgICAgICAoSlNDOjpERkc6OlNwZWN1bGF0aXZlSklUOjplbWl0Tm9uU3RyaW5nQ2Vs bE9yT3RoZXJCcmFuY2gpOgorICAgICAgICAoSlNDOjpERkc6OlNwZWN1bGF0aXZlSklUOjplbWl0 QnJhbmNoKToKKyAgICAgICAgKiBkZmcvREZHU3BlY3VsYXRpdmVKSVQ2NC5jcHA6CisgICAgICAg IChKU0M6OkRGRzo6U3BlY3VsYXRpdmVKSVQ6OmVtaXROb25TdHJpbmdDZWxsT3JPdGhlckJyYW5j aCk6CisgICAgICAgIChKU0M6OkRGRzo6U3BlY3VsYXRpdmVKSVQ6OmVtaXRCcmFuY2gpOgorCiAy MDEyLTA4LTMxICBUb255IENoYW5nICA8dG9ueUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmVt b3ZlIEVOQUJMRV9DU1MzX0ZMRVhCT1ggY29tcGlsZSB0aW1lIGZsYWcKSW5kZXg6IFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9kZmcvREZHQWJzdHJhY3RTdGF0ZS5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdBYnN0cmFjdFN0YXRlLmNwcAkocmV2aXNpb24gMTI3 MjkzKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdBYnN0cmFjdFN0YXRlLmNwcAko d29ya2luZyBjb3B5KQpAQCAtMTAzOCwxNCArMTAzOCw5IEBAIGJvb2wgQWJzdHJhY3RTdGF0ZTo6 ZXhlY3V0ZSh1bnNpZ25lZCBpbmQKICAgICAgICAgTm9kZSYgY2hpbGQgPSBtX2dyYXBoW25vZGUu Y2hpbGQxKCldOwogICAgICAgICBpZiAoY2hpbGQuc2hvdWxkU3BlY3VsYXRlQm9vbGVhbigpKQog ICAgICAgICAgICAgc3BlY3VsYXRlQm9vbGVhblVuYXJ5KG5vZGUpOwotICAgICAgICBlbHNlIGlm IChjaGlsZC5zaG91bGRTcGVjdWxhdGVGaW5hbE9iamVjdE9yT3RoZXIoKSkgewotICAgICAgICAg ICAgbm9kZS5zZXRDYW5FeGl0KAotICAgICAgICAgICAgICAgICFpc0ZpbmFsT2JqZWN0T3JPdGhl clNwZWN1bGF0aW9uKGZvck5vZGUobm9kZS5jaGlsZDEoKSkubV90eXBlKSk7Ci0gICAgICAgICAg ICBmb3JOb2RlKG5vZGUuY2hpbGQxKCkpLmZpbHRlcihTcGVjRmluYWxPYmplY3QgfCBTcGVjT3Ro ZXIpOwotICAgICAgICB9IGVsc2UgaWYgKGNoaWxkLnNob3VsZFNwZWN1bGF0ZUFycmF5T3JPdGhl cigpKSB7Ci0gICAgICAgICAgICBub2RlLnNldENhbkV4aXQoCi0gICAgICAgICAgICAgICAgIWlz QXJyYXlPck90aGVyU3BlY3VsYXRpb24oZm9yTm9kZShub2RlLmNoaWxkMSgpKS5tX3R5cGUpKTsK LSAgICAgICAgICAgIGZvck5vZGUobm9kZS5jaGlsZDEoKSkuZmlsdGVyKFNwZWNBcnJheSB8IFNw ZWNPdGhlcik7CisgICAgICAgIGVsc2UgaWYgKGNoaWxkLnNob3VsZFNwZWN1bGF0ZU5vblN0cmlu Z0NlbGxPck90aGVyKCkpIHsKKyAgICAgICAgICAgIG5vZGUuc2V0Q2FuRXhpdCh0cnVlKTsKKyAg ICAgICAgICAgIGZvck5vZGUobm9kZS5jaGlsZDEoKSkuZmlsdGVyKChTcGVjQ2VsbCAmIH5TcGVj U3RyaW5nKSB8IFNwZWNPdGhlcik7CiAgICAgICAgIH0gZWxzZSBpZiAoY2hpbGQuc2hvdWxkU3Bl Y3VsYXRlSW50ZWdlcigpKQogICAgICAgICAgICAgc3BlY3VsYXRlSW50MzJVbmFyeShub2RlKTsK ICAgICAgICAgZWxzZSBpZiAoY2hpbGQuc2hvdWxkU3BlY3VsYXRlTnVtYmVyKCkpCkluZGV4OiBT b3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklUMzJfNjQuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQzMl82 NC5jcHAJKHJldmlzaW9uIDEyNzI5MykKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZH U3BlY3VsYXRpdmVKSVQzMl82NC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE4NzcsNyArMTg3Nyw3 IEBAIHZvaWQgU3BlY3VsYXRpdmVKSVQ6OmNvbXBpbGVMb2dpY2FsTm90KE4KICAgICBib29sZWFu UmVzdWx0KHJlc3VsdFBheWxvYWRHUFIsIG1fY29tcGlsZUluZGV4LCBVc2VDaGlsZHJlbkNhbGxl ZEV4cGxpY2l0bHkpOwogfQogCi12b2lkIFNwZWN1bGF0aXZlSklUOjplbWl0T2JqZWN0T3JPdGhl ckJyYW5jaChFZGdlIG5vZGVVc2UsIEJsb2NrSW5kZXggdGFrZW4sIEJsb2NrSW5kZXggbm90VGFr ZW4sIGNvbnN0IENsYXNzSW5mbyogY2xhc3NJbmZvLCBib29sIG5lZWRTcGVjdWxhdGlvbkNoZWNr KQordm9pZCBTcGVjdWxhdGl2ZUpJVDo6ZW1pdE5vblN0cmluZ0NlbGxPck90aGVyQnJhbmNoKEVk Z2Ugbm9kZVVzZSwgQmxvY2tJbmRleCB0YWtlbiwgQmxvY2tJbmRleCBub3RUYWtlbiwgYm9vbCBu ZWVkU3BlY3VsYXRpb25DaGVjaykKIHsKICAgICBKU1ZhbHVlT3BlcmFuZCB2YWx1ZSh0aGlzLCBu b2RlVXNlKTsKICAgICBHUFJUZW1wb3Jhcnkgc2NyYXRjaCh0aGlzKTsKQEAgLTE4ODYsOCArMTg4 NiwzNyBAQCB2b2lkIFNwZWN1bGF0aXZlSklUOjplbWl0T2JqZWN0T3JPdGhlckJyCiAgICAgR1BS UmVnIHNjcmF0Y2hHUFIgPSBzY3JhdGNoLmdwcigpOwogICAgIAogICAgIE1hY3JvQXNzZW1ibGVy OjpKdW1wIG5vdENlbGwgPSBtX2ppdC5icmFuY2gzMihNYWNyb0Fzc2VtYmxlcjo6Tm90RXF1YWws IHZhbHVlVGFnR1BSLCBUcnVzdGVkSW1tMzIoSlNWYWx1ZTo6Q2VsbFRhZykpOwotICAgIGlmIChu ZWVkU3BlY3VsYXRpb25DaGVjaykKLSAgICAgICAgc3BlY3VsYXRpb25DaGVjayhCYWRUeXBlLCBK U1ZhbHVlUmVncyh2YWx1ZVRhZ0dQUiwgdmFsdWVQYXlsb2FkR1BSKSwgbm9kZVVzZSwgbV9qaXQu YnJhbmNoUHRyKE1hY3JvQXNzZW1ibGVyOjpOb3RFcXVhbCwgTWFjcm9Bc3NlbWJsZXI6OkFkZHJl c3ModmFsdWVQYXlsb2FkR1BSLCBKU0NlbGw6OmNsYXNzSW5mb09mZnNldCgpKSwgTWFjcm9Bc3Nl bWJsZXI6OlRydXN0ZWRJbW1QdHIoY2xhc3NJbmZvKSkpOworICAgIGlmIChtX2ppdC5ncmFwaCgp Lmdsb2JhbE9iamVjdEZvcihtX2ppdC5ncmFwaCgpW25vZGVVc2UuaW5kZXgoKV0uY29kZU9yaWdp biktPm1hc3F1ZXJhZGVzQXNVbmRlZmluZWRXYXRjaHBvaW50KCktPmlzU3RpbGxWYWxpZCgpKSB7 CisgICAgICAgIG1faml0LmdyYXBoKCkuZ2xvYmFsT2JqZWN0Rm9yKG1faml0LmdyYXBoKClbbm9k ZVVzZS5pbmRleCgpXS5jb2RlT3JpZ2luKS0+bWFzcXVlcmFkZXNBc1VuZGVmaW5lZFdhdGNocG9p bnQoKS0+YWRkKHNwZWN1bGF0aW9uV2F0Y2hwb2ludCgpKTsKKworICAgICAgICBpZiAobmVlZFNw ZWN1bGF0aW9uQ2hlY2spIHsKKyAgICAgICAgICAgIHNwZWN1bGF0aW9uQ2hlY2soQmFkVHlwZSwg SlNWYWx1ZVJlZ3ModmFsdWVUYWdHUFIsIHZhbHVlUGF5bG9hZEdQUiksIG5vZGVVc2UsIAorICAg ICAgICAgICAgICAgIG1faml0LmJyYW5jaFB0cigKKyAgICAgICAgICAgICAgICAgICAgTWFjcm9B c3NlbWJsZXI6OkVxdWFsLCAKKyAgICAgICAgICAgICAgICAgICAgTWFjcm9Bc3NlbWJsZXI6OkFk ZHJlc3ModmFsdWVQYXlsb2FkR1BSLCBKU0NlbGw6OnN0cnVjdHVyZU9mZnNldCgpKSwgCisgICAg ICAgICAgICAgICAgICAgIE1hY3JvQXNzZW1ibGVyOjpUcnVzdGVkSW1tUHRyKG1faml0Lmdsb2Jh bERhdGEoKS0+c3RyaW5nU3RydWN0dXJlLmdldCgpKSkpOworICAgICAgICB9CisgICAgfSBlbHNl IHsKKyAgICAgICAgbV9qaXQubG9hZFB0cihNYWNyb0Fzc2VtYmxlcjo6QWRkcmVzcyh2YWx1ZVBh eWxvYWRHUFIsIEpTQ2VsbDo6c3RydWN0dXJlT2Zmc2V0KCkpLCBzY3JhdGNoR1BSKTsKKworICAg ICAgICBpZiAobmVlZFNwZWN1bGF0aW9uQ2hlY2spIHsKKyAgICAgICAgICAgIHNwZWN1bGF0aW9u Q2hlY2soQmFkVHlwZSwgSlNWYWx1ZVJlZ3ModmFsdWVUYWdHUFIsIHZhbHVlUGF5bG9hZEdQUiks IG5vZGVVc2UuaW5kZXgoKSwgCisgICAgICAgICAgICAgICAgbV9qaXQuYnJhbmNoUHRyKAorICAg ICAgICAgICAgICAgICAgICBNYWNyb0Fzc2VtYmxlcjo6RXF1YWwsIAorICAgICAgICAgICAgICAg ICAgICBzY3JhdGNoR1BSLAorICAgICAgICAgICAgICAgICAgICBNYWNyb0Fzc2VtYmxlcjo6VHJ1 c3RlZEltbVB0cihtX2ppdC5nbG9iYWxEYXRhKCktPnN0cmluZ1N0cnVjdHVyZS5nZXQoKSkpKTsK KyAgICAgICAgfQorCisgICAgICAgIEpJVENvbXBpbGVyOjpKdW1wIGlzTm90TWFzcXVlcmFkZXNB c1VuZGVmaW5lZCA9IG1faml0LmJyYW5jaFRlc3Q4KEpJVENvbXBpbGVyOjpaZXJvLCBNYWNyb0Fz c2VtYmxlcjo6QWRkcmVzcyhzY3JhdGNoR1BSLCBTdHJ1Y3R1cmU6OnR5cGVJbmZvRmxhZ3NPZmZz ZXQoKSksIFRydXN0ZWRJbW0zMihNYXNxdWVyYWRlc0FzVW5kZWZpbmVkKSk7CisKKyAgICAgICAg c3BlY3VsYXRpb25DaGVjayhCYWRUeXBlLCBKU1ZhbHVlUmVncyh2YWx1ZVRhZ0dQUiwgdmFsdWVQ YXlsb2FkR1BSKSwgbm9kZVVzZS5pbmRleCgpLCAKKyAgICAgICAgICAgIG1faml0LmJyYW5jaFB0 cigKKyAgICAgICAgICAgICAgICBNYWNyb0Fzc2VtYmxlcjo6RXF1YWwsIAorICAgICAgICAgICAg ICAgIE1hY3JvQXNzZW1ibGVyOjpBZGRyZXNzKHNjcmF0Y2hHUFIsIFN0cnVjdHVyZTo6Z2xvYmFs T2JqZWN0T2Zmc2V0KCkpLCAKKyAgICAgICAgICAgICAgICBNYWNyb0Fzc2VtYmxlcjo6VHJ1c3Rl ZEltbVB0cihtX2ppdC5ncmFwaCgpLmdsb2JhbE9iamVjdEZvcihtX2ppdC5ncmFwaCgpW25vZGVV c2UuaW5kZXgoKV0uY29kZU9yaWdpbikpKSk7CisKKyAgICAgICAgaXNOb3RNYXNxdWVyYWRlc0Fz VW5kZWZpbmVkLmxpbmsoJm1faml0KTsKKyAgICB9CiAgICAganVtcCh0YWtlbiwgRm9yY2VKdW1w KTsKICAgICAKICAgICBub3RDZWxsLmxpbmsoJm1faml0KTsKQEAgLTE5MjQsMTAgKzE5NTMsOSBA QCB2b2lkIFNwZWN1bGF0aXZlSklUOjplbWl0QnJhbmNoKE5vZGUmIG5vCiAgICAgICAgIGp1bXAo bm90VGFrZW4pOwogCiAgICAgICAgIG5vUmVzdWx0KG1fY29tcGlsZUluZGV4KTsKLSAgICB9IGVs c2UgaWYgKGF0KG5vZGUuY2hpbGQxKCkpLnNob3VsZFNwZWN1bGF0ZUZpbmFsT2JqZWN0T3JPdGhl cigpKSB7Ci0gICAgICAgIGVtaXRPYmplY3RPck90aGVyQnJhbmNoKG5vZGUuY2hpbGQxKCksIHRh a2VuLCBub3RUYWtlbiwgJkpTRmluYWxPYmplY3Q6OnNfaW5mbywgIWlzRmluYWxPYmplY3RPck90 aGVyU3BlY3VsYXRpb24obV9zdGF0ZS5mb3JOb2RlKG5vZGUuY2hpbGQxKCkpLm1fdHlwZSkpOwot ICAgIH0gZWxzZSBpZiAoYXQobm9kZS5jaGlsZDEoKSkuc2hvdWxkU3BlY3VsYXRlQXJyYXlPck90 aGVyKCkpIHsKLSAgICAgICAgZW1pdE9iamVjdE9yT3RoZXJCcmFuY2gobm9kZS5jaGlsZDEoKSwg dGFrZW4sIG5vdFRha2VuLCAmSlNBcnJheTo6c19pbmZvLCAhaXNBcnJheU9yT3RoZXJTcGVjdWxh dGlvbihtX3N0YXRlLmZvck5vZGUobm9kZS5jaGlsZDEoKSkubV90eXBlKSk7CisgICAgfSBlbHNl IGlmIChhdChub2RlLmNoaWxkMSgpKS5zaG91bGRTcGVjdWxhdGVOb25TdHJpbmdDZWxsT3JPdGhl cigpKSB7CisgICAgICAgIGVtaXROb25TdHJpbmdDZWxsT3JPdGhlckJyYW5jaChub2RlLmNoaWxk MSgpLCB0YWtlbiwgbm90VGFrZW4sIAorICAgICAgICAgICAgIWlzTm9uU3RyaW5nQ2VsbE9yT3Ro ZXJTcGVjdWxhdGlvbihtX3N0YXRlLmZvck5vZGUobm9kZS5jaGlsZDEoKSkubV90eXBlKSk7CiAg ICAgfSBlbHNlIGlmIChhdChub2RlLmNoaWxkMSgpKS5zaG91bGRTcGVjdWxhdGVOdW1iZXIoKSkg ewogICAgICAgICBpZiAoYXQobm9kZS5jaGlsZDEoKSkuc2hvdWxkU3BlY3VsYXRlSW50ZWdlcigp KSB7CiAgICAgICAgICAgICBib29sIGludmVydCA9IGZhbHNlOwpJbmRleDogU291cmNlL0phdmFT Y3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVDY0LmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklUNjQuY3BwCShyZXZpc2lvbiAx MjcyOTMpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklUNjQu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xOTM3LDcgKzE5MzcsNyBAQCB2b2lkIFNwZWN1bGF0aXZl SklUOjpjb21waWxlTG9naWNhbE5vdChOCiAgICAganNWYWx1ZVJlc3VsdChyZXN1bHRHUFIsIG1f Y29tcGlsZUluZGV4LCBEYXRhRm9ybWF0SlNCb29sZWFuLCBVc2VDaGlsZHJlbkNhbGxlZEV4cGxp Y2l0bHkpOwogfQogCi12b2lkIFNwZWN1bGF0aXZlSklUOjplbWl0T2JqZWN0T3JPdGhlckJyYW5j aChFZGdlIG5vZGVVc2UsIEJsb2NrSW5kZXggdGFrZW4sIEJsb2NrSW5kZXggbm90VGFrZW4sIGNv bnN0IENsYXNzSW5mbyogY2xhc3NJbmZvLCBib29sIG5lZWRTcGVjdWxhdGlvbkNoZWNrKQordm9p ZCBTcGVjdWxhdGl2ZUpJVDo6ZW1pdE5vblN0cmluZ0NlbGxPck90aGVyQnJhbmNoKEVkZ2Ugbm9k ZVVzZSwgQmxvY2tJbmRleCB0YWtlbiwgQmxvY2tJbmRleCBub3RUYWtlbiwgYm9vbCBuZWVkU3Bl Y3VsYXRpb25DaGVjaykKIHsKICAgICBKU1ZhbHVlT3BlcmFuZCB2YWx1ZSh0aGlzLCBub2RlVXNl KTsKICAgICBHUFJUZW1wb3Jhcnkgc2NyYXRjaCh0aGlzKTsKQEAgLTE5NDUsOCArMTk0NSwzNyBA QCB2b2lkIFNwZWN1bGF0aXZlSklUOjplbWl0T2JqZWN0T3JPdGhlckJyCiAgICAgR1BSUmVnIHNj cmF0Y2hHUFIgPSBzY3JhdGNoLmdwcigpOwogICAgIAogICAgIE1hY3JvQXNzZW1ibGVyOjpKdW1w IG5vdENlbGwgPSBtX2ppdC5icmFuY2hUZXN0UHRyKE1hY3JvQXNzZW1ibGVyOjpOb25aZXJvLCB2 YWx1ZUdQUiwgR1BSSW5mbzo6dGFnTWFza1JlZ2lzdGVyKTsKLSAgICBpZiAobmVlZFNwZWN1bGF0 aW9uQ2hlY2spCi0gICAgICAgIHNwZWN1bGF0aW9uQ2hlY2soQmFkVHlwZSwgSlNWYWx1ZVJlZ3Mo dmFsdWVHUFIpLCBub2RlVXNlLmluZGV4KCksIG1faml0LmJyYW5jaFB0cihNYWNyb0Fzc2VtYmxl cjo6Tm90RXF1YWwsIE1hY3JvQXNzZW1ibGVyOjpBZGRyZXNzKHZhbHVlR1BSLCBKU0NlbGw6OmNs YXNzSW5mb09mZnNldCgpKSwgTWFjcm9Bc3NlbWJsZXI6OlRydXN0ZWRJbW1QdHIoY2xhc3NJbmZv KSkpOworICAgIGlmIChtX2ppdC5ncmFwaCgpLmdsb2JhbE9iamVjdEZvcihtX2ppdC5ncmFwaCgp W25vZGVVc2UuaW5kZXgoKV0uY29kZU9yaWdpbiktPm1hc3F1ZXJhZGVzQXNVbmRlZmluZWRXYXRj aHBvaW50KCktPmlzU3RpbGxWYWxpZCgpKSB7CisgICAgICAgIG1faml0LmdyYXBoKCkuZ2xvYmFs T2JqZWN0Rm9yKG1faml0LmdyYXBoKClbbm9kZVVzZS5pbmRleCgpXS5jb2RlT3JpZ2luKS0+bWFz cXVlcmFkZXNBc1VuZGVmaW5lZFdhdGNocG9pbnQoKS0+YWRkKHNwZWN1bGF0aW9uV2F0Y2hwb2lu dCgpKTsKKworICAgICAgICBpZiAobmVlZFNwZWN1bGF0aW9uQ2hlY2spIHsKKyAgICAgICAgICAg IHNwZWN1bGF0aW9uQ2hlY2soQmFkVHlwZSwgSlNWYWx1ZVJlZ3ModmFsdWVHUFIpLCBub2RlVXNl LmluZGV4KCksIAorICAgICAgICAgICAgICAgIG1faml0LmJyYW5jaFB0cigKKyAgICAgICAgICAg ICAgICAgICAgTWFjcm9Bc3NlbWJsZXI6OkVxdWFsLCAKKyAgICAgICAgICAgICAgICAgICAgTWFj cm9Bc3NlbWJsZXI6OkFkZHJlc3ModmFsdWVHUFIsIEpTQ2VsbDo6c3RydWN0dXJlT2Zmc2V0KCkp LAorICAgICAgICAgICAgICAgICAgICBNYWNyb0Fzc2VtYmxlcjo6VHJ1c3RlZEltbVB0cihtX2pp dC5nbG9iYWxEYXRhKCktPnN0cmluZ1N0cnVjdHVyZS5nZXQoKSkpKTsKKyAgICAgICAgfQorICAg IH0gZWxzZSB7CisgICAgICAgIG1faml0LmxvYWRQdHIoTWFjcm9Bc3NlbWJsZXI6OkFkZHJlc3Mo dmFsdWVHUFIsIEpTQ2VsbDo6c3RydWN0dXJlT2Zmc2V0KCkpLCBzY3JhdGNoR1BSKTsKKworICAg ICAgICBpZiAobmVlZFNwZWN1bGF0aW9uQ2hlY2spIHsKKyAgICAgICAgICAgIHNwZWN1bGF0aW9u Q2hlY2soQmFkVHlwZSwgSlNWYWx1ZVJlZ3ModmFsdWVHUFIpLCBub2RlVXNlLmluZGV4KCksIAor ICAgICAgICAgICAgICAgIG1faml0LmJyYW5jaFB0cigKKyAgICAgICAgICAgICAgICAgICAgTWFj cm9Bc3NlbWJsZXI6OkVxdWFsLCAKKyAgICAgICAgICAgICAgICAgICAgc2NyYXRjaEdQUiwKKyAg ICAgICAgICAgICAgICAgICAgTWFjcm9Bc3NlbWJsZXI6OlRydXN0ZWRJbW1QdHIobV9qaXQuZ2xv YmFsRGF0YSgpLT5zdHJpbmdTdHJ1Y3R1cmUuZ2V0KCkpKSk7CisgICAgICAgIH0KKworICAgICAg ICBKSVRDb21waWxlcjo6SnVtcCBpc05vdE1hc3F1ZXJhZGVzQXNVbmRlZmluZWQgPSBtX2ppdC5i cmFuY2hUZXN0OChKSVRDb21waWxlcjo6WmVybywgTWFjcm9Bc3NlbWJsZXI6OkFkZHJlc3Moc2Ny YXRjaEdQUiwgU3RydWN0dXJlOjp0eXBlSW5mb0ZsYWdzT2Zmc2V0KCkpLCBUcnVzdGVkSW1tMzIo TWFzcXVlcmFkZXNBc1VuZGVmaW5lZCkpOworCisgICAgICAgIHNwZWN1bGF0aW9uQ2hlY2soQmFk VHlwZSwgSlNWYWx1ZVJlZ3ModmFsdWVHUFIpLCBub2RlVXNlLmluZGV4KCksIAorICAgICAgICAg ICAgbV9qaXQuYnJhbmNoUHRyKAorICAgICAgICAgICAgICAgIE1hY3JvQXNzZW1ibGVyOjpFcXVh bCwgCisgICAgICAgICAgICAgICAgTWFjcm9Bc3NlbWJsZXI6OkFkZHJlc3Moc2NyYXRjaEdQUiwg U3RydWN0dXJlOjpnbG9iYWxPYmplY3RPZmZzZXQoKSksIAorICAgICAgICAgICAgICAgIE1hY3Jv QXNzZW1ibGVyOjpUcnVzdGVkSW1tUHRyKG1faml0LmdyYXBoKCkuZ2xvYmFsT2JqZWN0Rm9yKG1f aml0LmdyYXBoKClbbm9kZVVzZS5pbmRleCgpXS5jb2RlT3JpZ2luKSkpKTsKKworICAgICAgICBp c05vdE1hc3F1ZXJhZGVzQXNVbmRlZmluZWQubGluaygmbV9qaXQpOworICAgIH0KICAgICBqdW1w KHRha2VuLCBGb3JjZUp1bXApOwogICAgIAogICAgIG5vdENlbGwubGluaygmbV9qaXQpOwpAQCAt MTk2NiwxMCArMTk5NSw5IEBAIHZvaWQgU3BlY3VsYXRpdmVKSVQ6OmVtaXRCcmFuY2goTm9kZSYg bm8KICAgICBCbG9ja0luZGV4IHRha2VuID0gbm9kZS50YWtlbkJsb2NrSW5kZXgoKTsKICAgICBC bG9ja0luZGV4IG5vdFRha2VuID0gbm9kZS5ub3RUYWtlbkJsb2NrSW5kZXgoKTsKICAgICAKLSAg ICBpZiAoYXQobm9kZS5jaGlsZDEoKSkuc2hvdWxkU3BlY3VsYXRlRmluYWxPYmplY3RPck90aGVy KCkpIHsKLSAgICAgICAgZW1pdE9iamVjdE9yT3RoZXJCcmFuY2gobm9kZS5jaGlsZDEoKSwgdGFr ZW4sIG5vdFRha2VuLCAmSlNGaW5hbE9iamVjdDo6c19pbmZvLCAhaXNGaW5hbE9iamVjdE9yT3Ro ZXJTcGVjdWxhdGlvbihtX3N0YXRlLmZvck5vZGUobm9kZS5jaGlsZDEoKSkubV90eXBlKSk7Ci0g ICAgfSBlbHNlIGlmIChhdChub2RlLmNoaWxkMSgpKS5zaG91bGRTcGVjdWxhdGVBcnJheU9yT3Ro ZXIoKSkgewotICAgICAgICBlbWl0T2JqZWN0T3JPdGhlckJyYW5jaChub2RlLmNoaWxkMSgpLCB0 YWtlbiwgbm90VGFrZW4sICZKU0FycmF5OjpzX2luZm8sICFpc0FycmF5T3JPdGhlclNwZWN1bGF0 aW9uKG1fc3RhdGUuZm9yTm9kZShub2RlLmNoaWxkMSgpKS5tX3R5cGUpKTsKKyAgICBpZiAoYXQo bm9kZS5jaGlsZDEoKSkuc2hvdWxkU3BlY3VsYXRlTm9uU3RyaW5nQ2VsbE9yT3RoZXIoKSkgewor ICAgICAgICBlbWl0Tm9uU3RyaW5nQ2VsbE9yT3RoZXJCcmFuY2gobm9kZS5jaGlsZDEoKSwgdGFr ZW4sIG5vdFRha2VuLCAKKyAgICAgICAgICAgICFpc05vblN0cmluZ0NlbGxPck90aGVyU3BlY3Vs YXRpb24obV9zdGF0ZS5mb3JOb2RlKG5vZGUuY2hpbGQxKCkpLm1fdHlwZSkpOwogICAgIH0gZWxz ZSBpZiAoYXQobm9kZS5jaGlsZDEoKSkuc2hvdWxkU3BlY3VsYXRlTnVtYmVyKCkpIHsKICAgICAg ICAgaWYgKGF0KG5vZGUuY2hpbGQxKCkpLnNob3VsZFNwZWN1bGF0ZUludGVnZXIoKSkgewogICAg ICAgICAgICAgYm9vbCBpbnZlcnQgPSBmYWxzZTsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlw dENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklULmgJKHJldmlzaW9uIDEyNzI5MykKKysrIFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQuaAkod29ya2luZyBjb3B5KQpA QCAtMjA2MSw3ICsyMDYxLDcgQEAgcHVibGljOgogICAgIHZvaWQgY29tcGlsZVZhbHVlQWRkKE5v ZGUmKTsKICAgICB2b2lkIGNvbXBpbGVPYmplY3RPck90aGVyTG9naWNhbE5vdChFZGdlIHZhbHVl LCBjb25zdCBDbGFzc0luZm8qLCBib29sIG5lZWRTcGVjdWxhdGlvbkNoZWNrKTsKICAgICB2b2lk IGNvbXBpbGVMb2dpY2FsTm90KE5vZGUmKTsKLSAgICB2b2lkIGVtaXRPYmplY3RPck90aGVyQnJh bmNoKEVkZ2UgdmFsdWUsIEJsb2NrSW5kZXggdGFrZW4sIEJsb2NrSW5kZXggbm90VGFrZW4sIGNv bnN0IENsYXNzSW5mbyosIGJvb2wgbmVlZFNwZWN1bGF0aW9uQ2hlY2spOworICAgIHZvaWQgZW1p dE5vblN0cmluZ0NlbGxPck90aGVyQnJhbmNoKEVkZ2UgdmFsdWUsIEJsb2NrSW5kZXggdGFrZW4s IEJsb2NrSW5kZXggbm90VGFrZW4sIGJvb2wgbmVlZFNwZWN1bGF0aW9uQ2hlY2spOwogICAgIHZv aWQgZW1pdEJyYW5jaChOb2RlJik7CiAgICAgCiAgICAgdm9pZCBjb21waWxlSW50ZWdlckNvbXBh cmUoTm9kZSYsIE1hY3JvQXNzZW1ibGVyOjpSZWxhdGlvbmFsQ29uZGl0aW9uKTsK