75199 2011-12-24 14:35:21 -0800 The ArgumentCount field in the CallFrame should have its tag left blank for other uses 2011-12-25 18:54:04 -0800 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 fpizlo webkit-unassigned oldest_to_newest 527025 0 fpizlo 2011-12-24 14:35:21 -0800 Patch forthcoming. 527026 1 fpizlo 2011-12-24 14:35:29 -0800 This looks neutral. Benchmark report for SunSpider, V8, and Kraken on bigmac (MacPro5,1). VMs tested: "TipOfTree" at /Volumes/Data/pizlo/quinary/OpenSource/WebKitBuild/Release/jsc (r103662) "ArgCountPayload" at /Volumes/Data/pizlo/OpenSource/WebKitBuild/Release/jsc (r103662) Collected 12 samples per benchmark/VM, with 4 VM invocations per benchmark. Emitted a call to gc() between sample measurements. Used 1 benchmark iteration per VM invocation for warm-up. Used the jsc-specific preciseTime() function to get microsecond-level timing. Reporting benchmark execution times with 95% confidence intervals in milliseconds. TipOfTree ArgCountPayload SunSpider: 3d-cube 5.8577+-0.0457 ! 6.1934+-0.0206 ! definitely 1.0573x slower 3d-morph 8.8313+-0.1031 ^ 8.4641+-0.1097 ^ definitely 1.0434x faster 3d-raytrace 7.6188+-0.0820 7.5398+-0.0692 might be 1.0105x faster access-binary-trees 1.5984+-0.0099 ? 1.6007+-0.0094 ? access-fannkuch 7.5037+-0.0104 ! 7.5936+-0.0556 ! definitely 1.0120x slower access-nbody 3.9462+-0.0071 ? 3.9515+-0.0097 ? access-nsieve 3.1351+-0.0515 3.1251+-0.0432 bitops-3bit-bits-in-byte 1.2467+-0.0142 ? 1.2561+-0.0157 ? bitops-bits-in-byte 5.1008+-0.0512 5.0160+-0.0468 might be 1.0169x faster bitops-bitwise-and 3.2987+-0.0206 3.2855+-0.0047 bitops-nsieve-bits 5.6916+-0.0538 5.6454+-0.0493 controlflow-recursive 2.3411+-0.0128 2.3335+-0.0101 crypto-aes 7.4948+-0.0339 ? 7.5048+-0.0352 ? crypto-md5 2.4716+-0.0193 ? 2.4782+-0.0201 ? crypto-sha1 2.2424+-0.0214 ? 2.2488+-0.0240 ? date-format-tofte 10.4520+-0.0772 ? 10.5273+-0.1198 ? date-format-xparb 9.8497+-0.0642 ! 10.4410+-0.1977 ! definitely 1.0600x slower math-cordic 7.2277+-0.0559 ? 7.3120+-0.1018 ? might be 1.0117x slower math-partial-sums 10.4219+-0.0092 ? 10.4440+-0.0387 ? math-spectral-norm 2.6396+-0.0052 ? 2.6407+-0.0100 ? regexp-dna 8.8854+-0.0963 ? 8.9600+-0.0721 ? string-base64 4.3374+-0.0303 4.2874+-0.0239 might be 1.0117x faster string-fasta 7.2840+-0.0705 7.2219+-0.0147 string-tagcloud 12.4754+-0.0461 12.3926+-0.0597 string-unpack-code 20.3865+-0.0978 ? 20.4062+-0.0888 ? string-validate-input 5.6296+-0.0324 5.6070+-0.0285 <arithmetic> * 6.4603+-0.0212 ? 6.4799+-0.0159 ? might be 1.0030x slower <geometric> 5.2604+-0.0202 ? 5.2714+-0.0161 ? might be 1.0021x slower <harmonic> 4.1714+-0.0204 ? 4.1782+-0.0181 ? might be 1.0016x slower TipOfTree ArgCountPayload V8: crypto 78.0675+-0.3137 77.8171+-0.3602 deltablue 171.4637+-0.5150 ^ 167.6141+-0.3777 ^ definitely 1.0230x faster earley-boyer 99.2320+-1.2425 ? 99.3733+-1.2785 ? raytrace 52.1713+-0.4113 ^ 51.4091+-0.2221 ^ definitely 1.0148x faster regexp 120.9003+-0.5036 ! 122.1827+-0.3873 ! definitely 1.0106x slower richards 138.0955+-0.2675 ? 138.9790+-0.9531 ? splay 88.9065+-0.6555 ! 92.0309+-2.2569 ! definitely 1.0351x slower <arithmetic> 106.9767+-0.2359 ? 107.0580+-0.4154 ? might be 1.0008x slower <geometric> * 100.3999+-0.2618 ? 100.5686+-0.4412 ? might be 1.0017x slower <harmonic> 93.7660+-0.2931 ? 93.8409+-0.4177 ? might be 1.0008x slower TipOfTree ArgCountPayload Kraken: ai-astar 818.8230+-10.7242 ? 821.6242+-12.1917 ? audio-beat-detection 191.3774+-0.3651 ? 191.4837+-0.4960 ? audio-dft 274.9830+-2.6713 ? 275.4426+-2.8746 ? audio-fft 119.6430+-1.0735 119.6197+-0.6903 audio-oscillator 283.8881+-3.1189 280.9616+-1.9885 might be 1.0104x faster imaging-darkroom 301.1023+-6.3739 299.9262+-6.4462 imaging-desaturate 230.0989+-0.1701 ? 230.1786+-0.1203 ? imaging-gaussian-blur 519.3550+-0.2594 ? 520.1332+-2.0884 ? json-parse-financial 72.1991+-0.3767 ^ 70.7429+-0.2089 ^ definitely 1.0206x faster json-stringify-tinderbox 81.6776+-0.1959 81.6460+-0.2903 stanford-crypto-aes 118.9614+-0.3827 ^ 118.1380+-0.4393 ^ definitely 1.0070x faster stanford-crypto-ccm 115.5464+-0.7556 ^ 113.8675+-0.8451 ^ definitely 1.0147x faster stanford-crypto-pbkdf2 229.9377+-0.6722 ? 230.4209+-0.7746 ? stanford-crypto-sha256-iterative 95.0573+-0.1615 95.0260+-0.2973 <arithmetic> * 246.6179+-1.0310 246.3722+-1.1658 might be 1.0010x faster <geometric> 192.1019+-0.4651 191.4509+-0.5324 might be 1.0034x faster <harmonic> 156.2700+-0.2787 ^ 155.3966+-0.2632 ^ definitely 1.0056x faster TipOfTree ArgCountPayload All benchmarks: <arithmetic> 92.9671+-0.3387 92.9169+-0.3713 might be 1.0005x faster <geometric> 23.8337+-0.0701 ? 23.8431+-0.0644 ? might be 1.0004x slower <harmonic> 7.3471+-0.0353 ? 7.3582+-0.0314 ? might be 1.0015x slower TipOfTree ArgCountPayload Geomean of preferred means: <scaled-result> 54.2836+-0.1565 ? 54.3504+-0.1545 ? might be 1.0012x slower 527027 2 fpizlo 2011-12-24 14:36:09 -0800 <rdar://problem/10625105> 527028 3 120504 fpizlo 2011-12-24 14:41:16 -0800 Created attachment 120504 the patch 527095 4 fpizlo 2011-12-25 18:54:04 -0800 Landed in http://trac.webkit.org/changeset/103674 120504 2011-12-24 14:41:16 -0800 2011-12-25 16:59:34 -0800 the patch untaggedargcount_patch_1.diff text/plain 13037 fpizlo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTAzNjY0KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM3IEBA CisyMDExLTEyLTI0ICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CisKKyAgICAgICAg VGhlIEFyZ3VtZW50Q291bnQgZmllbGQgaW4gdGhlIENhbGxGcmFtZSBzaG91bGQgaGF2ZSBpdHMg cGF5bG9hZCBsZWZ0IGJsYW5rIGZvciBvdGhlciB1c2VzCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NTE5OQorICAgICAgICA8cmRhcjovL3Byb2JsZW0v MTA2MjUxMDU+CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xMDYyNTEwNj4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGRmZy9ERkdPU1JFeGl0Q29t cGlsZXIzMl82NC5jcHA6CisgICAgICAgIChKU0M6OkRGRzo6T1NSRXhpdENvbXBpbGVyOjpjb21w aWxlRXhpdCk6CisgICAgICAgICogZGZnL0RGR09TUkV4aXRDb21waWxlcjY0LmNwcDoKKyAgICAg ICAgKEpTQzo6REZHOjpPU1JFeGl0Q29tcGlsZXI6OmNvbXBpbGVFeGl0KToKKyAgICAgICAgKiBk ZmcvREZHU3BlY3VsYXRpdmVKSVQuaDoKKyAgICAgICAgKEpTQzo6REZHOjpTcGVjdWxhdGl2ZUpJ VDo6YXJndW1lbnRQYXlsb2FkU2xvdCk6CisgICAgICAgICogZGZnL0RGR1NwZWN1bGF0aXZlSklU MzJfNjQuY3BwOgorICAgICAgICAoSlNDOjpERkc6OlNwZWN1bGF0aXZlSklUOjplbWl0Q2FsbCk6 CisgICAgICAgICogZGZnL0RGR1NwZWN1bGF0aXZlSklUNjQuY3BwOgorICAgICAgICAoSlNDOjpE Rkc6OlNwZWN1bGF0aXZlSklUOjplbWl0Q2FsbCk6CisgICAgICAgICogaW50ZXJwcmV0ZXIvQ2Fs bEZyYW1lLmg6CisgICAgICAgIChKU0M6OkV4ZWNTdGF0ZTo6YXJndW1lbnRDb3VudEluY2x1ZGlu Z1RoaXMpOgorICAgICAgICAoSlNDOjpFeGVjU3RhdGU6OnNldEFyZ3VtZW50Q291bnRJbmNsdWRp bmdUaGlzKToKKyAgICAgICAgKiBpbnRlcnByZXRlci9SZWdpc3Rlci5oOgorICAgICAgICAoSlND OjpSZWdpc3Rlcjo6dW5ib3hlZEludDMyKToKKyAgICAgICAgKEpTQzo6UmVnaXN0ZXI6OnVuYm94 ZWRCb29sZWFuKToKKyAgICAgICAgKEpTQzo6UmVnaXN0ZXI6OnVuYm94ZWRDZWxsKToKKyAgICAg ICAgKEpTQzo6UmVnaXN0ZXI6OnBheWxvYWQpOgorICAgICAgICAoSlNDOjpSZWdpc3Rlcjo6dGFn KToKKyAgICAgICAgKiBqaXQvSklUQ2FsbC5jcHA6CisgICAgICAgIChKU0M6OkpJVDo6Y29tcGls ZU9wQ2FsbCk6CisgICAgICAgICogaml0L0pJVENhbGwzMl82NC5jcHA6CisgICAgICAgIChKU0M6 OkpJVDo6Y29tcGlsZUxvYWRWYXJhcmdzKToKKyAgICAgICAgKEpTQzo6SklUOjpjb21waWxlT3BD YWxsKToKKwogMjAxMS0xMi0yMyAgR2VvZmZyZXkgR2FyZW4gIDxnZ2FyZW5AYXBwbGUuY29tPgog CiAgICAgICAgIElubGluZWQgWWFycjo6ZXhlY3V0ZQpJbmRleDogU291cmNlL0phdmFTY3JpcHRD b3JlL2RmZy9ERkdPU1JFeGl0Q29tcGlsZXIzMl82NC5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L0phdmFTY3JpcHRDb3JlL2RmZy9ERkdPU1JFeGl0Q29tcGlsZXIzMl82NC5jcHAJKHJldmlzaW9u IDEwMzY2MikKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHT1NSRXhpdENvbXBpbGVy MzJfNjQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01NzIsNyArNTcyLDYgQEAgdm9pZCBPU1JFeGl0 Q29tcGlsZXI6OmNvbXBpbGVFeGl0KGNvbnN0IAogICAgICAgICBtX2ppdC5zdG9yZTMyKEFzc2Vt Ymx5SGVscGVyczo6SW1tMzIoSlNWYWx1ZTo6Q2VsbFRhZyksIEFzc2VtYmx5SGVscGVyczo6dGFn Rm9yKChWaXJ0dWFsUmVnaXN0ZXIpKGlubGluZUNhbGxGcmFtZS0+c3RhY2tPZmZzZXQgKyBSZWdp c3RlckZpbGU6OkNhbGxlckZyYW1lKSkpOwogICAgICAgICBtX2ppdC5zdG9yZVB0cihjYWxsZXJG cmFtZUdQUiwgQXNzZW1ibHlIZWxwZXJzOjpwYXlsb2FkRm9yKChWaXJ0dWFsUmVnaXN0ZXIpKGlu bGluZUNhbGxGcmFtZS0+c3RhY2tPZmZzZXQgKyBSZWdpc3RlckZpbGU6OkNhbGxlckZyYW1lKSkp OwogICAgICAgICBtX2ppdC5zdG9yZVB0cihBc3NlbWJseUhlbHBlcnM6OlRydXN0ZWRJbW1QdHIo anVtcFRhcmdldCksIEFzc2VtYmx5SGVscGVyczo6cGF5bG9hZEZvcigoVmlydHVhbFJlZ2lzdGVy KShpbmxpbmVDYWxsRnJhbWUtPnN0YWNrT2Zmc2V0ICsgUmVnaXN0ZXJGaWxlOjpSZXR1cm5QQykp KTsKLSAgICAgICAgbV9qaXQuc3RvcmUzMihBc3NlbWJseUhlbHBlcnM6OkltbTMyKEpTVmFsdWU6 OkludDMyVGFnKSwgQXNzZW1ibHlIZWxwZXJzOjp0YWdGb3IoKFZpcnR1YWxSZWdpc3RlcikoaW5s aW5lQ2FsbEZyYW1lLT5zdGFja09mZnNldCArIFJlZ2lzdGVyRmlsZTo6QXJndW1lbnRDb3VudCkp KTsKICAgICAgICAgbV9qaXQuc3RvcmUzMihBc3NlbWJseUhlbHBlcnM6OkltbTMyKGlubGluZUNh bGxGcmFtZS0+YXJndW1lbnRzLnNpemUoKSksIEFzc2VtYmx5SGVscGVyczo6cGF5bG9hZEZvcigo VmlydHVhbFJlZ2lzdGVyKShpbmxpbmVDYWxsRnJhbWUtPnN0YWNrT2Zmc2V0ICsgUmVnaXN0ZXJG aWxlOjpBcmd1bWVudENvdW50KSkpOwogICAgICAgICBtX2ppdC5zdG9yZTMyKEFzc2VtYmx5SGVs cGVyczo6SW1tMzIoSlNWYWx1ZTo6Q2VsbFRhZyksIEFzc2VtYmx5SGVscGVyczo6dGFnRm9yKChW aXJ0dWFsUmVnaXN0ZXIpKGlubGluZUNhbGxGcmFtZS0+c3RhY2tPZmZzZXQgKyBSZWdpc3RlckZp bGU6OkNhbGxlZSkpKTsKICAgICAgICAgbV9qaXQuc3RvcmVQdHIoQXNzZW1ibHlIZWxwZXJzOjpU cnVzdGVkSW1tUHRyKGlubGluZUNhbGxGcmFtZS0+Y2FsbGVlLmdldCgpKSwgQXNzZW1ibHlIZWxw ZXJzOjpwYXlsb2FkRm9yKChWaXJ0dWFsUmVnaXN0ZXIpKGlubGluZUNhbGxGcmFtZS0+c3RhY2tP ZmZzZXQgKyBSZWdpc3RlckZpbGU6OkNhbGxlZSkpKTsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9kZmcvREZHT1NSRXhpdENvbXBpbGVyNjQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9kZmcvREZHT1NSRXhpdENvbXBpbGVyNjQuY3BwCShyZXZpc2lvbiAxMDM2 NjIpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR09TUkV4aXRDb21waWxlcjY0LmNw cAkod29ya2luZyBjb3B5KQpAQCAtNTk4LDcgKzU5OCw3IEBAIHZvaWQgT1NSRXhpdENvbXBpbGVy Ojpjb21waWxlRXhpdChjb25zdCAKICAgICAgICAgbV9qaXQuc3RvcmVQdHIoQXNzZW1ibHlIZWxw ZXJzOjpUcnVzdGVkSW1tUHRyKGlubGluZUNhbGxGcmFtZS0+Y2FsbGVlLT5zY29wZSgpKSwgQXNz ZW1ibHlIZWxwZXJzOjphZGRyZXNzRm9yKChWaXJ0dWFsUmVnaXN0ZXIpKGlubGluZUNhbGxGcmFt ZS0+c3RhY2tPZmZzZXQgKyBSZWdpc3RlckZpbGU6OlNjb3BlQ2hhaW4pKSk7CiAgICAgICAgIG1f aml0LnN0b3JlUHRyKGNhbGxlckZyYW1lR1BSLCBBc3NlbWJseUhlbHBlcnM6OmFkZHJlc3NGb3Io KFZpcnR1YWxSZWdpc3RlcikoaW5saW5lQ2FsbEZyYW1lLT5zdGFja09mZnNldCArIFJlZ2lzdGVy RmlsZTo6Q2FsbGVyRnJhbWUpKSk7CiAgICAgICAgIG1faml0LnN0b3JlUHRyKEFzc2VtYmx5SGVs cGVyczo6VHJ1c3RlZEltbVB0cihqdW1wVGFyZ2V0KSwgQXNzZW1ibHlIZWxwZXJzOjphZGRyZXNz Rm9yKChWaXJ0dWFsUmVnaXN0ZXIpKGlubGluZUNhbGxGcmFtZS0+c3RhY2tPZmZzZXQgKyBSZWdp c3RlckZpbGU6OlJldHVyblBDKSkpOwotICAgICAgICBtX2ppdC5zdG9yZVB0cihBc3NlbWJseUhl bHBlcnM6OlRydXN0ZWRJbW1QdHIoSlNWYWx1ZTo6ZW5jb2RlKGpzTnVtYmVyKGlubGluZUNhbGxG cmFtZS0+YXJndW1lbnRzLnNpemUoKSkpKSwgQXNzZW1ibHlIZWxwZXJzOjphZGRyZXNzRm9yKChW aXJ0dWFsUmVnaXN0ZXIpKGlubGluZUNhbGxGcmFtZS0+c3RhY2tPZmZzZXQgKyBSZWdpc3RlckZp bGU6OkFyZ3VtZW50Q291bnQpKSk7CisgICAgICAgIG1faml0LnN0b3JlMzIoQXNzZW1ibHlIZWxw ZXJzOjpUcnVzdGVkSW1tMzIoaW5saW5lQ2FsbEZyYW1lLT5hcmd1bWVudHMuc2l6ZSgpKSwgQXNz ZW1ibHlIZWxwZXJzOjpwYXlsb2FkRm9yKChWaXJ0dWFsUmVnaXN0ZXIpKGlubGluZUNhbGxGcmFt ZS0+c3RhY2tPZmZzZXQgKyBSZWdpc3RlckZpbGU6OkFyZ3VtZW50Q291bnQpKSk7CiAgICAgICAg IG1faml0LnN0b3JlUHRyKEFzc2VtYmx5SGVscGVyczo6VHJ1c3RlZEltbVB0cihpbmxpbmVDYWxs RnJhbWUtPmNhbGxlZS5nZXQoKSksIEFzc2VtYmx5SGVscGVyczo6YWRkcmVzc0ZvcigoVmlydHVh bFJlZ2lzdGVyKShpbmxpbmVDYWxsRnJhbWUtPnN0YWNrT2Zmc2V0ICsgUmVnaXN0ZXJGaWxlOjpD YWxsZWUpKSk7CiAgICAgfQogICAgIApJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9E RkdTcGVjdWxhdGl2ZUpJVDMyXzY0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlw dENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklUMzJfNjQuY3BwCShyZXZpc2lvbiAxMDM2NjIpCisr KyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklUMzJfNjQuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC04OTUsNyArODk1LDYgQEAgdm9pZCBTcGVjdWxhdGl2ZUpJVDo6ZW1p dENhbGwoTm9kZSYgbm9kZQogICAgIGludCBudW1QYXNzZWRBcmdzID0gbm9kZS5udW1DaGlsZHJl bigpIC0gMTsKIAogICAgIG1faml0LnN0b3JlMzIoTWFjcm9Bc3NlbWJsZXI6OlRydXN0ZWRJbW0z MihudW1QYXNzZWRBcmdzICsgZHVtbXlUaGlzQXJndW1lbnQpLCBjYWxsRnJhbWVQYXlsb2FkU2xv dChSZWdpc3RlckZpbGU6OkFyZ3VtZW50Q291bnQpKTsKLSAgICBtX2ppdC5zdG9yZTMyKE1hY3Jv QXNzZW1ibGVyOjpUcnVzdGVkSW1tMzIoSlNWYWx1ZTo6SW50MzJUYWcpLCBjYWxsRnJhbWVUYWdT bG90KFJlZ2lzdGVyRmlsZTo6QXJndW1lbnRDb3VudCkpOwogICAgIG1faml0LnN0b3JlUHRyKEdQ UkluZm86OmNhbGxGcmFtZVJlZ2lzdGVyLCBjYWxsRnJhbWVQYXlsb2FkU2xvdChSZWdpc3RlckZp bGU6OkNhbGxlckZyYW1lKSk7CiAgICAgbV9qaXQuc3RvcmUzMihjYWxsZWVQYXlsb2FkR1BSLCBj YWxsRnJhbWVQYXlsb2FkU2xvdChSZWdpc3RlckZpbGU6OkNhbGxlZSkpOwogICAgIG1faml0LnN0 b3JlMzIoY2FsbGVlVGFnR1BSLCBjYWxsRnJhbWVUYWdTbG90KFJlZ2lzdGVyRmlsZTo6Q2FsbGVl KSk7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklUNjQu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU3BlY3VsYXRp dmVKSVQ2NC5jcHAJKHJldmlzaW9uIDEwMzY2MikKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9k ZmcvREZHU3BlY3VsYXRpdmVKSVQ2NC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTkyNCw3ICs5MjQs NyBAQCB2b2lkIFNwZWN1bGF0aXZlSklUOjplbWl0Q2FsbChOb2RlJiBub2RlCiAgICAgLy8gcmVj ZWl2ZXIgKG1ldGhvZCBjYWxsKS4gc3Vic2VxdWVudCBjaGlsZHJlbiBhcmUgdGhlIGFyZ3VtZW50 cy4KICAgICBpbnQgbnVtUGFzc2VkQXJncyA9IG5vZGUubnVtQ2hpbGRyZW4oKSAtIDE7CiAgICAg Ci0gICAgbV9qaXQuc3RvcmVQdHIoTWFjcm9Bc3NlbWJsZXI6OlRydXN0ZWRJbW1QdHIoSlNWYWx1 ZTo6ZW5jb2RlKGpzTnVtYmVyKG51bVBhc3NlZEFyZ3MgKyBkdW1teVRoaXNBcmd1bWVudCkpKSwg Y2FsbEZyYW1lU2xvdChSZWdpc3RlckZpbGU6OkFyZ3VtZW50Q291bnQpKTsKKyAgICBtX2ppdC5z dG9yZTMyKE1hY3JvQXNzZW1ibGVyOjpUcnVzdGVkSW1tMzIobnVtUGFzc2VkQXJncyArIGR1bW15 VGhpc0FyZ3VtZW50KSwgY2FsbEZyYW1lUGF5bG9hZFNsb3QoUmVnaXN0ZXJGaWxlOjpBcmd1bWVu dENvdW50KSk7CiAgICAgbV9qaXQuc3RvcmVQdHIoR1BSSW5mbzo6Y2FsbEZyYW1lUmVnaXN0ZXIs IGNhbGxGcmFtZVNsb3QoUmVnaXN0ZXJGaWxlOjpDYWxsZXJGcmFtZSkpOwogICAgIG1faml0LnN0 b3JlUHRyKGNhbGxlZUdQUiwgY2FsbEZyYW1lU2xvdChSZWdpc3RlckZpbGU6OkNhbGxlZSkpOwog ICAgIApJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVC5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVK SVQuaAkocmV2aXNpb24gMTAzNjYyKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdT cGVjdWxhdGl2ZUpJVC5oCSh3b3JraW5nIGNvcHkpCkBAIC04OTgsNyArODk4LDYgQEAgcHJpdmF0 ZToKICAgICAgICAgcmV0dXJuIE1hY3JvQXNzZW1ibGVyOjpBZGRyZXNzKEdQUkluZm86OmNhbGxG cmFtZVJlZ2lzdGVyLCAobV9qaXQuY29kZUJsb2NrKCktPm1fbnVtQ2FsbGVlUmVnaXN0ZXJzICsg YXJndW1lbnRUb09wZXJhbmQoYXJndW1lbnQpKSAqIHN0YXRpY19jYXN0PGludD4oc2l6ZW9mKFJl Z2lzdGVyKSkpOwogICAgIH0KIAotI2lmIFVTRShKU1ZBTFVFMzJfNjQpICAgIAogICAgIE1hY3Jv QXNzZW1ibGVyOjpBZGRyZXNzIGNhbGxGcmFtZVRhZ1Nsb3QoaW50IHNsb3QpCiAgICAgewogICAg ICAgICByZXR1cm4gTWFjcm9Bc3NlbWJsZXI6OkFkZHJlc3MoR1BSSW5mbzo6Y2FsbEZyYW1lUmVn aXN0ZXIsIChtX2ppdC5jb2RlQmxvY2soKS0+bV9udW1DYWxsZWVSZWdpc3RlcnMgKyBzbG90KSAq IHN0YXRpY19jYXN0PGludD4oc2l6ZW9mKFJlZ2lzdGVyKSkgKyBPQkpFQ1RfT0ZGU0VUT0YoRW5j b2RlZFZhbHVlRGVzY3JpcHRvciwgYXNCaXRzLnRhZykpOwpAQCAtOTE4LDcgKzkxNyw2IEBAIHBy aXZhdGU6CiAgICAgewogICAgICAgICByZXR1cm4gTWFjcm9Bc3NlbWJsZXI6OkFkZHJlc3MoR1BS SW5mbzo6Y2FsbEZyYW1lUmVnaXN0ZXIsIChtX2ppdC5jb2RlQmxvY2soKS0+bV9udW1DYWxsZWVS ZWdpc3RlcnMgKyBhcmd1bWVudFRvT3BlcmFuZChhcmd1bWVudCkpICogc3RhdGljX2Nhc3Q8aW50 PihzaXplb2YoUmVnaXN0ZXIpKSArIE9CSkVDVF9PRkZTRVRPRihFbmNvZGVkVmFsdWVEZXNjcmlw dG9yLCBhc0JpdHMucGF5bG9hZCkpOwogICAgIH0KLSNlbmRpZgogCiAgICAgdm9pZCBlbWl0Q2Fs bChOb2RlJik7CiAgICAgCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaW50ZXJwcmV0ZXIv Q2FsbEZyYW1lLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2ludGVycHJl dGVyL0NhbGxGcmFtZS5oCShyZXZpc2lvbiAxMDM2NjIpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENv cmUvaW50ZXJwcmV0ZXIvQ2FsbEZyYW1lLmgJKHdvcmtpbmcgY29weSkKQEAgLTE0NCw3ICsxNDQs NyBAQCBuYW1lc3BhY2UgSlNDICB7CiAKICAgICAgICAgLy8gQWNjZXNzIHRvIGFyZ3VtZW50cy4K ICAgICAgICAgc2l6ZV90IGFyZ3VtZW50Q291bnQoKSBjb25zdCB7IHJldHVybiBhcmd1bWVudENv dW50SW5jbHVkaW5nVGhpcygpIC0gMTsgfQotICAgICAgICBzaXplX3QgYXJndW1lbnRDb3VudElu Y2x1ZGluZ1RoaXMoKSBjb25zdCB7IHJldHVybiB0aGlzW1JlZ2lzdGVyRmlsZTo6QXJndW1lbnRD b3VudF0uaSgpOyB9CisgICAgICAgIHNpemVfdCBhcmd1bWVudENvdW50SW5jbHVkaW5nVGhpcygp IGNvbnN0IHsgcmV0dXJuIHRoaXNbUmVnaXN0ZXJGaWxlOjpBcmd1bWVudENvdW50XS5wYXlsb2Fk KCk7IH0KICAgICAgICAgc3RhdGljIGludCBhcmd1bWVudE9mZnNldChzaXplX3QgYXJndW1lbnQp IHsgcmV0dXJuIHNfZmlyc3RBcmd1bWVudE9mZnNldCAtIGFyZ3VtZW50OyB9CiAgICAgICAgIHN0 YXRpYyBpbnQgYXJndW1lbnRPZmZzZXRJbmNsdWRpbmdUaGlzKHNpemVfdCBhcmd1bWVudCkgeyBy ZXR1cm4gc190aGlzQXJndW1lbnRPZmZzZXQgLSBhcmd1bWVudDsgfQogCkBAIC0xNzUsNyArMTc1 LDcgQEAgbmFtZXNwYWNlIEpTQyAgewogICAgICAgICBDYWxsRnJhbWUqIGFkZEhvc3RDYWxsRnJh bWVGbGFnKCkgY29uc3QgeyByZXR1cm4gcmVpbnRlcnByZXRfY2FzdDxDYWxsRnJhbWUqPihyZWlu dGVycHJldF9jYXN0PGludHB0cl90Pih0aGlzKSB8IEhvc3RDYWxsRnJhbWVGbGFnKTsgfQogICAg ICAgICBDYWxsRnJhbWUqIHJlbW92ZUhvc3RDYWxsRnJhbWVGbGFnKCkgeyByZXR1cm4gcmVpbnRl cnByZXRfY2FzdDxDYWxsRnJhbWUqPihyZWludGVycHJldF9jYXN0PGludHB0cl90Pih0aGlzKSAm IH5Ib3N0Q2FsbEZyYW1lRmxhZyk7IH0KIAotICAgICAgICB2b2lkIHNldEFyZ3VtZW50Q291bnRJ bmNsdWRpbmdUaGlzKGludCBjb3VudCkgeyBzdGF0aWNfY2FzdDxSZWdpc3Rlcio+KHRoaXMpW1Jl Z2lzdGVyRmlsZTo6QXJndW1lbnRDb3VudF0gPSBSZWdpc3Rlcjo6d2l0aEludChjb3VudCk7IH0K KyAgICAgICAgdm9pZCBzZXRBcmd1bWVudENvdW50SW5jbHVkaW5nVGhpcyhpbnQgY291bnQpIHsg c3RhdGljX2Nhc3Q8UmVnaXN0ZXIqPih0aGlzKVtSZWdpc3RlckZpbGU6OkFyZ3VtZW50Q291bnRd LnBheWxvYWQoKSA9IGNvdW50OyB9CiAgICAgICAgIHZvaWQgc2V0Q2FsbGVlKEpTT2JqZWN0KiBj YWxsZWUpIHsgc3RhdGljX2Nhc3Q8UmVnaXN0ZXIqPih0aGlzKVtSZWdpc3RlckZpbGU6OkNhbGxl ZV0gPSBSZWdpc3Rlcjo6d2l0aENhbGxlZShjYWxsZWUpOyB9CiAgICAgICAgIHZvaWQgc2V0Q29k ZUJsb2NrKENvZGVCbG9jayogY29kZUJsb2NrKSB7IHN0YXRpY19jYXN0PFJlZ2lzdGVyKj4odGhp cylbUmVnaXN0ZXJGaWxlOjpDb2RlQmxvY2tdID0gY29kZUJsb2NrOyB9CiAgICAgICAgIHZvaWQg c2V0UmV0dXJuUEModm9pZCogdmFsdWUpIHsgc3RhdGljX2Nhc3Q8UmVnaXN0ZXIqPih0aGlzKVtS ZWdpc3RlckZpbGU6OlJldHVyblBDXSA9IChJbnN0cnVjdGlvbiopdmFsdWU7IH0KSW5kZXg6IFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9pbnRlcnByZXRlci9SZWdpc3Rlci5oCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnRlcnByZXRlci9SZWdpc3Rlci5oCShyZXZpc2lvbiAx MDM2NjIpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaW50ZXJwcmV0ZXIvUmVnaXN0ZXIuaAko d29ya2luZyBjb3B5KQpAQCAtNzUsNiArNzUsMTAgQEAgbmFtZXNwYWNlIEpTQyB7CiAgICAgICAg IGludDMyX3QgdW5ib3hlZEludDMyKCkgY29uc3Q7CiAgICAgICAgIGJvb2wgdW5ib3hlZEJvb2xl YW4oKSBjb25zdDsKICAgICAgICAgSlNDZWxsKiB1bmJveGVkQ2VsbCgpIGNvbnN0OworICAgICAg ICBpbnQzMl90IHBheWxvYWQoKSBjb25zdDsKKyAgICAgICAgaW50MzJfdCB0YWcoKSBjb25zdDsK KyAgICAgICAgaW50MzJfdCYgcGF5bG9hZCgpOworICAgICAgICBpbnQzMl90JiB0YWcoKTsKIAog ICAgICAgICBzdGF0aWMgUmVnaXN0ZXIgd2l0aEludChpbnQzMl90IGkpCiAgICAgICAgIHsKQEAg LTE3NiwxMiArMTgwLDEyIEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICAKICAgICBBTFdBWVNf SU5MSU5FIGludDMyX3QgUmVnaXN0ZXI6OnVuYm94ZWRJbnQzMigpIGNvbnN0CiAgICAgewotICAg ICAgICByZXR1cm4gdS5lbmNvZGVkVmFsdWUuYXNCaXRzLnBheWxvYWQ7CisgICAgICAgIHJldHVy biBwYXlsb2FkKCk7CiAgICAgfQogCiAgICAgQUxXQVlTX0lOTElORSBib29sIFJlZ2lzdGVyOjp1 bmJveGVkQm9vbGVhbigpIGNvbnN0CiAgICAgewotICAgICAgICByZXR1cm4gISF1LmVuY29kZWRW YWx1ZS5hc0JpdHMucGF5bG9hZDsKKyAgICAgICAgcmV0dXJuICEhcGF5bG9hZCgpOwogICAgIH0K IAogICAgIEFMV0FZU19JTkxJTkUgSlNDZWxsKiBSZWdpc3Rlcjo6dW5ib3hlZENlbGwoKSBjb25z dApAQCAtMTg5LDEwICsxOTMsMzAgQEAgbmFtZXNwYWNlIEpTQyB7CiAjaWYgVVNFKEpTVkFMVUU2 NCkKICAgICAgICAgcmV0dXJuIHUuZW5jb2RlZFZhbHVlLnB0cjsKICNlbHNlCi0gICAgICAgIHJl dHVybiBiaXR3aXNlX2Nhc3Q8SlNDZWxsKj4odS5lbmNvZGVkVmFsdWUuYXNCaXRzLnBheWxvYWQp OworICAgICAgICByZXR1cm4gYml0d2lzZV9jYXN0PEpTQ2VsbCo+KHBheWxvYWQoKSk7CiAjZW5k aWYKICAgICB9CiAKKyAgICBBTFdBWVNfSU5MSU5FIGludDMyX3QgUmVnaXN0ZXI6OnBheWxvYWQo KSBjb25zdAorICAgIHsKKyAgICAgICAgcmV0dXJuIHUuZW5jb2RlZFZhbHVlLmFzQml0cy5wYXls b2FkOworICAgIH0KKworICAgIEFMV0FZU19JTkxJTkUgaW50MzJfdCBSZWdpc3Rlcjo6dGFnKCkg Y29uc3QKKyAgICB7CisgICAgICAgIHJldHVybiB1LmVuY29kZWRWYWx1ZS5hc0JpdHMudGFnOwor ICAgIH0KKworICAgIEFMV0FZU19JTkxJTkUgaW50MzJfdCYgUmVnaXN0ZXI6OnBheWxvYWQoKQor ICAgIHsKKyAgICAgICAgcmV0dXJuIHUuZW5jb2RlZFZhbHVlLmFzQml0cy5wYXlsb2FkOworICAg IH0KKworICAgIEFMV0FZU19JTkxJTkUgaW50MzJfdCYgUmVnaXN0ZXI6OnRhZygpCisgICAgewor ICAgICAgICByZXR1cm4gdS5lbmNvZGVkVmFsdWUuYXNCaXRzLnRhZzsKKyAgICB9CisKIH0gLy8g bmFtZXNwYWNlIEpTQwogCiBuYW1lc3BhY2UgV1RGIHsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9qaXQvSklUQ2FsbDMyXzY0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlw dENvcmUvaml0L0pJVENhbGwzMl82NC5jcHAJKHJldmlzaW9uIDEwMzY2MikKKysrIFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9qaXQvSklUQ2FsbDMyXzY0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTYy LDcgKzE2Miw2IEBAIHZvaWQgSklUOjpjb21waWxlTG9hZFZhcmFyZ3MoSW5zdHJ1Y3Rpb24KICAg ICAgICAgc2xvd0Nhc2UuYXBwZW5kKGJyYW5jaFB0cihCZWxvdywgQWJzb2x1dGVBZGRyZXNzKG1f Z2xvYmFsRGF0YS0+aW50ZXJwcmV0ZXItPnJlZ2lzdGVyRmlsZSgpLmFkZHJlc3NPZkVuZCgpKSwg cmVnVDMpKTsKIAogICAgICAgICAvLyBJbml0aWFsaXplIEFyZ3VtZW50Q291bnQuCi0gICAgICAg IHN0b3JlMzIoVHJ1c3RlZEltbTMyKEpTVmFsdWU6OkludDMyVGFnKSwgdGFnRm9yKFJlZ2lzdGVy RmlsZTo6QXJndW1lbnRDb3VudCwgcmVnVDMpKTsKICAgICAgICAgc3RvcmUzMihyZWdUMiwgcGF5 bG9hZEZvcihSZWdpc3RlckZpbGU6OkFyZ3VtZW50Q291bnQsIHJlZ1QzKSk7CiAKICAgICAgICAg Ly8gSW5pdGlhbGl6ZSAndGhpcycuCkBAIC0yNDQsNyArMjQzLDYgQEAgdm9pZCBKSVQ6OmNvbXBp bGVPcENhbGwoT3Bjb2RlSUQgb3Bjb2RlSQogCiAgICAgICAgIGFkZFB0cihUcnVzdGVkSW1tMzIo cmVnaXN0ZXJPZmZzZXQgKiBzaXplb2YoUmVnaXN0ZXIpKSwgY2FsbEZyYW1lUmVnaXN0ZXIsIHJl Z1QzKTsKIAotICAgICAgICBzdG9yZTMyKFRydXN0ZWRJbW0zMihKU1ZhbHVlOjpJbnQzMlRhZyks IHRhZ0ZvcihSZWdpc3RlckZpbGU6OkFyZ3VtZW50Q291bnQsIHJlZ1QzKSk7CiAgICAgICAgIHN0 b3JlMzIoVHJ1c3RlZEltbTMyKGFyZ0NvdW50KSwgcGF5bG9hZEZvcihSZWdpc3RlckZpbGU6OkFy Z3VtZW50Q291bnQsIHJlZ1QzKSk7CiAgICAgfSAvLyByZWdUMyBob2xkcyBuZXdDYWxsRnJhbWUg d2l0aCBBcmd1bWVudENvdW50IGluaXRpYWxpemVkLgogICAgIGVtaXRMb2FkKGNhbGxlZSwgcmVn VDEsIHJlZ1QwKTsgLy8gcmVnVDEsIHJlZ1QwIGhvbGRzIGNhbGxlZS4KSW5kZXg6IFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9qaXQvSklUQ2FsbC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFT Y3JpcHRDb3JlL2ppdC9KSVRDYWxsLmNwcAkocmV2aXNpb24gMTAzNjYyKQorKysgU291cmNlL0ph dmFTY3JpcHRDb3JlL2ppdC9KSVRDYWxsLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTYwLDcgKzE2 MCw3IEBAIHZvaWQgSklUOjpjb21waWxlT3BDYWxsKE9wY29kZUlEIG9wY29kZUkKICAgICAgICAg aW50IHJlZ2lzdGVyT2Zmc2V0ID0gaW5zdHJ1Y3Rpb25bM10udS5vcGVyYW5kOwogCiAgICAgICAg IGFkZFB0cihUcnVzdGVkSW1tMzIocmVnaXN0ZXJPZmZzZXQgKiBzaXplb2YoUmVnaXN0ZXIpKSwg Y2FsbEZyYW1lUmVnaXN0ZXIsIHJlZ1QxKTsKLSAgICAgICAgc3RvcmVQdHIoVHJ1c3RlZEltbVB0 cihKU1ZhbHVlOjplbmNvZGUoanNOdW1iZXIoYXJnQ291bnQpKSksIEFkZHJlc3MocmVnVDEsIFJl Z2lzdGVyRmlsZTo6QXJndW1lbnRDb3VudCAqIHN0YXRpY19jYXN0PGludD4oc2l6ZW9mKFJlZ2lz dGVyKSkpKTsKKyAgICAgICAgc3RvcmUzMihUcnVzdGVkSW1tMzIoYXJnQ291bnQpLCBBZGRyZXNz KHJlZ1QxLCBSZWdpc3RlckZpbGU6OkFyZ3VtZW50Q291bnQgKiBzdGF0aWNfY2FzdDxpbnQ+KHNp emVvZihSZWdpc3RlcikpKSk7CiAgICAgfSAvLyByZWdUMSBob2xkcyBuZXdDYWxsRnJhbWUgd2l0 aCBBcmd1bWVudENvdW50IGluaXRpYWxpemVkLgogICAgIGVtaXRHZXRWaXJ0dWFsUmVnaXN0ZXIo Y2FsbGVlLCByZWdUMCk7IC8vIHJlZ1QwIGhvbGRzIGNhbGxlZS4KIAo=