127567 2014-01-24 10:43:15 -0800 Skip op_profiler callbacks if !VM::m_enabledProfiler 2014-01-24 13:20:18 -0800 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mark.lam mark.lam fpizlo ggaren joepeck mhahnenberg msaboff oliver timothy oldest_to_newest 971650 0 mark.lam 2014-01-24 10:43:15 -0800 The profiler may not be always active (recording). When it's not active (as in VM::m_enabledProfiler is null), then we might as well skip the op_profiler callbacks. The callbacks themselves are already gated by a VM::enabledProfiler() check. For the DFG, we'll turn the op_profiler handling into speculation checks and OSR exit to the baseline JIT if the profiler becomes active. 971662 1 222121 mark.lam 2014-01-24 11:11:59 -0800 Created attachment 222121 the patch. 971668 2 222121 ggaren 2014-01-24 11:20:53 -0800 Comment on attachment 222121 the patch. r=me Any speedup here? 971669 3 ggaren 2014-01-24 11:21:14 -0800 Ah, I see: "This brings the Octane score up to ~3000 from ~2840." 971726 4 mark.lam 2014-01-24 13:20:18 -0800 Thanks. The patch has passed the layout tests. Landed in r162718: <http://trac.webkit.org/r162718>. 222121 2014-01-24 11:11:59 -0800 2014-01-24 11:20:52 -0800 the patch. bug-127567.patch text/plain 11597 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTYyNzExKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQyIEBA CisyMDE0LTAxLTI0ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBT a2lwIG9wX3Byb2ZpbGVyIGNhbGxiYWNrcyBpZiAhVk06Om1fZW5hYmxlZFByb2ZpbGVyLgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI3NTY3LgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBwcm9maWxl ciBtYXkgbm90IGJlIGFsd2F5cyBhY3RpdmUgKHJlY29yZGluZykuIFdoZW4gaXQncyBub3QgYWN0 aXZlCisgICAgICAgIChhcyBpbiBWTTo6bV9lbmFibGVkUHJvZmlsZXIgaXMgbnVsbCksIHRoZW4g d2UgbWlnaHQgYXMgd2VsbCBza2lwIHRoZQorICAgICAgICBvcF9wcm9maWxlciBjYWxsYmFja3Mu IFRoZSBjYWxsYmFja3MgdGhlbXNlbHZlcyB3ZXJlIGFscmVhZHkgcHJldmlvdXNseQorICAgICAg ICBnYXRlZCBieSBhIFZNOjplbmFibGVkUHJvZmlsZXIoKSBjaGVjay4gU28sIHRoaXMgY2hhbmdl IGRvZXMgbm90IGNoYW5nZQorICAgICAgICBhbnkgcHJvZmlsZXIgYmVoYXZpb3IuCisKKyAgICAg ICAgRm9yIHRoZSBERkcsIHdlJ2xsIHR1cm4gdGhlIG9wX3Byb2ZpbGVyIGhhbmRsaW5nIGludG8g c3BlY3VsYXRpb24gY2hlY2tzCisgICAgICAgIGFuZCBPU1IgZXhpdCB0byB0aGUgYmFzZWxpbmUg SklUIGlmIHRoZSBwcm9maWxlciBiZWNvbWVzIGFjdGl2ZS4KKworICAgICAgICBUaGlzIGJyaW5n cyB0aGUgT2N0YW5lIHNjb3JlIHVwIHRvIH4zMDAwIGZyb20gfjI4NDAuCisKKyAgICAgICAgKiBk ZmcvREZHQWJzdHJhY3RJbnRlcnByZXRlcklubGluZXMuaDoKKyAgICAgICAgKEpTQzo6REZHOjpB YnN0cmFjdEludGVycHJldGVyPEFic3RyYWN0U3RhdGVUeXBlPjo6ZXhlY3V0ZUVmZmVjdHMpOgor ICAgICAgICAqIGRmZy9ERkdCeXRlQ29kZVBhcnNlci5jcHA6CisgICAgICAgIChKU0M6OkRGRzo6 Qnl0ZUNvZGVQYXJzZXI6OnBhcnNlQmxvY2spOgorICAgICAgICAqIGRmZy9ERkdDbG9iYmVyaXpl Lmg6CisgICAgICAgIChKU0M6OkRGRzo6Y2xvYmJlcml6ZSk6CisgICAgICAgICogZGZnL0RGR05v ZGVUeXBlLmg6CisgICAgICAgICogZGZnL0RGR1NwZWN1bGF0aXZlSklUMzJfNjQuY3BwOgorICAg ICAgICAoSlNDOjpERkc6OlNwZWN1bGF0aXZlSklUOjpjb21waWxlKToKKyAgICAgICAgKiBkZmcv REZHU3BlY3VsYXRpdmVKSVQ2NC5jcHA6CisgICAgICAgIChKU0M6OkRGRzo6U3BlY3VsYXRpdmVK SVQ6OmNvbXBpbGUpOgorICAgICAgICAqIGppdC9KSVRPcGNvZGVzLmNwcDoKKyAgICAgICAgKEpT Qzo6SklUOjplbWl0X29wX3Byb2ZpbGVfd2lsbF9jYWxsKToKKyAgICAgICAgKEpTQzo6SklUOjpl bWl0X29wX3Byb2ZpbGVfZGlkX2NhbGwpOgorICAgICAgICAqIGppdC9KSVRPcGNvZGVzMzJfNjQu Y3BwOgorICAgICAgICAoSlNDOjpKSVQ6OmVtaXRfb3BfcHJvZmlsZV93aWxsX2NhbGwpOgorICAg ICAgICAoSlNDOjpKSVQ6OmVtaXRfb3BfcHJvZmlsZV9kaWRfY2FsbCk6CisgICAgICAgICogbGxp bnQvTG93TGV2ZWxJbnRlcnByZXRlci5hc206CisgICAgICAgICogcnVudGltZS9WTS5oOgorICAg ICAgICAoSlNDOjpWTTo6ZW5hYmxlZFByb2ZpbGVyQWRkcmVzcyk6CisKIDIwMTQtMDEtMjQgIE1h cmsgTGFtICA8bWFyay5sYW1AYXBwbGUuY29tPgogCiAgICAgICAgIFJlbW92aW5nIHRoZSBuZWVk IGZvciBEZWJ1Z2dlciogYW5kIG1fc2hvdWxkUGF1c2Ugb3BfZGVidWcgY2hlY2suCkluZGV4OiBT b3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0Fic3RyYWN0SW50ZXJwcmV0ZXJJbmxpbmVzLmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdBYnN0cmFjdEludGVy cHJldGVySW5saW5lcy5oCShyZXZpc2lvbiAxNjI3MTEpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENv cmUvZGZnL0RGR0Fic3RyYWN0SW50ZXJwcmV0ZXJJbmxpbmVzLmgJKHdvcmtpbmcgY29weSkKQEAg LTE3NTUsMTIgKzE3NTUsMTIgQEAgYm9vbCBBYnN0cmFjdEludGVycHJldGVyPEFic3RyYWN0U3Rh dGVUeQogICAgICAgICBicmVhazsKIAogICAgIGNhc2UgQnJlYWtwb2ludDoKKyAgICBjYXNlIFBy b2ZpbGVXaWxsQ2FsbDoKKyAgICBjYXNlIFByb2ZpbGVEaWRDYWxsOgogICAgIGNhc2UgQ2hlY2tX YXRjaGRvZ1RpbWVyOgogICAgICAgICBub2RlLT5zZXRDYW5FeGl0KHRydWUpOwogICAgICAgICBi cmVhazsKIAotICAgIGNhc2UgUHJvZmlsZVdpbGxDYWxsOgotICAgIGNhc2UgUHJvZmlsZURpZENh bGw6CiAgICAgY2FzZSBQaGFudG9tOgogICAgIGNhc2UgQ2hlY2s6CiAgICAgY2FzZSBDb3VudEV4 ZWN1dGlvbjoKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQnl0ZUNvZGVQYXJz ZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQnl0ZUNv ZGVQYXJzZXIuY3BwCShyZXZpc2lvbiAxNjI3MTEpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUv ZGZnL0RGR0J5dGVDb2RlUGFyc2VyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMSw0ICsxLDQgQEAK LS8qCisgLyoKICAqIENvcHlyaWdodCAoQykgMjAxMSwgMjAxMiwgMjAxMywgMjAxNCBBcHBsZSBJ bmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBp biBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CkBAIC0yMTUxLDE0ICsy MTUxLDEyIEBAIGJvb2wgQnl0ZUNvZGVQYXJzZXI6OnBhcnNlQmxvY2sodW5zaWduZWQKICAgICAg ICAgICAgIE5FWFRfT1BDT0RFKG9wX2RlYnVnKTsKIAogICAgICAgICBjYXNlIG9wX3Byb2ZpbGVf d2lsbF9jYWxsOiB7Ci0gICAgICAgICAgICBOb2RlKiBwcm9maWxlID0gZ2V0KFZpcnR1YWxSZWdp c3RlcihjdXJyZW50SW5zdHJ1Y3Rpb25bMV0udS5vcGVyYW5kKSk7Ci0gICAgICAgICAgICBhZGRU b0dyYXBoKFByb2ZpbGVXaWxsQ2FsbCwgcHJvZmlsZSk7CisgICAgICAgICAgICBhZGRUb0dyYXBo KFByb2ZpbGVXaWxsQ2FsbCk7CiAgICAgICAgICAgICBORVhUX09QQ09ERShvcF9wcm9maWxlX3dp bGxfY2FsbCk7CiAgICAgICAgIH0KIAogICAgICAgICBjYXNlIG9wX3Byb2ZpbGVfZGlkX2NhbGw6 IHsKLSAgICAgICAgICAgIE5vZGUqIHByb2ZpbGUgPSBnZXQoVmlydHVhbFJlZ2lzdGVyKGN1cnJl bnRJbnN0cnVjdGlvblsxXS51Lm9wZXJhbmQpKTsKLSAgICAgICAgICAgIGFkZFRvR3JhcGgoUHJv ZmlsZURpZENhbGwsIHByb2ZpbGUpOworICAgICAgICAgICAgYWRkVG9HcmFwaChQcm9maWxlRGlk Q2FsbCk7CiAgICAgICAgICAgICBORVhUX09QQ09ERShvcF9wcm9maWxlX2RpZF9jYWxsKTsKICAg ICAgICAgfQogCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0Nsb2JiZXJpemUu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0Nsb2JiZXJpemUu aAkocmV2aXNpb24gMTYyNzExKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdDbG9i YmVyaXplLmgJKHdvcmtpbmcgY29weSkKQEAgLTEsNCArMSw0IEBACi0vKgorIC8qCiAgKiBDb3B5 cmlnaHQgKEMpIDIwMTMsIDIwMTQgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoK ICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdp dGggb3Igd2l0aG91dApAQCAtMTM5LDggKzEzOSw2IEBAIHZvaWQgY2xvYmJlcml6ZShHcmFwaCYg Z3JhcGgsIE5vZGUqIG5vZGUKICAgICBjYXNlIEZsdXNoOgogICAgIGNhc2UgUGhhbnRvbUxvY2Fs OgogICAgIGNhc2UgU2V0QXJndW1lbnQ6Ci0gICAgY2FzZSBQcm9maWxlV2lsbENhbGw6Ci0gICAg Y2FzZSBQcm9maWxlRGlkQ2FsbDoKICAgICBjYXNlIFBoYW50b21Bcmd1bWVudHM6CiAgICAgY2Fz ZSBKdW1wOgogICAgIGNhc2UgQnJhbmNoOgpAQCAtNjIxLDYgKzYxOSw4IEBAIHZvaWQgY2xvYmJl cml6ZShHcmFwaCYgZ3JhcGgsIE5vZGUqIG5vZGUKICAgICAgICAgcmV0dXJuOwogICAgICAgICAK ICAgICBjYXNlIEJyZWFrcG9pbnQ6CisgICAgY2FzZSBQcm9maWxlV2lsbENhbGw6CisgICAgY2Fz ZSBQcm9maWxlRGlkQ2FsbDoKICAgICBjYXNlIENvdW50RXhlY3V0aW9uOgogICAgIGNhc2UgQ2hl Y2tXYXRjaGRvZ1RpbWVyOgogICAgICAgICByZWFkKEludGVybmFsU3RhdGUpOwpJbmRleDogU291 cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdOb2RlVHlwZS5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHTm9kZVR5cGUuaAkocmV2aXNpb24gMTYyNzExKQorKysg U291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdOb2RlVHlwZS5oCSh3b3JraW5nIGNvcHkpCkBA IC0yMzEsOCArMjMxLDggQEAgbmFtZXNwYWNlIEpTQyB7IG5hbWVzcGFjZSBERkcgewogICAgIFwK ICAgICAvKiBOb2RlcyBmb3IgbWlzYyBvcGVyYXRpb25zLiAqL1wKICAgICBtYWNybyhCcmVha3Bv aW50LCBOb2RlTXVzdEdlbmVyYXRlKSBcCi0gICAgbWFjcm8oUHJvZmlsZVdpbGxDYWxsLCBOb2Rl TXVzdEdlbmVyYXRlIHwgTm9kZUNsb2JiZXJzV29ybGQpIFwKLSAgICBtYWNybyhQcm9maWxlRGlk Q2FsbCwgTm9kZU11c3RHZW5lcmF0ZSB8IE5vZGVDbG9iYmVyc1dvcmxkKSBcCisgICAgbWFjcm8o UHJvZmlsZVdpbGxDYWxsLCBOb2RlTXVzdEdlbmVyYXRlKSBcCisgICAgbWFjcm8oUHJvZmlsZURp ZENhbGwsIE5vZGVNdXN0R2VuZXJhdGUpIFwKICAgICBtYWNybyhDaGVja0hhc0luc3RhbmNlLCBO b2RlTXVzdEdlbmVyYXRlKSBcCiAgICAgbWFjcm8oSW5zdGFuY2VPZiwgTm9kZVJlc3VsdEJvb2xl YW4pIFwKICAgICBtYWNybyhJc1VuZGVmaW5lZCwgTm9kZVJlc3VsdEJvb2xlYW4pIFwKSW5kZXg6 IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQzMl82NC5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVDMy XzY0LmNwcAkocmV2aXNpb24gMTYyNzExKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9E RkdTcGVjdWxhdGl2ZUpJVDMyXzY0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDI0MiwyNSArNDI0 MiwxMyBAQCB2b2lkIFNwZWN1bGF0aXZlSklUOjpjb21waWxlKE5vZGUqIG5vZGUpCiAgICAgICAg IGJyZWFrOwogICAgIH0KIAotICAgIGNhc2UgUHJvZmlsZVdpbGxDYWxsOiB7Ci0gICAgICAgIEpT VmFsdWVPcGVyYW5kIHByb2ZpbGUodGhpcywgbm9kZS0+Y2hpbGQxKCkpOwotICAgICAgICBHUFJS ZWcgcHJvZmlsZVRhZ0dQUiA9IHByb2ZpbGUudGFnR1BSKCk7Ci0gICAgICAgIEdQUlJlZyBwcm9m aWxlUGF5bG9hZEdQUiA9IHByb2ZpbGUucGF5bG9hZEdQUigpOwotICAgICAgICBzaWxlbnRTcGls bEFsbFJlZ2lzdGVycyhJbnZhbGlkR1BSUmVnKTsKLSAgICAgICAgY2FsbE9wZXJhdGlvbihvcGVy YXRpb25Qcm9maWxlV2lsbENhbGwsIHByb2ZpbGVUYWdHUFIsIHByb2ZpbGVQYXlsb2FkR1BSKTsK LSAgICAgICAgc2lsZW50RmlsbEFsbFJlZ2lzdGVycyhJbnZhbGlkR1BSUmVnKTsKLSAgICAgICAg bm9SZXN1bHQobm9kZSk7Ci0gICAgICAgIGJyZWFrOwotICAgIH0KLQorICAgIGNhc2UgUHJvZmls ZVdpbGxDYWxsOgogICAgIGNhc2UgUHJvZmlsZURpZENhbGw6IHsKLSAgICAgICAgSlNWYWx1ZU9w ZXJhbmQgcHJvZmlsZSh0aGlzLCBub2RlLT5jaGlsZDEoKSk7Ci0gICAgICAgIEdQUlJlZyBwcm9m aWxlVGFnR1BSID0gcHJvZmlsZS50YWdHUFIoKTsKLSAgICAgICAgR1BSUmVnIHByb2ZpbGVQYXls b2FkR1BSID0gcHJvZmlsZS5wYXlsb2FkR1BSKCk7Ci0gICAgICAgIHNpbGVudFNwaWxsQWxsUmVn aXN0ZXJzKEludmFsaWRHUFJSZWcpOwotICAgICAgICBjYWxsT3BlcmF0aW9uKG9wZXJhdGlvblBy b2ZpbGVXaWxsQ2FsbCwgcHJvZmlsZVRhZ0dQUiwgcHJvZmlsZVBheWxvYWRHUFIpOwotICAgICAg ICBzaWxlbnRGaWxsQWxsUmVnaXN0ZXJzKEludmFsaWRHUFJSZWcpOwotICAgICAgICBub1Jlc3Vs dChub2RlKTsKKyAgICAgICAgR1BSVGVtcG9yYXJ5IHRlbXAodGhpcyk7CisgICAgICAgIG1faml0 LmxvYWRQdHIobV9qaXQudm0oKS0+ZW5hYmxlZFByb2ZpbGVyQWRkcmVzcygpLCB0ZW1wLmdwcigp KTsKKyAgICAgICAgc3BlY3VsYXRpb25DaGVjaygKKyAgICAgICAgICAgIERlYnVnZ2VyRXZlbnQs IEpTVmFsdWVSZWdzKCksIDAsCisgICAgICAgICAgICBtX2ppdC5icmFuY2hUZXN0UHRyKEpJVENv bXBpbGVyOjpOb25aZXJvLCB0ZW1wLmdwcigpKSk7CiAgICAgICAgIGJyZWFrOwogICAgIH0KIApJ bmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVDY0LmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklU NjQuY3BwCShyZXZpc2lvbiAxNjI3MTEpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RG R1NwZWN1bGF0aXZlSklUNjQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00NTE5LDI1ICs0NTE5LDE0 IEBAIHZvaWQgU3BlY3VsYXRpdmVKSVQ6OmNvbXBpbGUoTm9kZSogbm9kZSkKICAgICAgICAgYnJl YWs7CiAgICAgfQogCi0gICAgY2FzZSBQcm9maWxlV2lsbENhbGw6IHsKLSAgICAgICAgSlNWYWx1 ZU9wZXJhbmQgcHJvZmlsZSh0aGlzLCBub2RlLT5jaGlsZDEoKSk7Ci0gICAgICAgIEdQUlJlZyBw cm9maWxlR1BSID0gcHJvZmlsZS5ncHIoKTsKLSAgICAgICAgc2lsZW50U3BpbGxBbGxSZWdpc3Rl cnMoSW52YWxpZEdQUlJlZyk7Ci0gICAgICAgIGNhbGxPcGVyYXRpb24ob3BlcmF0aW9uUHJvZmls ZVdpbGxDYWxsLCBwcm9maWxlR1BSKTsKLSAgICAgICAgc2lsZW50RmlsbEFsbFJlZ2lzdGVycyhJ bnZhbGlkR1BSUmVnKTsKLSAgICAgICAgbm9SZXN1bHQobm9kZSk7Ci0gICAgICAgIGJyZWFrOwot ICAgIH0KLQotICAgIGNhc2UgUHJvZmlsZURpZENhbGw6IHsKLSAgICAgICAgSlNWYWx1ZU9wZXJh bmQgcHJvZmlsZSh0aGlzLCBub2RlLT5jaGlsZDEoKSk7Ci0gICAgICAgIEdQUlJlZyBwcm9maWxl R1BSID0gcHJvZmlsZS5ncHIoKTsKLSAgICAgICAgc2lsZW50U3BpbGxBbGxSZWdpc3RlcnMoSW52 YWxpZEdQUlJlZyk7Ci0gICAgICAgIGNhbGxPcGVyYXRpb24ob3BlcmF0aW9uUHJvZmlsZURpZENh bGwsIHByb2ZpbGVHUFIpOwotICAgICAgICBzaWxlbnRGaWxsQWxsUmVnaXN0ZXJzKEludmFsaWRH UFJSZWcpOwotICAgICAgICBub1Jlc3VsdChub2RlKTsKKyAgICBjYXNlIFByb2ZpbGVXaWxsQ2Fs bDoKKyAgICBjYXNlIFByb2ZpbGVEaWRDYWxsOgorICAgICAgICBzcGVjdWxhdGlvbkNoZWNrKAor ICAgICAgICAgICAgRGVidWdnZXJFdmVudCwgSlNWYWx1ZVJlZ3MoKSwgMCwKKyAgICAgICAgICAg IG1faml0LmJyYW5jaFRlc3RQdHIoCisgICAgICAgICAgICAgICAgSklUQ29tcGlsZXI6Ok5vblpl cm8sCisgICAgICAgICAgICAgICAgSklUQ29tcGlsZXI6OkFic29sdXRlQWRkcmVzcyhtX2ppdC52 bSgpLT5lbmFibGVkUHJvZmlsZXJBZGRyZXNzKCkpKSk7CiAgICAgICAgIGJyZWFrOwotICAgIH0K IAogICAgIGNhc2UgQ2FsbDoKICAgICBjYXNlIENvbnN0cnVjdDoKSW5kZXg6IFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9qaXQvSklUT3Bjb2RlczMyXzY0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvaml0L0pJVE9wY29kZXMzMl82NC5jcHAJKHJldmlzaW9uIDE2MjcxMSkK KysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUT3Bjb2RlczMyXzY0LmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtMTExNCwxNCArMTExNCwyMCBAQCB2b2lkIEpJVDo6ZW1pdFNsb3dfb3BfdG9f dGhpcyhJbnN0cnVjdGlvCiAKIHZvaWQgSklUOjplbWl0X29wX3Byb2ZpbGVfd2lsbF9jYWxsKElu c3RydWN0aW9uKiBjdXJyZW50SW5zdHJ1Y3Rpb24pCiB7CisgICAgbG9hZDMyKG1fdm0tPmVuYWJs ZWRQcm9maWxlckFkZHJlc3MoKSwgcmVnVDApOworICAgIEp1bXAgcHJvZmlsZXJEb25lID0gYnJh bmNoVGVzdFB0cihaZXJvLCByZWdUMCk7CiAgICAgZW1pdExvYWQoY3VycmVudEluc3RydWN0aW9u WzFdLnUub3BlcmFuZCwgcmVnVDEsIHJlZ1QwKTsKICAgICBjYWxsT3BlcmF0aW9uKG9wZXJhdGlv blByb2ZpbGVXaWxsQ2FsbCwgcmVnVDEsIHJlZ1QwKTsKKyAgICBwcm9maWxlckRvbmUubGluayh0 aGlzKTsKIH0KIAogdm9pZCBKSVQ6OmVtaXRfb3BfcHJvZmlsZV9kaWRfY2FsbChJbnN0cnVjdGlv biogY3VycmVudEluc3RydWN0aW9uKQogeworICAgIGxvYWQzMihtX3ZtLT5lbmFibGVkUHJvZmls ZXJBZGRyZXNzKCksIHJlZ1QwKTsKKyAgICBKdW1wIHByb2ZpbGVyRG9uZSA9IGJyYW5jaFRlc3RQ dHIoWmVybywgcmVnVDApOwogICAgIGVtaXRMb2FkKGN1cnJlbnRJbnN0cnVjdGlvblsxXS51Lm9w ZXJhbmQsIHJlZ1QxLCByZWdUMCk7CiAgICAgY2FsbE9wZXJhdGlvbihvcGVyYXRpb25Qcm9maWxl RGlkQ2FsbCwgcmVnVDEsIHJlZ1QwKTsKKyAgICBwcm9maWxlckRvbmUubGluayh0aGlzKTsKIH0K IAogdm9pZCBKSVQ6OmVtaXRfb3BfZ2V0X2FyZ3VtZW50c19sZW5ndGgoSW5zdHJ1Y3Rpb24qIGN1 cnJlbnRJbnN0cnVjdGlvbikKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUT3Bj b2Rlcy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRPcGNv ZGVzLmNwcAkocmV2aXNpb24gMTYyNzExKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9K SVRPcGNvZGVzLmNwcAkod29ya2luZyBjb3B5KQpAQCAtODg2LDE0ICs4ODYsMTggQEAgdm9pZCBK SVQ6OmVtaXRTbG93X29wX2NyZWF0ZV90aGlzKEluc3RydQogCiB2b2lkIEpJVDo6ZW1pdF9vcF9w cm9maWxlX3dpbGxfY2FsbChJbnN0cnVjdGlvbiogY3VycmVudEluc3RydWN0aW9uKQogeworICAg IEp1bXAgcHJvZmlsZXJEb25lID0gYnJhbmNoVGVzdFB0cihaZXJvLCBBYnNvbHV0ZUFkZHJlc3Mo bV92bS0+ZW5hYmxlZFByb2ZpbGVyQWRkcmVzcygpKSk7CiAgICAgZW1pdEdldFZpcnR1YWxSZWdp c3RlcihjdXJyZW50SW5zdHJ1Y3Rpb25bMV0udS5vcGVyYW5kLCByZWdUMCk7CiAgICAgY2FsbE9w ZXJhdGlvbihvcGVyYXRpb25Qcm9maWxlV2lsbENhbGwsIHJlZ1QwKTsKKyAgICBwcm9maWxlckRv bmUubGluayh0aGlzKTsKIH0KIAogdm9pZCBKSVQ6OmVtaXRfb3BfcHJvZmlsZV9kaWRfY2FsbChJ bnN0cnVjdGlvbiogY3VycmVudEluc3RydWN0aW9uKQogeworICAgIEp1bXAgcHJvZmlsZXJEb25l ID0gYnJhbmNoVGVzdFB0cihaZXJvLCBBYnNvbHV0ZUFkZHJlc3MobV92bS0+ZW5hYmxlZFByb2Zp bGVyQWRkcmVzcygpKSk7CiAgICAgZW1pdEdldFZpcnR1YWxSZWdpc3RlcihjdXJyZW50SW5zdHJ1 Y3Rpb25bMV0udS5vcGVyYW5kLCByZWdUMCk7CiAgICAgY2FsbE9wZXJhdGlvbihvcGVyYXRpb25Q cm9maWxlRGlkQ2FsbCwgcmVnVDApOworICAgIHByb2ZpbGVyRG9uZS5saW5rKHRoaXMpOwogfQog CiAKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9sbGludC9Mb3dMZXZlbEludGVycHJldGVy LmFzbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvbGxpbnQvTG93TGV2ZWxJ bnRlcnByZXRlci5hc20JKHJldmlzaW9uIDE2MjcxMSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9sbGludC9Mb3dMZXZlbEludGVycHJldGVyLmFzbQkod29ya2luZyBjb3B5KQpAQCAtODIzLDEz ICs4MjMsMjMgQEAgX2xsaW50X29wX3Rocm93X3N0YXRpY19lcnJvcjoKIAogX2xsaW50X29wX3By b2ZpbGVfd2lsbF9jYWxsOgogICAgIHRyYWNlRXhlY3V0aW9uKCkKKyAgICBsb2FkcCBDb2RlQmxv Y2tbY2ZyXSwgdDAKKyAgICBsb2FkcCBDb2RlQmxvY2s6Om1fdm1bdDBdLCB0MAorICAgIGxvYWRp IFZNOjptX2VuYWJsZWRQcm9maWxlclt0MF0sIHQwCisgICAgYnRweiB0MCwgLm9wUHJvZmlsZXJX aWxsQ2FsbERvbmUKICAgICBjYWxsU2xvd1BhdGgoX2xsaW50X3Nsb3dfcGF0aF9wcm9maWxlX3dp bGxfY2FsbCkKKy5vcFByb2ZpbGVyV2lsbENhbGxEb25lOgogICAgIGRpc3BhdGNoKDIpCiAKIAog X2xsaW50X29wX3Byb2ZpbGVfZGlkX2NhbGw6CiAgICAgdHJhY2VFeGVjdXRpb24oKQorICAgIGxv YWRwIENvZGVCbG9ja1tjZnJdLCB0MAorICAgIGxvYWRwIENvZGVCbG9jazo6bV92bVt0MF0sIHQw CisgICAgbG9hZGkgVk06Om1fZW5hYmxlZFByb2ZpbGVyW3QwXSwgdDAKKyAgICBidHB6IHQwLCAu b3BQcm9maWxlckRpZENhbGxEb25lCiAgICAgY2FsbFNsb3dQYXRoKF9sbGludF9zbG93X3BhdGhf cHJvZmlsZV9kaWRfY2FsbCkKKy5vcFByb2ZpbGVyRGlkQ2FsbERvbmU6CiAgICAgZGlzcGF0Y2go MikKIAogCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9WTS5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1ZNLmgJKHJldmlzaW9uIDE2Mjcx MSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1ZNLmgJKHdvcmtpbmcgY29weSkK QEAgLTMwOCw2ICszMDgsNyBAQCBuYW1lc3BhY2UgSlNDIHsKICAgICAgICAgewogICAgICAgICAg ICAgcmV0dXJuIG1fZW5hYmxlZFByb2ZpbGVyOwogICAgICAgICB9CisgICAgICAgIHZvaWQqIGVu YWJsZWRQcm9maWxlckFkZHJlc3MoKSB7IHJldHVybiAmbV9lbmFibGVkUHJvZmlsZXI7IH0KIAog I2lmIEVOQUJMRShKSVQpICYmIEVOQUJMRShMTElOVCkKICAgICAgICAgYm9vbCBjYW5Vc2VKSVQo KSB7IHJldHVybiBtX2NhblVzZUpJVDsgfQo=