160148 2016-07-24 15:39:33 -0700 MathICs should be able to take and dump stats about code size 2016-07-25 13:45:08 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Local Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 saam saam benjamin commit-queue fpizlo ggaren gskachkov keith_miller mark.lam msaboff oliver sukolsak ysuzuki oldest_to_newest 1214079 0 saam 2016-07-24 15:39:33 -0700 We should implement something akin to Options::useICStats for property access ICs. 1214309 1 284515 saam 2016-07-25 12:59:20 -0700 Created attachment 284515 patch 1214310 2 284515 fpizlo 2016-07-25 13:00:38 -0700 Comment on attachment 284515 patch Any reason why this can't be a runtime option? 1214311 3 commit-queue 2016-07-25 13:01:21 -0700 Attachment 284515 did not pass style-queue: ERROR: Source/JavaScriptCore/bytecode/CodeBlock.cpp:4584: Place brace on its own line for function definitions. [whitespace/braces] [4] ERROR: Source/JavaScriptCore/bytecode/CodeBlock.cpp:4601: Missing spaces around / [whitespace/operators] [3] ERROR: Source/JavaScriptCore/bytecode/CodeBlock.cpp:4605: Missing spaces around / [whitespace/operators] [3] Total errors found: 3 in 8 files If any of these errors are false positives, please file a bug against check-webkit-style. 1214329 4 saam 2016-07-25 13:43:12 -0700 landed in: https://trac.webkit.org/changeset/203697 1214330 5 saam 2016-07-25 13:45:08 -0700 (In reply to comment #2) > Comment on attachment 284515 [details] > patch > > Any reason why this can't be a runtime option? Oops. I landed before I saw your question. A couple of reasons why I made it a compile time flag: 1. It adds a field to MathIC, so we don't want to pay for the memory used by that field if we're not using the option. 2. I want to start adding the dump call in more places along each operationValue<Mul/Add/ect> operation, and I don't want to pay for the branch, even though it will be well predicted. 284515 2016-07-25 12:59:20 -0700 2016-07-25 13:00:38 -0700 patch a-backup.diff text/plain 14472 saam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjAzNjk0KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM1IEBA CisyMDE2LTA3LTI1ICBTYWFtIEJhcmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgorCisgICAgICAg IE1hdGhJQ3Mgc2hvdWxkIGJlIGFibGUgdG8gdGFrZSBhbmQgZHVtcCBzdGF0cyBhYm91dCBjb2Rl IHNpemUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2 MDE0OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRo aXMgd2lsbCBtYWtlIHRlc3RpbmcgY2hhbmdlcyBvbiBNYXRoSUMgZ29pbmcgZm9yd2FyZCBtdWNo IGVhc2llci4KKyAgICAgICAgV2Ugd2lsbCBiZSBhYmxlIHRvIGVhc2lseSBzZWUgaWYgbW9kaWZp Y2F0aW9ucyB0byBNYXRoSUMgd2lsbCBsZWFkCisgICAgICAgIHRvIHVzIGdlbmVyYXRpbmcgc21h bGxlciBjb2RlLiBXZSBub3cgb25seSBkdW1wIGF2ZXJhZ2Ugc2l6ZSB3aGVuIHdlCisgICAgICAg IHJlZ2VuZXJhdGUgYW55IE1hdGhJQy4gVGhpcyB3b3JrcyBvdXQgZm9yIGxhcmdlIHRlc3RzL3Bh Z2VzLCBidXQgaXMgbm90CisgICAgICAgIGdyZWF0IGZvciB0ZXN0aW5nIHNtYWxsIHByb2dyYW1z LiBXZSBjYW4gYWRkIG1vcmUgZHVtcCBwb2ludHMgbGF0ZXIgaWYKKyAgICAgICAgd2UgZmluZCB0 aGF0IHdlIHdhbnQgdG8gZHVtcCBzdGF0cyB3aGlsZSBydW5uaW5nIHNtYWxsIHNtYWxsIHByb2dy YW1zLgorCisgICAgICAgICogYnl0ZWNvZGUvQ29kZUJsb2NrLmNwcDoKKyAgICAgICAgKEpTQzo6 Q29kZUJsb2NrOjpqaXRTb29uKToKKyAgICAgICAgKEpTQzo6Q29kZUJsb2NrOjpkdW1wTWF0aElD U3RhdHMpOgorICAgICAgICAqIGJ5dGVjb2RlL0NvZGVCbG9jay5oOgorICAgICAgICAoSlNDOjpD b2RlQmxvY2s6OmlzU3RyaWN0TW9kZSk6CisgICAgICAgIChKU0M6OkNvZGVCbG9jazo6ZWNtYU1v ZGUpOgorICAgICAgICAqIGRmZy9ERkdTcGVjdWxhdGl2ZUpJVC5jcHA6CisgICAgICAgIChKU0M6 OkRGRzo6U3BlY3VsYXRpdmVKSVQ6OmNvbXBpbGVNYXRoSUMpOgorICAgICAgICAqIGZ0bC9GVExM b3dlckRGR1RvQjMuY3BwOgorICAgICAgICAoSlNDOjpGVEw6OkRGRzo6TG93ZXJERkdUb0IzOjpj b21waWxlTWF0aElDKToKKyAgICAgICAgKiBqaXQvSklUQXJpdGhtZXRpYy5jcHA6CisgICAgICAg IChKU0M6OkpJVDo6ZW1pdE1hdGhJQ0Zhc3QpOgorICAgICAgICAoSlNDOjpKSVQ6OmVtaXRNYXRo SUNTbG93KToKKyAgICAgICAgKiBqaXQvSklUTWF0aElDLmg6CisgICAgICAgIChKU0M6OkpJVE1h dGhJQzo6ZmluYWxpemVJbmxpbmVDb2RlKToKKyAgICAgICAgKEpTQzo6SklUTWF0aElDOjpjb2Rl U2l6ZSk6CisgICAgICAgICogaml0L0pJVE9wZXJhdGlvbnMuY3BwOgorCiAyMDE2LTA3LTI1ICBT YWFtIEJhcmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgogCiAgICAgICAgIG9wX211bC9Bcml0aE11 bChVbnR5cGVkLFVudHlwZWQpIHNob3VsZCBiZSBhbiBJQwpJbmRleDogU291cmNlL0phdmFTY3Jp cHRDb3JlL2J5dGVjb2RlL0NvZGVCbG9jay5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFT Y3JpcHRDb3JlL2J5dGVjb2RlL0NvZGVCbG9jay5jcHAJKHJldmlzaW9uIDIwMzY5MykKKysrIFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Db2RlQmxvY2suY3BwCSh3b3JraW5nIGNvcHkp CkBAIC00NTczLDQgKzQ1NzMsMzkgQEAgdm9pZCBDb2RlQmxvY2s6OmppdFNvb24oKQogICAgIG1f bGxpbnRFeGVjdXRlQ291bnRlci5zZXROZXdUaHJlc2hvbGQodGhyZXNob2xkRm9ySklUKE9wdGlv bnM6OnRocmVzaG9sZEZvckpJVFNvb24oKSksIHRoaXMpOwogfQogCit2b2lkIENvZGVCbG9jazo6 ZHVtcE1hdGhJQ1N0YXRzKCkKK3sKKyNpZiBFTkFCTEUoTUFUSF9JQ19TVEFUUykKKyAgICBkb3Vi bGUgbnVtQWRkcyA9IDAuMDsKKyAgICBkb3VibGUgdG90YWxBZGRTaXplID0gMC4wOworICAgIGRv dWJsZSBudW1NdWxzID0gMC4wOworICAgIGRvdWJsZSB0b3RhbE11bFNpemUgPSAwLjA7CisKKyAg ICBhdXRvIGNvdW50SUNzID0gWyZdIChDb2RlQmxvY2sqIGNvZGVCbG9jaykgeworICAgICAgICBm b3IgKEpJVEFkZElDKiBhZGRJQyA6IGNvZGVCbG9jay0+bV9hZGRJQ3MpIHsKKyAgICAgICAgICAg IG51bUFkZHMrKzsKKyAgICAgICAgICAgIHRvdGFsQWRkU2l6ZSArPSBhZGRJQy0+Y29kZVNpemUo KTsKKyAgICAgICAgfQorCisgICAgICAgIGZvciAoSklUTXVsSUMqIG11bElDIDogY29kZUJsb2Nr LT5tX211bElDcykgeworICAgICAgICAgICAgbnVtTXVscysrOworICAgICAgICAgICAgdG90YWxN dWxTaXplICs9IG11bElDLT5jb2RlU2l6ZSgpOworICAgICAgICB9CisKKyAgICAgICAgcmV0dXJu IGZhbHNlOworICAgIH07CisgICAgaGVhcCgpLT5mb3JFYWNoQ29kZUJsb2NrKGNvdW50SUNzKTsK KworICAgIGRhdGFMb2coIk51bSBBZGRzOiAiLCBudW1BZGRzLCAiXG4iKTsKKyAgICBkYXRhTG9n KCJUb3RhbCBBZGQgc2l6ZSBpbiBieXRlczogIiwgdG90YWxBZGRTaXplLCAiXG4iKTsKKyAgICBk YXRhTG9nKCJBdmVyYWdlIEFkZCBzaXplOiAiLCB0b3RhbEFkZFNpemUvbnVtQWRkcywgIlxuIik7 CisgICAgZGF0YUxvZygiXG4iKTsKKyAgICBkYXRhTG9nKCJOdW0gTXVsczogIiwgbnVtTXVscywg IlxuIik7CisgICAgZGF0YUxvZygiVG90YWwgTXVsIHNpemUgaW4gYnl0ZXM6ICIsIHRvdGFsTXVs U2l6ZSwgIlxuIik7CisgICAgZGF0YUxvZygiQXZlcmFnZSBNdWwgc2l6ZTogIiwgdG90YWxNdWxT aXplL251bU11bHMsICJcbiIpOworCisgICAgZGF0YUxvZygiLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS1cbiIpOworI2VuZGlmCit9CisKIH0gLy8gbmFtZXNwYWNlIEpTQwpJbmRleDogU291cmNlL0ph dmFTY3JpcHRDb3JlL2J5dGVjb2RlL0NvZGVCbG9jay5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Db2RlQmxvY2suaAkocmV2aXNpb24gMjAzNjkzKQorKysg U291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0NvZGVCbG9jay5oCSh3b3JraW5nIGNvcHkp CkBAIC0yMDUsNiArMjA1LDggQEAgcHVibGljOgogICAgIHZvaWQgcHJpbnRTdHJ1Y3R1cmVzKFBy aW50U3RyZWFtJiwgY29uc3QgSW5zdHJ1Y3Rpb24qKTsKICAgICB2b2lkIHByaW50U3RydWN0dXJl KFByaW50U3RyZWFtJiwgY29uc3QgY2hhciogbmFtZSwgY29uc3QgSW5zdHJ1Y3Rpb24qLCBpbnQg b3BlcmFuZCk7CiAKKyAgICB2b2lkIGR1bXBNYXRoSUNTdGF0cygpOworCiAgICAgYm9vbCBpc1N0 cmljdE1vZGUoKSBjb25zdCB7IHJldHVybiBtX2lzU3RyaWN0TW9kZTsgfQogICAgIEVDTUFNb2Rl IGVjbWFNb2RlKCkgY29uc3QgeyByZXR1cm4gaXNTdHJpY3RNb2RlKCkgPyBTdHJpY3RNb2RlIDog Tm90U3RyaWN0TW9kZTsgfQogCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1Nw ZWN1bGF0aXZlSklULmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZn L0RGR1NwZWN1bGF0aXZlSklULmNwcAkocmV2aXNpb24gMjAzNjkzKQorKysgU291cmNlL0phdmFT Y3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM0 MjMsNiArMzQyMywxMCBAQCB2b2lkIFNwZWN1bGF0aXZlSklUOjpjb21waWxlTWF0aElDKE5vZGUq CiAgICAgICAgIHJpZ2h0UmVncyA9IHJpZ2h0LT5qc1ZhbHVlUmVncygpOwogICAgIH0KIAorI2lm IEVOQUJMRShNQVRIX0lDX1NUQVRTKQorICAgIGF1dG8gaW5saW5lU3RhcnQgPSBtX2ppdC5sYWJl bCgpOworI2VuZGlmCisKICAgICBCb3g8TWF0aElDR2VuZXJhdGlvblN0YXRlPiBhZGRJQ0dlbmVy YXRpb25TdGF0ZSA9IEJveDxNYXRoSUNHZW5lcmF0aW9uU3RhdGU+OjpjcmVhdGUoKTsKICAgICBB cml0aFByb2ZpbGUqIGFyaXRoUHJvZmlsZSA9IG1faml0LmdyYXBoKCkuYmFzZWxpbmVDb2RlQmxv Y2tGb3Iobm9kZS0+b3JpZ2luLnNlbWFudGljKS0+YXJpdGhQcm9maWxlRm9yQnl0ZWNvZGVPZmZz ZXQobm9kZS0+b3JpZ2luLnNlbWFudGljLmJ5dGVjb2RlSW5kZXgpOwogICAgIG1hdGhJQy0+bV9n ZW5lcmF0b3IgPSBHZW5lcmF0b3IobGVmdE9wZXJhbmQsIHJpZ2h0T3BlcmFuZCwgcmVzdWx0UmVn cywgbGVmdFJlZ3MsIHJpZ2h0UmVncywgbGVmdEZQUiwgcmlnaHRGUFIsIHNjcmF0Y2hHUFIsIHNj cmF0Y2hGUFIsIGFyaXRoUHJvZmlsZSk7CkBAIC0zNDQxLDYgKzM0NDUsOSBAQCB2b2lkIFNwZWN1 bGF0aXZlSklUOjpjb21waWxlTWF0aElDKE5vZGUqCiAgICAgICAgIGFkZFNsb3dQYXRoR2VuZXJh dG9yKFs9LCBzYXZlUGxhbnMgPSBXVEZNb3ZlKHNhdmVQbGFucyldICgpIHsKICAgICAgICAgICAg IGFkZElDR2VuZXJhdGlvblN0YXRlLT5zbG93UGF0aEp1bXBzLmxpbmsoJm1faml0KTsKICAgICAg ICAgICAgIGFkZElDR2VuZXJhdGlvblN0YXRlLT5zbG93UGF0aFN0YXJ0ID0gbV9qaXQubGFiZWwo KTsKKyNpZiBFTkFCTEUoTUFUSF9JQ19TVEFUUykKKyAgICAgICAgICAgIGF1dG8gc2xvd1BhdGhT dGFydCA9IG1faml0LmxhYmVsKCk7CisjZW5kaWYKIAogICAgICAgICAgICAgc2lsZW50U3BpbGwo c2F2ZVBsYW5zKTsKIApAQCAtMzQ2Niw2ICszNDczLDE1IEBAIHZvaWQgU3BlY3VsYXRpdmVKSVQ6 OmNvbXBpbGVNYXRoSUMoTm9kZSoKICAgICAgICAgICAgIG1faml0LmFkZExpbmtUYXNrKFs9XSAo TGlua0J1ZmZlciYgbGlua0J1ZmZlcikgewogICAgICAgICAgICAgICAgIG1hdGhJQy0+ZmluYWxp emVJbmxpbmVDb2RlKCphZGRJQ0dlbmVyYXRpb25TdGF0ZSwgbGlua0J1ZmZlcik7CiAgICAgICAg ICAgICB9KTsKKworI2lmIEVOQUJMRShNQVRIX0lDX1NUQVRTKQorICAgICAgICAgICAgYXV0byBz bG93UGF0aEVuZCA9IG1faml0LmxhYmVsKCk7CisgICAgICAgICAgICBtX2ppdC5hZGRMaW5rVGFz ayhbPV0gKExpbmtCdWZmZXImIGxpbmtCdWZmZXIpIHsKKyAgICAgICAgICAgICAgICBzaXplX3Qg c2l6ZSA9IHN0YXRpY19jYXN0PGNoYXIqPihsaW5rQnVmZmVyLmxvY2F0aW9uT2Yoc2xvd1BhdGhF bmQpLmV4ZWN1dGFibGVBZGRyZXNzKCkpIC0gc3RhdGljX2Nhc3Q8Y2hhcio+KGxpbmtCdWZmZXIu bG9jYXRpb25PZihzbG93UGF0aFN0YXJ0KS5leGVjdXRhYmxlQWRkcmVzcygpKTsKKyAgICAgICAg ICAgICAgICBtYXRoSUMtPm1fZ2VuZXJhdGVkQ29kZVNpemUgKz0gc2l6ZTsKKyAgICAgICAgICAg IH0pOworI2VuZGlmCisKICAgICAgICAgfSk7CiAgICAgfSBlbHNlIHsKICAgICAgICAgaWYgKG1h dGhJQy0+aXNMZWZ0T3BlcmFuZFZhbGlkQ29uc3RhbnQoKSkgewpAQCAtMzQ4MSw2ICszNDk3LDE0 IEBAIHZvaWQgU3BlY3VsYXRpdmVKSVQ6OmNvbXBpbGVNYXRoSUMoTm9kZSoKICAgICAgICAgbV9q aXQuZXhjZXB0aW9uQ2hlY2soKTsKICAgICB9CiAKKyNpZiBFTkFCTEUoTUFUSF9JQ19TVEFUUykK KyAgICBhdXRvIGlubGluZUVuZCA9IG1faml0LmxhYmVsKCk7CisgICAgbV9qaXQuYWRkTGlua1Rh c2soWz1dIChMaW5rQnVmZmVyJiBsaW5rQnVmZmVyKSB7CisgICAgICAgIHNpemVfdCBzaXplID0g c3RhdGljX2Nhc3Q8Y2hhcio+KGxpbmtCdWZmZXIubG9jYXRpb25PZihpbmxpbmVFbmQpLmV4ZWN1 dGFibGVBZGRyZXNzKCkpIC0gc3RhdGljX2Nhc3Q8Y2hhcio+KGxpbmtCdWZmZXIubG9jYXRpb25P ZihpbmxpbmVTdGFydCkuZXhlY3V0YWJsZUFkZHJlc3MoKSk7CisgICAgICAgIG1hdGhJQy0+bV9n ZW5lcmF0ZWRDb2RlU2l6ZSArPSBzaXplOworICAgIH0pOworI2VuZGlmCisKICAgICBqc1ZhbHVl UmVzdWx0KHJlc3VsdFJlZ3MsIG5vZGUpOwogICAgIHJldHVybjsKIH0KSW5kZXg6IFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9mdGwvRlRMTG93ZXJERkdUb0IzLmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTExvd2VyREZHVG9CMy5jcHAJKHJldmlzaW9uIDIwMzY5 MykKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMTG93ZXJERkdUb0IzLmNwcAkod29y a2luZyBjb3B5KQpAQCAtMTU3NCw2ICsxNTc0LDEwIEBAIHByaXZhdGU6CiAgICAgICAgICAgICAg ICAgQm94PENDYWxsSGVscGVyczo6SnVtcExpc3Q+IGV4Y2VwdGlvbnMgPQogICAgICAgICAgICAg ICAgICAgICBleGNlcHRpb25IYW5kbGUtPnNjaGVkdWxlRXhpdENyZWF0aW9uKHBhcmFtcyktPmp1 bXBzKGppdCk7CiAKKyNpZiBFTkFCTEUoTUFUSF9JQ19TVEFUUykKKyAgICAgICAgICAgICAgICBh dXRvIGlubGluZVN0YXJ0ID0gaml0LmxhYmVsKCk7CisjZW5kaWYKKwogICAgICAgICAgICAgICAg IEJveDxNYXRoSUNHZW5lcmF0aW9uU3RhdGU+IG1hdGhJQ0dlbmVyYXRpb25TdGF0ZSA9IEJveDxN YXRoSUNHZW5lcmF0aW9uU3RhdGU+OjpjcmVhdGUoKTsKICAgICAgICAgICAgICAgICBBcml0aFBy b2ZpbGUqIGFyaXRoUHJvZmlsZSA9IHN0YXRlLT5ncmFwaC5iYXNlbGluZUNvZGVCbG9ja0Zvcihu b2RlLT5vcmlnaW4uc2VtYW50aWMpLT5hcml0aFByb2ZpbGVGb3JCeXRlY29kZU9mZnNldChub2Rl LT5vcmlnaW4uc2VtYW50aWMuYnl0ZWNvZGVJbmRleCk7CiAgICAgICAgICAgICAgICAgbWF0aElD LT5tX2dlbmVyYXRvciA9IEdlbmVyYXRvcihsZWZ0T3BlcmFuZCwgcmlnaHRPcGVyYW5kLCBKU1Zh bHVlUmVncyhwYXJhbXNbMF0uZ3ByKCkpLApAQCAtMTU5MCw2ICsxNTk0LDkgQEAgcHJpdmF0ZToK ICAgICAgICAgICAgICAgICAgICAgICAgIEFsbG93TWFjcm9TY3JhdGNoUmVnaXN0ZXJVc2FnZSBh bGxvd1NjcmF0Y2goaml0KTsKICAgICAgICAgICAgICAgICAgICAgICAgIG1hdGhJQ0dlbmVyYXRp b25TdGF0ZS0+c2xvd1BhdGhKdW1wcy5saW5rKCZqaXQpOwogICAgICAgICAgICAgICAgICAgICAg ICAgbWF0aElDR2VuZXJhdGlvblN0YXRlLT5zbG93UGF0aFN0YXJ0ID0gaml0LmxhYmVsKCk7Cisj aWYgRU5BQkxFKE1BVEhfSUNfU1RBVFMpCisgICAgICAgICAgICAgICAgICAgICAgICBhdXRvIHNs b3dQYXRoU3RhcnQgPSBqaXQubGFiZWwoKTsKKyNlbmRpZgogCiAgICAgICAgICAgICAgICAgICAg ICAgICBpZiAobWF0aElDR2VuZXJhdGlvblN0YXRlLT5zaG91bGRTbG93UGF0aFJlcGF0Y2gpIHsK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBTbG93UGF0aENhbGwgY2FsbCA9IGNhbGxPcGVy YXRpb24oKnN0YXRlLCBwYXJhbXMudW5hdmFpbGFibGVSZWdpc3RlcnMoKSwgaml0LCBub2RlLT5v cmlnaW4uc2VtYW50aWMsIGV4Y2VwdGlvbnMuZ2V0KCksCkBAIC0xNjA1LDEyICsxNjEyLDI4IEBA IHByaXZhdGU6CiAgICAgICAgICAgICAgICAgICAgICAgICBqaXQuYWRkTGlua1Rhc2soWz1dIChM aW5rQnVmZmVyJiBsaW5rQnVmZmVyKSB7CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbWF0 aElDLT5maW5hbGl6ZUlubGluZUNvZGUoKm1hdGhJQ0dlbmVyYXRpb25TdGF0ZSwgbGlua0J1ZmZl cik7CiAgICAgICAgICAgICAgICAgICAgICAgICB9KTsKKworI2lmIEVOQUJMRShNQVRIX0lDX1NU QVRTKQorICAgICAgICAgICAgICAgICAgICAgICAgYXV0byBzbG93UGF0aEVuZCA9IGppdC5sYWJl bCgpOworICAgICAgICAgICAgICAgICAgICAgICAgaml0LmFkZExpbmtUYXNrKFs9XSAoTGlua0J1 ZmZlciYgbGlua0J1ZmZlcikgeworICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNpemVfdCBz aXplID0gc3RhdGljX2Nhc3Q8Y2hhcio+KGxpbmtCdWZmZXIubG9jYXRpb25PZihzbG93UGF0aEVu ZCkuZXhlY3V0YWJsZUFkZHJlc3MoKSkgLSBzdGF0aWNfY2FzdDxjaGFyKj4obGlua0J1ZmZlci5s b2NhdGlvbk9mKHNsb3dQYXRoU3RhcnQpLmV4ZWN1dGFibGVBZGRyZXNzKCkpOworICAgICAgICAg ICAgICAgICAgICAgICAgICAgIG1hdGhJQy0+bV9nZW5lcmF0ZWRDb2RlU2l6ZSArPSBzaXplOwor ICAgICAgICAgICAgICAgICAgICAgICAgfSk7CisjZW5kaWYKICAgICAgICAgICAgICAgICAgICAg fSk7CiAgICAgICAgICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgICAgICAgICAgY2FsbE9w ZXJhdGlvbigKICAgICAgICAgICAgICAgICAgICAgICAgICpzdGF0ZSwgcGFyYW1zLnVuYXZhaWxh YmxlUmVnaXN0ZXJzKCksIGppdCwgbm9kZS0+b3JpZ2luLnNlbWFudGljLCBleGNlcHRpb25zLmdl dCgpLAogICAgICAgICAgICAgICAgICAgICAgICAgbm9uUmVwYXRjaGluZ0Z1bmN0aW9uLCBwYXJh bXNbMF0uZ3ByKCksIHBhcmFtc1sxXS5ncHIoKSwgcGFyYW1zWzJdLmdwcigpKTsKICAgICAgICAg ICAgICAgICB9CisKKyNpZiBFTkFCTEUoTUFUSF9JQ19TVEFUUykKKyAgICAgICAgICAgICAgICBh dXRvIGlubGluZUVuZCA9IGppdC5sYWJlbCgpOworICAgICAgICAgICAgICAgIGppdC5hZGRMaW5r VGFzayhbPV0gKExpbmtCdWZmZXImIGxpbmtCdWZmZXIpIHsKKyAgICAgICAgICAgICAgICAgICAg c2l6ZV90IHNpemUgPSBzdGF0aWNfY2FzdDxjaGFyKj4obGlua0J1ZmZlci5sb2NhdGlvbk9mKGlu bGluZUVuZCkuZXhlY3V0YWJsZUFkZHJlc3MoKSkgLSBzdGF0aWNfY2FzdDxjaGFyKj4obGlua0J1 ZmZlci5sb2NhdGlvbk9mKGlubGluZVN0YXJ0KS5leGVjdXRhYmxlQWRkcmVzcygpKTsKKyAgICAg ICAgICAgICAgICAgICAgbWF0aElDLT5tX2dlbmVyYXRlZENvZGVTaXplICs9IHNpemU7CisgICAg ICAgICAgICAgICAgfSk7CisjZW5kaWYKICAgICAgICAgICAgIH0pOwogCiAgICAgICAgIHNldEpT VmFsdWUocGF0Y2hwb2ludCk7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVEFy aXRobWV0aWMuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklU QXJpdGhtZXRpYy5jcHAJKHJldmlzaW9uIDIwMzY5MykKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9qaXQvSklUQXJpdGhtZXRpYy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTczOSw2ICs3MzksMTAg QEAgdm9pZCBKSVQ6OmVtaXRNYXRoSUNGYXN0KEpJVE1hdGhJQzxHZW5lcgogICAgIGlmICghbWF0 aElDLT5pc1JpZ2h0T3BlcmFuZFZhbGlkQ29uc3RhbnQoKSkKICAgICAgICAgZW1pdEdldFZpcnR1 YWxSZWdpc3RlcihvcDIsIHJpZ2h0UmVncyk7CiAKKyNpZiBFTkFCTEUoTUFUSF9JQ19TVEFUUykK KyAgICBhdXRvIGlubGluZVN0YXJ0ID0gbGFiZWwoKTsKKyNlbmRpZgorCiAgICAgTWF0aElDR2Vu ZXJhdGlvblN0YXRlJiBtYXRoSUNHZW5lcmF0aW9uU3RhdGUgPSBtX2luc3RydWN0aW9uVG9NYXRo SUNHZW5lcmF0aW9uU3RhdGUuYWRkKGN1cnJlbnRJbnN0cnVjdGlvbiwgTWF0aElDR2VuZXJhdGlv blN0YXRlKCkpLml0ZXJhdG9yLT52YWx1ZTsKIAogICAgIG1hdGhJQy0+bV9nZW5lcmF0b3IgPSBH ZW5lcmF0b3IobGVmdE9wZXJhbmQsIHJpZ2h0T3BlcmFuZCwgcmVzdWx0UmVncywgbGVmdFJlZ3Ms IHJpZ2h0UmVncywgZnBSZWdUMCwgZnBSZWdUMSwgc2NyYXRjaEdQUiwgc2NyYXRjaEZQUiwgYXJp dGhQcm9maWxlKTsKQEAgLTc1NSw2ICs3NTksMTUgQEAgdm9pZCBKSVQ6OmVtaXRNYXRoSUNGYXN0 KEpJVE1hdGhJQzxHZW5lcgogICAgICAgICAgICAgY2FsbE9wZXJhdGlvbihub25Qcm9maWxlZEZ1 bmN0aW9uLCByZXN1bHRSZWdzLCBsZWZ0UmVncywgcmlnaHRSZWdzKTsKICAgICB9IGVsc2UKICAg ICAgICAgYWRkU2xvd0Nhc2UobWF0aElDR2VuZXJhdGlvblN0YXRlLnNsb3dQYXRoSnVtcHMpOwor CisjaWYgRU5BQkxFKE1BVEhfSUNfU1RBVFMpCisgICAgYXV0byBpbmxpbmVFbmQgPSBsYWJlbCgp OworICAgIGFkZExpbmtUYXNrKFs9XSAoTGlua0J1ZmZlciYgbGlua0J1ZmZlcikgeworICAgICAg ICBzaXplX3Qgc2l6ZSA9IHN0YXRpY19jYXN0PGNoYXIqPihsaW5rQnVmZmVyLmxvY2F0aW9uT2Yo aW5saW5lRW5kKS5leGVjdXRhYmxlQWRkcmVzcygpKSAtIHN0YXRpY19jYXN0PGNoYXIqPihsaW5r QnVmZmVyLmxvY2F0aW9uT2YoaW5saW5lU3RhcnQpLmV4ZWN1dGFibGVBZGRyZXNzKCkpOworICAg ICAgICBtYXRoSUMtPm1fZ2VuZXJhdGVkQ29kZVNpemUgKz0gc2l6ZTsKKyAgICB9KTsKKyNlbmRp ZgorCiAgICAgZW1pdFB1dFZpcnR1YWxSZWdpc3RlcihyZXN1bHQsIHJlc3VsdFJlZ3MpOwogfQog CkBAIC03OTMsNiArODA2LDEwIEBAIHZvaWQgSklUOjplbWl0TWF0aElDU2xvdyhKSVRNYXRoSUM8 R2VuZXIKICAgICBpZiAobWF0aElDLT5pc1JpZ2h0T3BlcmFuZFZhbGlkQ29uc3RhbnQoKSkKICAg ICAgICAgZW1pdEdldFZpcnR1YWxSZWdpc3RlcihvcDIsIHJpZ2h0UmVncyk7CiAKKyNpZiBFTkFC TEUoTUFUSF9JQ19TVEFUUykKKyAgICBhdXRvIHNsb3dQYXRoU3RhcnQgPSBsYWJlbCgpOworI2Vu ZGlmCisKICAgICBpZiAoc2hvdWxkRW1pdFByb2ZpbGluZygpKSB7CiAgICAgICAgIEFyaXRoUHJv ZmlsZSYgYXJpdGhQcm9maWxlID0gbV9jb2RlQmxvY2stPmFyaXRoUHJvZmlsZUZvclBDKGN1cnJl bnRJbnN0cnVjdGlvbik7CiAgICAgICAgIGlmIChtYXRoSUNHZW5lcmF0aW9uU3RhdGUuc2hvdWxk U2xvd1BhdGhSZXBhdGNoKQpAQCAtODAxLDYgKzgxOCwxNSBAQCB2b2lkIEpJVDo6ZW1pdE1hdGhJ Q1Nsb3coSklUTWF0aElDPEdlbmVyCiAgICAgICAgICAgICBtYXRoSUNHZW5lcmF0aW9uU3RhdGUu c2xvd1BhdGhDYWxsID0gY2FsbE9wZXJhdGlvbihwcm9maWxlZEZ1bmN0aW9uLCByZXN1bHRSZWdz LCBsZWZ0UmVncywgcmlnaHRSZWdzLCAmYXJpdGhQcm9maWxlKTsKICAgICB9IGVsc2UKICAgICAg ICAgbWF0aElDR2VuZXJhdGlvblN0YXRlLnNsb3dQYXRoQ2FsbCA9IGNhbGxPcGVyYXRpb24oYml0 d2lzZV9jYXN0PEpfSklUT3BlcmF0aW9uX0VKSk1pYz4ocmVwYXRjaEZ1bmN0aW9uKSwgcmVzdWx0 UmVncywgbGVmdFJlZ3MsIHJpZ2h0UmVncywgVHJ1c3RlZEltbVB0cihtYXRoSUMpKTsKKworI2lm IEVOQUJMRShNQVRIX0lDX1NUQVRTKQorICAgIGF1dG8gc2xvd1BhdGhFbmQgPSBsYWJlbCgpOwor ICAgIGFkZExpbmtUYXNrKFs9XSAoTGlua0J1ZmZlciYgbGlua0J1ZmZlcikgeworICAgICAgICBz aXplX3Qgc2l6ZSA9IHN0YXRpY19jYXN0PGNoYXIqPihsaW5rQnVmZmVyLmxvY2F0aW9uT2Yoc2xv d1BhdGhFbmQpLmV4ZWN1dGFibGVBZGRyZXNzKCkpIC0gc3RhdGljX2Nhc3Q8Y2hhcio+KGxpbmtC dWZmZXIubG9jYXRpb25PZihzbG93UGF0aFN0YXJ0KS5leGVjdXRhYmxlQWRkcmVzcygpKTsKKyAg ICAgICAgbWF0aElDLT5tX2dlbmVyYXRlZENvZGVTaXplICs9IHNpemU7CisgICAgfSk7CisjZW5k aWYKKwogICAgIGVtaXRQdXRWaXJ0dWFsUmVnaXN0ZXIocmVzdWx0LCByZXN1bHRSZWdzKTsKIAog ICAgIGFkZExpbmtUYXNrKFs9XSAoTGlua0J1ZmZlciYgbGlua0J1ZmZlcikgewpJbmRleDogU291 cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRNYXRoSUMuaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvaml0L0pJVE1hdGhJQy5oCShyZXZpc2lvbiAyMDM2OTMpCisrKyBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVE1hdGhJQy5oCSh3b3JraW5nIGNvcHkpCkBAIC00OCw2 ICs0OCw4IEBAIHN0cnVjdCBNYXRoSUNHZW5lcmF0aW9uU3RhdGUgewogICAgIGJvb2wgc2hvdWxk U2xvd1BhdGhSZXBhdGNoOwogfTsKIAorI2RlZmluZSBFTkFCTEVfTUFUSF9JQ19TVEFUUyAwCisK IHRlbXBsYXRlIDx0eXBlbmFtZSBHZW5lcmF0b3JUeXBlPgogY2xhc3MgSklUTWF0aElDIHsKIHB1 YmxpYzoKQEAgLTE1NCw2ICsxNTYsMTcgQEAgcHVibGljOgogICAgICAgICAgICAgc3RhcnQsIGxp bmtCdWZmZXIubG9jYXRpb25PZihzdGF0ZS5zbG93UGF0aFN0YXJ0KSk7CiAgICAgfQogCisjaWYg RU5BQkxFKE1BVEhfSUNfU1RBVFMpCisgICAgc2l6ZV90IG1fZ2VuZXJhdGVkQ29kZVNpemUgeyAw IH07CisgICAgc2l6ZV90IGNvZGVTaXplKCkgY29uc3QKKyAgICB7CisgICAgICAgIHNpemVfdCBy ZXN1bHQgPSBtX2dlbmVyYXRlZENvZGVTaXplOworICAgICAgICBpZiAobV9jb2RlKQorICAgICAg ICAgICAgcmVzdWx0ICs9IG1fY29kZS5zaXplKCk7CisgICAgICAgIHJldHVybiByZXN1bHQ7Cisg ICAgfQorI2VuZGlmCisKICAgICBNYWNyb0Fzc2VtYmxlckNvZGVSZWYgbV9jb2RlOwogICAgIENv ZGVMb2NhdGlvbkxhYmVsIG1faW5saW5lU3RhcnQ7CiAgICAgaW50MzJfdCBtX2lubGluZVNpemU7 CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVE9wZXJhdGlvbnMuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUT3BlcmF0aW9ucy5jcHAJKHJl dmlzaW9uIDIwMzY5MykKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUT3BlcmF0aW9u cy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIyOTgsNiArMjI5OCwxMCBAQCBFbmNvZGVkSlNWYWx1 ZSBKSVRfT1BFUkFUSU9OIG9wZXJhdGlvblZhCiAgICAgYXJpdGhQcm9maWxlLT5vYnNlcnZlTEhT QW5kUkhTKG9wMSwgb3AyKTsKICAgICBhdXRvIG5vbk9wdGltaXplVmFyaWFudCA9IG9wZXJhdGlv blZhbHVlQWRkUHJvZmlsZWROb09wdGltaXplOwogICAgIGFkZElDLT5nZW5lcmF0ZU91dE9mTGlu ZSgqdm0sIGV4ZWMtPmNvZGVCbG9jaygpLCBub25PcHRpbWl6ZVZhcmlhbnQpOworCisjaWYgRU5B QkxFKE1BVEhfSUNfU1RBVFMpCisgICAgZXhlYy0+Y29kZUJsb2NrKCktPmR1bXBNYXRoSUNTdGF0 cygpOworI2VuZGlmCiAgICAgCiAgICAgSlNWYWx1ZSByZXN1bHQgPSBqc0FkZChleGVjLCBvcDEs IG9wMik7CiAgICAgYXJpdGhQcm9maWxlLT5vYnNlcnZlUmVzdWx0KHJlc3VsdCk7CkBAIC0yMzE4 LDYgKzIzMjIsMTAgQEAgRW5jb2RlZEpTVmFsdWUgSklUX09QRVJBVElPTiBvcGVyYXRpb25WYQog ICAgIGF1dG8gbm9uT3B0aW1pemVWYXJpYW50ID0gb3BlcmF0aW9uVmFsdWVBZGROb09wdGltaXpl OwogICAgIGFkZElDLT5nZW5lcmF0ZU91dE9mTGluZSgqdm0sIGV4ZWMtPmNvZGVCbG9jaygpLCBu b25PcHRpbWl6ZVZhcmlhbnQpOwogCisjaWYgRU5BQkxFKE1BVEhfSUNfU1RBVFMpCisgICAgZXhl Yy0+Y29kZUJsb2NrKCktPmR1bXBNYXRoSUNTdGF0cygpOworI2VuZGlmCisKICAgICBKU1ZhbHVl IG9wMSA9IEpTVmFsdWU6OmRlY29kZShlbmNvZGVkT3AxKTsKICAgICBKU1ZhbHVlIG9wMiA9IEpT VmFsdWU6OmRlY29kZShlbmNvZGVkT3AyKTsKICAgICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKGpz QWRkKGV4ZWMsIG9wMSwgb3AyKSk7CkBAIC0yMzg2LDYgKzIzOTQsMTAgQEAgRW5jb2RlZEpTVmFs dWUgSklUX09QRVJBVElPTiBvcGVyYXRpb25WYQogICAgIGF1dG8gbm9uT3B0aW1pemVWYXJpYW50 ID0gb3BlcmF0aW9uVmFsdWVNdWxOb09wdGltaXplOwogICAgIG11bElDLT5nZW5lcmF0ZU91dE9m TGluZSgqdm0sIGV4ZWMtPmNvZGVCbG9jaygpLCBub25PcHRpbWl6ZVZhcmlhbnQpOwogCisjaWYg RU5BQkxFKE1BVEhfSUNfU1RBVFMpCisgICAgZXhlYy0+Y29kZUJsb2NrKCktPmR1bXBNYXRoSUNT dGF0cygpOworI2VuZGlmCisKICAgICByZXR1cm4gdW5wcm9maWxlZE11bChleGVjLCBlbmNvZGVk T3AxLCBlbmNvZGVkT3AyKTsKIH0KIApAQCAtMjQwNiw2ICsyNDE4LDEwIEBAIEVuY29kZWRKU1Zh bHVlIEpJVF9PUEVSQVRJT04gb3BlcmF0aW9uVmEKICAgICBhdXRvIG5vbk9wdGltaXplVmFyaWFu dCA9IG9wZXJhdGlvblZhbHVlTXVsUHJvZmlsZWROb09wdGltaXplOwogICAgIG11bElDLT5nZW5l cmF0ZU91dE9mTGluZSgqdm0sIGV4ZWMtPmNvZGVCbG9jaygpLCBub25PcHRpbWl6ZVZhcmlhbnQp OwogCisjaWYgRU5BQkxFKE1BVEhfSUNfU1RBVFMpCisgICAgZXhlYy0+Y29kZUJsb2NrKCktPmR1 bXBNYXRoSUNTdGF0cygpOworI2VuZGlmCisKICAgICByZXR1cm4gcHJvZmlsZWRNdWwoZXhlYywg ZW5jb2RlZE9wMSwgZW5jb2RlZE9wMiwgYXJpdGhQcm9maWxlLCBmYWxzZSk7CiB9CiAK