89726 2012-06-21 18:19:58 -0700 op_resolve_global should not prevent DFG inlining 2012-06-21 18:33:49 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 fpizlo webkit-unassigned webkit.review.bot oldest_to_newest 655108 0 fpizlo 2012-06-21 18:19:58 -0700 Patch forthcoming. 655113 1 148935 fpizlo 2012-06-21 18:22:15 -0700 Created attachment 148935 the patch 655118 2 webkit.review.bot 2012-06-21 18:27:30 -0700 Attachment 148935 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/JavaScriptCore/ChangeLog', u'Source..." exit_code: 1 Source/JavaScriptCore/dfg/DFGOperations.h:68: DFG_OPERATION is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Total errors found: 1 in 9 files If any of these errors are false positives, please file a bug against check-webkit-style. 655127 3 fpizlo 2012-06-21 18:33:49 -0700 Landed in http://trac.webkit.org/changeset/120989 148935 2012-06-21 18:22:15 -0700 2012-06-21 18:29:58 -0700 the patch inlineresolve_patch_1.diff text/plain 11260 fpizlo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTIwOTg3KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI5IEBA CisyMDEyLTA2LTIxICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CisKKyAgICAgICAg b3BfcmVzb2x2ZV9nbG9iYWwgc2hvdWxkIG5vdCBwcmV2ZW50IERGRyBpbmxpbmluZworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODk3MjYKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGJ5dGVjb2RlL0NvZGVC bG9jay5jcHA6CisgICAgICAgIChKU0M6OkNvZGVCbG9jazo6Q29kZUJsb2NrKToKKyAgICAgICAg KEpTQzo6Q29kZUJsb2NrOjpzaHJpbmtUb0ZpdCk6CisgICAgICAgICogYnl0ZWNvZGUvR2xvYmFs UmVzb2x2ZUluZm8uaDoKKyAgICAgICAgKEpTQzo6R2xvYmFsUmVzb2x2ZUluZm86Okdsb2JhbFJl c29sdmVJbmZvKToKKyAgICAgICAgKEdsb2JhbFJlc29sdmVJbmZvKToKKyAgICAgICAgKiBkZmcv REZHQnl0ZUNvZGVQYXJzZXIuY3BwOgorICAgICAgICAoSlNDOjpERkc6OkJ5dGVDb2RlUGFyc2Vy OjpJbmxpbmVTdGFja0VudHJ5OjpJbmxpbmVTdGFja0VudHJ5KToKKyAgICAgICAgKiBkZmcvREZH Q2FwYWJpbGl0aWVzLmg6CisgICAgICAgIChKU0M6OkRGRzo6Y2FuSW5saW5lT3Bjb2RlKToKKyAg ICAgICAgKiBkZmcvREZHT3BlcmF0aW9ucy5jcHA6CisgICAgICAgICogZGZnL0RGR09wZXJhdGlv bnMuaDoKKyAgICAgICAgKiBkZmcvREZHU3BlY3VsYXRpdmVKSVQuaDoKKyAgICAgICAgKEpTQzo6 REZHOjpTcGVjdWxhdGl2ZUpJVDo6Y2FsbE9wZXJhdGlvbik6CisgICAgICAgICogZGZnL0RGR1Nw ZWN1bGF0aXZlSklUMzJfNjQuY3BwOgorICAgICAgICAoSlNDOjpERkc6OlNwZWN1bGF0aXZlSklU Ojpjb21waWxlKToKKyAgICAgICAgKiBkZmcvREZHU3BlY3VsYXRpdmVKSVQ2NC5jcHA6CisgICAg ICAgIChKU0M6OkRGRzo6U3BlY3VsYXRpdmVKSVQ6OmNvbXBpbGUpOgorCiAyMDEyLTA2LTIwICBG aWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CiAKICAgICAgICAgREZHIHNob3VsZCBpbmxp bmUgJ25ldyBBcnJheSgpJwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0Nv ZGVCbG9jay5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2Rl L0NvZGVCbG9jay5jcHAJKHJldmlzaW9uIDEyMDk3OCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9ieXRlY29kZS9Db2RlQmxvY2suY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNTgzLDcgKzE1ODMs NyBAQCBDb2RlQmxvY2s6OkNvZGVCbG9jayhDb3B5UGFyc2VkQmxvY2tUYWcsCiAgICAgLCBtX3Nv dXJjZShvdGhlci5tX3NvdXJjZSkKICAgICAsIG1fc291cmNlT2Zmc2V0KG90aGVyLm1fc291cmNl T2Zmc2V0KQogI2lmIEVOQUJMRShKSVQpCi0gICAgLCBtX2dsb2JhbFJlc29sdmVJbmZvcyhvdGhl ci5tX2dsb2JhbFJlc29sdmVJbmZvcykKKyAgICAsIG1fZ2xvYmFsUmVzb2x2ZUluZm9zKG90aGVy Lm1fZ2xvYmFsUmVzb2x2ZUluZm9zLnNpemUoKSkKICNlbmRpZgogI2lmIEVOQUJMRShWQUxVRV9Q Uk9GSUxFUikKICAgICAsIG1fZXhlY3V0aW9uRW50cnlDb3VudCgwKQpAQCAtMTYwOSw2ICsxNjA5 LDExIEBAIENvZGVCbG9jazo6Q29kZUJsb2NrKENvcHlQYXJzZWRCbG9ja1RhZywKICAgICBvcHRp bWl6ZUFmdGVyV2FybVVwKCk7CiAgICAgaml0QWZ0ZXJXYXJtVXAoKTsKIAorI2lmIEVOQUJMRShK SVQpCisgICAgZm9yICh1bnNpZ25lZCBpID0gbV9nbG9iYWxSZXNvbHZlSW5mb3Muc2l6ZSgpOyBp LS07KQorICAgICAgICBtX2dsb2JhbFJlc29sdmVJbmZvc1tpXSA9IEdsb2JhbFJlc29sdmVJbmZv KG90aGVyLm1fZ2xvYmFsUmVzb2x2ZUluZm9zW2ldLmJ5dGVjb2RlT2Zmc2V0KTsKKyNlbmRpZgor CiAgICAgaWYgKG90aGVyLm1fcmFyZURhdGEpIHsKICAgICAgICAgY3JlYXRlUmFyZURhdGFJZk5l Y2Vzc2FyeSgpOwogICAgICAgICAKQEAgLTIyNzMsNyArMjI3OCw4IEBAIHZvaWQgQ29kZUJsb2Nr OjpzaHJpbmtUb0ZpdChTaHJpbmtNb2RlIHMKICNlbmRpZgogI2lmIEVOQUJMRShKSVQpCiAgICAg bV9zdHJ1Y3R1cmVTdHViSW5mb3Muc2hyaW5rVG9GaXQoKTsKLSAgICBtX2dsb2JhbFJlc29sdmVJ bmZvcy5zaHJpbmtUb0ZpdCgpOworICAgIGlmIChzaHJpbmtNb2RlID09IEVhcmx5U2hyaW5rKQor ICAgICAgICBtX2dsb2JhbFJlc29sdmVJbmZvcy5zaHJpbmtUb0ZpdCgpOwogICAgIG1fY2FsbExp bmtJbmZvcy5zaHJpbmtUb0ZpdCgpOwogICAgIG1fbWV0aG9kQ2FsbExpbmtJbmZvcy5zaHJpbmtU b0ZpdCgpOwogI2VuZGlmCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvR2xv YmFsUmVzb2x2ZUluZm8uaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0 ZWNvZGUvR2xvYmFsUmVzb2x2ZUluZm8uaAkocmV2aXNpb24gMTIwOTc4KQorKysgU291cmNlL0ph dmFTY3JpcHRDb3JlL2J5dGVjb2RlL0dsb2JhbFJlc29sdmVJbmZvLmgJKHdvcmtpbmcgY29weSkK QEAgLTMxLDYgKzMxLDggQEAKIG5hbWVzcGFjZSBKU0MgewogCiBzdHJ1Y3QgR2xvYmFsUmVzb2x2 ZUluZm8geworICAgIEdsb2JhbFJlc29sdmVJbmZvKCkgeyB9CisgICAgCiAgICAgR2xvYmFsUmVz b2x2ZUluZm8odW5zaWduZWQgYnl0ZWNvZGVPZmZzZXQpCiAgICAgICAgIDogb2Zmc2V0KDApCiAg ICAgICAgICwgYnl0ZWNvZGVPZmZzZXQoYnl0ZWNvZGVPZmZzZXQpCkBAIC0zOSw3ICs0MSw3IEBA IHN0cnVjdCBHbG9iYWxSZXNvbHZlSW5mbyB7CiAgICAgCiAgICAgV3JpdGVCYXJyaWVyPFN0cnVj dHVyZT4gc3RydWN0dXJlOwogICAgIHVuc2lnbmVkIG9mZnNldDsKLSAgICB1bnNpZ25lZCBieXRl Y29kZU9mZnNldDsKKyAgICB1bnNpZ25lZCBieXRlY29kZU9mZnNldDsgLy8gT25seSB2YWxpZCBp biBvbGQgSklUIGNvZGUuIFRoaXMgbWVhbnMgbm90aGluZyBpbiB0aGUgREZHLgogfTsKIAogaW5s aW5lIHVuc2lnbmVkIGdldEdsb2JhbFJlc29sdmVJbmZvQnl0ZWNvZGVPZmZzZXQoR2xvYmFsUmVz b2x2ZUluZm8qIGdsb2JhbFJlc29sdmVJbmZvKQpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3Jl L2RmZy9ERkdCeXRlQ29kZVBhcnNlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3Jp cHRDb3JlL2RmZy9ERkdCeXRlQ29kZVBhcnNlci5jcHAJKHJldmlzaW9uIDEyMDk3OCkKKysrIFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQnl0ZUNvZGVQYXJzZXIuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0zMTcyLDYgKzMxNzIsOCBAQCBCeXRlQ29kZVBhcnNlcjo6SW5saW5lU3RhY2tFbnRy eTo6SW5saW5lCiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBtX2NvbnN0YW50UmVtYXBbaV0g PSByZXN1bHQuaXRlcmF0b3ItPnNlY29uZDsKICAgICAgICAgfQorICAgICAgICBmb3IgKHVuc2ln bmVkIGkgPSAwOyBpIDwgY29kZUJsb2NrLT5udW1iZXJPZkdsb2JhbFJlc29sdmVJbmZvcygpOyAr K2kpCisgICAgICAgICAgICBieXRlQ29kZVBhcnNlci0+bV9jb2RlQmxvY2stPmFkZEdsb2JhbFJl c29sdmVJbmZvKHN0ZDo6bnVtZXJpY19saW1pdHM8dW5zaWduZWQ+OjptYXgoKSk7CiAgICAgICAg IAogICAgICAgICBtX2NhbGxzaXRlQmxvY2tIZWFkTmVlZHNMaW5raW5nID0gdHJ1ZTsKICAgICB9 IGVsc2UgewpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdDYXBhYmlsaXRpZXMu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0NhcGFiaWxpdGll cy5oCShyZXZpc2lvbiAxMjA5NzgpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0Nh cGFiaWxpdGllcy5oCSh3b3JraW5nIGNvcHkpCkBAIC0xOTMsNyArMTkzLDYgQEAgaW5saW5lIGJv b2wgY2FuSW5saW5lT3Bjb2RlKE9wY29kZUlEIG9wYwogICAgIGNhc2Ugb3BfcHV0X3Njb3BlZF92 YXI6CiAgICAgY2FzZSBvcF9yZXNvbHZlOgogICAgIGNhc2Ugb3BfcmVzb2x2ZV9iYXNlOgotICAg IGNhc2Ugb3BfcmVzb2x2ZV9nbG9iYWw6CiAgICAgICAgIAogICAgIC8vIENvbnN0YW50IGJ1ZmZl cnMgYXJlbid0IGNvcGllZCBjb3JyZWN0bHkuIFRoaXMgaXMgZWFzeSB0byBmaXgsIGJ1dCBmb3IK ICAgICAvLyBub3cgd2UganVzdCBkaXNhYmxlIGlubGluaW5nIGZvciBmdW5jdGlvbnMgdGhhdCB1 c2UgdGhlbS4KSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHT3BlcmF0aW9ucy5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdPcGVyYXRpb25z LmNwcAkocmV2aXNpb24gMTIwOTc4KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdP cGVyYXRpb25zLmNwcAkod29ya2luZyBjb3B5KQpAQCAtOTY4LDEzICs5NjgsMTEgQEAgRW5jb2Rl ZEpTVmFsdWUgREZHX09QRVJBVElPTiBvcGVyYXRpb25SZQogICAgIHJldHVybiBKU1ZhbHVlOjpl bmNvZGUoYmFzZSk7CiB9CiAKLUVuY29kZWRKU1ZhbHVlIERGR19PUEVSQVRJT04gb3BlcmF0aW9u UmVzb2x2ZUdsb2JhbChFeGVjU3RhdGUqIGV4ZWMsIEdsb2JhbFJlc29sdmVJbmZvKiByZXNvbHZl SW5mbywgSWRlbnRpZmllciogcHJvcGVydHlOYW1lKQorRW5jb2RlZEpTVmFsdWUgREZHX09QRVJB VElPTiBvcGVyYXRpb25SZXNvbHZlR2xvYmFsKEV4ZWNTdGF0ZSogZXhlYywgR2xvYmFsUmVzb2x2 ZUluZm8qIHJlc29sdmVJbmZvLCBKU0dsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0LCBJZGVudGlm aWVyKiBwcm9wZXJ0eU5hbWUpCiB7CiAgICAgSlNHbG9iYWxEYXRhKiBnbG9iYWxEYXRhID0gJmV4 ZWMtPmdsb2JhbERhdGEoKTsKICAgICBOYXRpdmVDYWxsRnJhbWVUcmFjZXIgdHJhY2VyKGdsb2Jh bERhdGEsIGV4ZWMpOwogICAgIAotICAgIEpTR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3QgPSBl eGVjLT5sZXhpY2FsR2xvYmFsT2JqZWN0KCk7Ci0KICAgICBQcm9wZXJ0eVNsb3Qgc2xvdChnbG9i YWxPYmplY3QpOwogICAgIGlmIChnbG9iYWxPYmplY3QtPmdldFByb3BlcnR5U2xvdChleGVjLCAq cHJvcGVydHlOYW1lLCBzbG90KSkgewogICAgICAgICBKU1ZhbHVlIHJlc3VsdCA9IHNsb3QuZ2V0 VmFsdWUoZXhlYywgKnByb3BlcnR5TmFtZSk7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUv ZGZnL0RGR09wZXJhdGlvbnMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUv ZGZnL0RGR09wZXJhdGlvbnMuaAkocmV2aXNpb24gMTIwOTc4KQorKysgU291cmNlL0phdmFTY3Jp cHRDb3JlL2RmZy9ERkdPcGVyYXRpb25zLmgJKHdvcmtpbmcgY29weSkKQEAgLTY1LDcgKzY1LDcg QEAgdHlwZWRlZiBFbmNvZGVkSlNWYWx1ZSBERkdfT1BFUkFUSU9OICgqSgogdHlwZWRlZiBFbmNv ZGVkSlNWYWx1ZSBERkdfT1BFUkFUSU9OICgqSl9ERkdPcGVyYXRpb25fRUNDKShFeGVjU3RhdGUq LCBKU0NlbGwqLCBKU0NlbGwqKTsKIHR5cGVkZWYgRW5jb2RlZEpTVmFsdWUgREZHX09QRVJBVElP TiAoKkpfREZHT3BlcmF0aW9uX0VDSSkoRXhlY1N0YXRlKiwgSlNDZWxsKiwgSWRlbnRpZmllciop OwogdHlwZWRlZiBFbmNvZGVkSlNWYWx1ZSBERkdfT1BFUkFUSU9OICgqSl9ERkdPcGVyYXRpb25f RUNKKShFeGVjU3RhdGUqLCBKU0NlbGwqLCBFbmNvZGVkSlNWYWx1ZSk7Ci10eXBlZGVmIEVuY29k ZWRKU1ZhbHVlIERGR19PUEVSQVRJT04gKCpKX0RGR09wZXJhdGlvbl9FR0kpKEV4ZWNTdGF0ZSos IEdsb2JhbFJlc29sdmVJbmZvKiwgSWRlbnRpZmllciopOwordHlwZWRlZiBFbmNvZGVkSlNWYWx1 ZSBERkdfT1BFUkFUSU9OICgqSl9ERkdPcGVyYXRpb25fRUdyaUpzZ0kpKEV4ZWNTdGF0ZSosIEds b2JhbFJlc29sdmVJbmZvKiwgSlNHbG9iYWxPYmplY3QqLCBJZGVudGlmaWVyKik7CiB0eXBlZGVm IEVuY29kZWRKU1ZhbHVlIERGR19PUEVSQVRJT04gKCpKX0RGR09wZXJhdGlvbl9FSSkoRXhlY1N0 YXRlKiwgSWRlbnRpZmllciopOwogdHlwZWRlZiBFbmNvZGVkSlNWYWx1ZSBERkdfT1BFUkFUSU9O ICgqSl9ERkdPcGVyYXRpb25fRUopKEV4ZWNTdGF0ZSosIEVuY29kZWRKU1ZhbHVlKTsKIHR5cGVk ZWYgRW5jb2RlZEpTVmFsdWUgREZHX09QRVJBVElPTiAoKkpfREZHT3BlcmF0aW9uX0VKQSkoRXhl Y1N0YXRlKiwgRW5jb2RlZEpTVmFsdWUsIEpTQXJyYXkqKTsKQEAgLTEyMSw3ICsxMjEsNyBAQCB2 b2lkIERGR19PUEVSQVRJT04gb3BlcmF0aW9uTm90aWZ5R2xvYmFsCiBFbmNvZGVkSlNWYWx1ZSBE RkdfT1BFUkFUSU9OIG9wZXJhdGlvblJlc29sdmUoRXhlY1N0YXRlKiwgSWRlbnRpZmllciopIFdU Rl9JTlRFUk5BTDsKIEVuY29kZWRKU1ZhbHVlIERGR19PUEVSQVRJT04gb3BlcmF0aW9uUmVzb2x2 ZUJhc2UoRXhlY1N0YXRlKiwgSWRlbnRpZmllciopIFdURl9JTlRFUk5BTDsKIEVuY29kZWRKU1Zh bHVlIERGR19PUEVSQVRJT04gb3BlcmF0aW9uUmVzb2x2ZUJhc2VTdHJpY3RQdXQoRXhlY1N0YXRl KiwgSWRlbnRpZmllciopIFdURl9JTlRFUk5BTDsKLUVuY29kZWRKU1ZhbHVlIERGR19PUEVSQVRJ T04gb3BlcmF0aW9uUmVzb2x2ZUdsb2JhbChFeGVjU3RhdGUqLCBHbG9iYWxSZXNvbHZlSW5mbyos IElkZW50aWZpZXIqKSBXVEZfSU5URVJOQUw7CitFbmNvZGVkSlNWYWx1ZSBERkdfT1BFUkFUSU9O IG9wZXJhdGlvblJlc29sdmVHbG9iYWwoRXhlY1N0YXRlKiwgR2xvYmFsUmVzb2x2ZUluZm8qLCBK U0dsb2JhbE9iamVjdCosIElkZW50aWZpZXIqKSBXVEZfSU5URVJOQUw7CiBFbmNvZGVkSlNWYWx1 ZSBERkdfT1BFUkFUSU9OIG9wZXJhdGlvblRvUHJpbWl0aXZlKEV4ZWNTdGF0ZSosIEVuY29kZWRK U1ZhbHVlKSBXVEZfSU5URVJOQUw7CiBFbmNvZGVkSlNWYWx1ZSBERkdfT1BFUkFUSU9OIG9wZXJh dGlvblN0ckNhdChFeGVjU3RhdGUqLCB2b2lkKiwgc2l6ZV90KSBXVEZfSU5URVJOQUw7CiBFbmNv ZGVkSlNWYWx1ZSBERkdfT1BFUkFUSU9OIG9wZXJhdGlvbk5ld0FycmF5KEV4ZWNTdGF0ZSosIHZv aWQqLCBzaXplX3QpIFdURl9JTlRFUk5BTDsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9k ZmcvREZHU3BlY3VsYXRpdmVKSVQzMl82NC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFT Y3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVDMyXzY0LmNwcAkocmV2aXNpb24gMTIwOTc4 KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVDMyXzY0LmNw cAkod29ya2luZyBjb3B5KQpAQCAtMzg0MCw3ICszODQwLDcgQEAgdm9pZCBTcGVjdWxhdGl2ZUpJ VDo6Y29tcGlsZShOb2RlJiBub2RlKQogICAgICAgICBhZGRTbG93UGF0aEdlbmVyYXRvcigKICAg ICAgICAgICAgIHNsb3dQYXRoQ2FsbCgKICAgICAgICAgICAgICAgICBzdHJ1Y3R1cmVzTm90TWF0 Y2gsIHRoaXMsIG9wZXJhdGlvblJlc29sdmVHbG9iYWwsCi0gICAgICAgICAgICAgICAgSlNWYWx1 ZVJlZ3MocmVzdWx0VGFnR1BSLCByZXN1bHRQYXlsb2FkR1BSKSwgcmVzb2x2ZUluZm9HUFIsCisg ICAgICAgICAgICAgICAgSlNWYWx1ZVJlZ3MocmVzdWx0VGFnR1BSLCByZXN1bHRQYXlsb2FkR1BS KSwgcmVzb2x2ZUluZm9HUFIsIGdsb2JhbE9iamVjdEdQUiwKICAgICAgICAgICAgICAgICAmbV9q aXQuY29kZUJsb2NrKCktPmlkZW50aWZpZXIoZGF0YS5pZGVudGlmaWVyTnVtYmVyKSkpOwogCiAg ICAgICAgIGpzVmFsdWVSZXN1bHQocmVzdWx0VGFnR1BSLCByZXN1bHRQYXlsb2FkR1BSLCBtX2Nv bXBpbGVJbmRleCk7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0 aXZlSklUNjQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZH U3BlY3VsYXRpdmVKSVQ2NC5jcHAJKHJldmlzaW9uIDEyMDk3OCkKKysrIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQ2NC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM4 NDMsMTEgKzM4NDMsMTEgQEAgdm9pZCBTcGVjdWxhdGl2ZUpJVDo6Y29tcGlsZShOb2RlJiBub2Rl KQogICAgICAgICBtX2ppdC5sb2FkUHRyKEpJVENvbXBpbGVyOjpBZGRyZXNzKGdsb2JhbE9iamVj dEdQUiwgSlNPYmplY3Q6Om9mZnNldE9mUHJvcGVydHlTdG9yYWdlKCkpLCByZXN1bHRHUFIpOwog ICAgICAgICBtX2ppdC5sb2FkMzIoSklUQ29tcGlsZXI6OkFkZHJlc3MocmVzb2x2ZUluZm9HUFIs IE9CSkVDVF9PRkZTRVRPRihHbG9iYWxSZXNvbHZlSW5mbywgb2Zmc2V0KSksIHJlc29sdmVJbmZv R1BSKTsKICAgICAgICAgbV9qaXQubG9hZFB0cihKSVRDb21waWxlcjo6QmFzZUluZGV4KHJlc3Vs dEdQUiwgcmVzb2x2ZUluZm9HUFIsIEpJVENvbXBpbGVyOjpTY2FsZVB0ciksIHJlc3VsdEdQUik7 Ci0KKyAgICAgICAgCiAgICAgICAgIGFkZFNsb3dQYXRoR2VuZXJhdG9yKAogICAgICAgICAgICAg c2xvd1BhdGhDYWxsKAogICAgICAgICAgICAgICAgIHN0cnVjdHVyZXNEb250TWF0Y2gsIHRoaXMs IG9wZXJhdGlvblJlc29sdmVHbG9iYWwsCi0gICAgICAgICAgICAgICAgcmVzdWx0R1BSLCByZXNv bHZlSW5mb0dQUiwKKyAgICAgICAgICAgICAgICByZXN1bHRHUFIsIHJlc29sdmVJbmZvR1BSLCBn bG9iYWxPYmplY3RHUFIsCiAgICAgICAgICAgICAgICAgJm1faml0LmNvZGVCbG9jaygpLT5pZGVu dGlmaWVyKGRhdGEuaWRlbnRpZmllck51bWJlcikpKTsKIAogICAgICAgICBqc1ZhbHVlUmVzdWx0 KHJlc3VsdEdQUiwgbV9jb21waWxlSW5kZXgpOwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3Jl L2RmZy9ERkdTcGVjdWxhdGl2ZUpJVC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQuaAkocmV2aXNpb24gMTIwOTc4KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVC5oCSh3b3JraW5nIGNvcHkpCkBA IC0xMjI5LDkgKzEyMjksOSBAQCBwdWJsaWM6CiAgICAgICAgIG1faml0Lnplcm9FeHRlbmQzMlRv UHRyKEdQUkluZm86OnJldHVyblZhbHVlR1BSLCByZXN1bHQpOwogICAgICAgICByZXR1cm4gY2Fs bDsKICAgICB9Ci0gICAgSklUQ29tcGlsZXI6OkNhbGwgY2FsbE9wZXJhdGlvbihKX0RGR09wZXJh dGlvbl9FR0kgb3BlcmF0aW9uLCBHUFJSZWcgcmVzdWx0LCBHUFJSZWcgYXJnMSwgSWRlbnRpZmll ciogaWRlbnRpZmllcikKKyAgICBKSVRDb21waWxlcjo6Q2FsbCBjYWxsT3BlcmF0aW9uKEpfREZH T3BlcmF0aW9uX0VHcmlKc2dJIG9wZXJhdGlvbiwgR1BSUmVnIHJlc3VsdCwgR1BSUmVnIGFyZzEs IEdQUlJlZyBhcmcyLCBJZGVudGlmaWVyKiBpZGVudGlmaWVyKQogICAgIHsKLSAgICAgICAgbV9q aXQuc2V0dXBBcmd1bWVudHNXaXRoRXhlY1N0YXRlKGFyZzEsIFRydXN0ZWRJbW1QdHIoaWRlbnRp ZmllcikpOworICAgICAgICBtX2ppdC5zZXR1cEFyZ3VtZW50c1dpdGhFeGVjU3RhdGUoYXJnMSwg YXJnMiwgVHJ1c3RlZEltbVB0cihpZGVudGlmaWVyKSk7CiAgICAgICAgIHJldHVybiBhcHBlbmRD YWxsV2l0aEV4Y2VwdGlvbkNoZWNrU2V0UmVzdWx0KG9wZXJhdGlvbiwgcmVzdWx0KTsKICAgICB9 CiAgICAgSklUQ29tcGlsZXI6OkNhbGwgY2FsbE9wZXJhdGlvbihKX0RGR09wZXJhdGlvbl9FSSBv cGVyYXRpb24sIEdQUlJlZyByZXN1bHQsIElkZW50aWZpZXIqIGlkZW50aWZpZXIpCkBAIC0xNDgy LDkgKzE0ODIsOSBAQCBwdWJsaWM6CiAgICAgICAgIG1faml0LnNldHVwQXJndW1lbnRzV2l0aEV4 ZWNTdGF0ZShhcmcxLCBUcnVzdGVkSW1tUHRyKHBvaW50ZXIpKTsKICAgICAgICAgcmV0dXJuIGFw cGVuZENhbGxXaXRoRXhjZXB0aW9uQ2hlY2tTZXRSZXN1bHQob3BlcmF0aW9uLCByZXN1bHRQYXls b2FkLCByZXN1bHRUYWcpOwogICAgIH0KLSAgICBKSVRDb21waWxlcjo6Q2FsbCBjYWxsT3BlcmF0 aW9uKEpfREZHT3BlcmF0aW9uX0VHSSBvcGVyYXRpb24sIEdQUlJlZyByZXN1bHRUYWcsIEdQUlJl ZyByZXN1bHRQYXlsb2FkLCBHUFJSZWcgYXJnMSwgSWRlbnRpZmllciogaWRlbnRpZmllcikKKyAg ICBKSVRDb21waWxlcjo6Q2FsbCBjYWxsT3BlcmF0aW9uKEpfREZHT3BlcmF0aW9uX0VHcmlKc2dJ IG9wZXJhdGlvbiwgR1BSUmVnIHJlc3VsdFRhZywgR1BSUmVnIHJlc3VsdFBheWxvYWQsIEdQUlJl ZyBhcmcxLCBHUFJSZWcgYXJnMiwgSWRlbnRpZmllciogaWRlbnRpZmllcikKICAgICB7Ci0gICAg ICAgIG1faml0LnNldHVwQXJndW1lbnRzV2l0aEV4ZWNTdGF0ZShhcmcxLCBUcnVzdGVkSW1tUHRy KGlkZW50aWZpZXIpKTsKKyAgICAgICAgbV9qaXQuc2V0dXBBcmd1bWVudHNXaXRoRXhlY1N0YXRl KGFyZzEsIGFyZzIsIFRydXN0ZWRJbW1QdHIoaWRlbnRpZmllcikpOwogICAgICAgICByZXR1cm4g YXBwZW5kQ2FsbFdpdGhFeGNlcHRpb25DaGVja1NldFJlc3VsdChvcGVyYXRpb24sIHJlc3VsdFBh eWxvYWQsIHJlc3VsdFRhZyk7CiAgICAgfQogICAgIEpJVENvbXBpbGVyOjpDYWxsIGNhbGxPcGVy YXRpb24oSl9ERkdPcGVyYXRpb25fRVAgb3BlcmF0aW9uLCBHUFJSZWcgcmVzdWx0VGFnLCBHUFJS ZWcgcmVzdWx0UGF5bG9hZCwgR1BSUmVnIGFyZzEpCg==