66160 2011-08-12 13:39:21 -0700 DFG JIT has inconsistent use of boxDouble and unboxDouble, inconsistent use of assertions regarding doubles, and those assertions are not turned on in debug builds 2011-08-12 16:28:04 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 fpizlo webkit-unassigned barraclough fpizlo webkit.review.bot oldest_to_newest 450624 0 fpizlo 2011-08-12 13:39:21 -0700 The DFG JIT has helper methods for boxing and unboxing doubles, but they are not always used, leading to code duplication. The DFG JIT has a way of emitting assertions that something that it thinks is a boxed double is in fact a bosed double, and it uses those assertions in one place (where the code for unboxDouble is duplicated, no less) but not in others. Furthermore, the JIT assertions (assertions emitted in the code stream) are not enabled in debug builds by default, which greatly reduces their utility. The DFG JIT should enable JIT assertions in debug builds, should use existing assertions (such as AssertIsJSDouble) during boxing and unboxing, and should not duplicate the code for boxing and unboxing. 450630 1 103808 fpizlo 2011-08-12 13:43:38 -0700 Created attachment 103808 the patch 450751 2 103808 webkit.review.bot 2011-08-12 16:28:00 -0700 Comment on attachment 103808 the patch Clearing flags on attachment: 103808 Committed r93010: <http://trac.webkit.org/changeset/93010> 450752 3 webkit.review.bot 2011-08-12 16:28:04 -0700 All reviewed patches have been landed. Closing bug. 103808 2011-08-12 13:43:38 -0700 2011-08-12 16:27:59 -0700 the patch jsdoubleassert_patch_1.diff text/plain 9521 fpizlo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gOTI5ODgpCisrKyBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzYgQEAK KzIwMTEtMDgtMTIgIEZpbGlwIFBpemxvICA8ZnBpemxvQGFwcGxlLmNvbT4KKworICAgICAgICBE RkcgSklUIGhhcyBpbmNvbnNpc3RlbnQgdXNlIG9mIGJveERvdWJsZSBhbmQgdW5ib3hEb3VibGUs CisgICAgICAgIGluY29uc2lzdGVudCB1c2Ugb2YgYXNzZXJ0aW9ucyByZWdhcmRpbmcgZG91Ymxl cywgYW5kIHRob3NlCisgICAgICAgIGFzc2VydGlvbnMgYXJlIG5vdCB0dXJuZWQgb24gaW4gZGVi dWcgYnVpbGRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD02NjE2MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAgICAK KyAgICAgICAgSklUIGFzc2VydGlvbnMgYXJlIG5vdyB0dXJuZWQgb24gaW4gZGVidWcgYnVpbGRz LiAgSklUCisgICAgICAgIGFzc2VydGlvbnMgYXJlIG5vdyB1c2VkIGZvciBib3hpbmcgYW5kIHVu Ym94aW5nIGRvdWJsZXMsIGFuZCBib3hpbmcKKyAgICAgICAgYW5kIHVuYm94aW5nIG5vIGxvbmdl ciBpbnZvbHZlcyBjb2RlIGR1cGxpY2F0aW9uLgorCisgICAgICAgICogZGZnL0RGR0pJVENvZGVH ZW5lcmF0b3IuY3BwOgorICAgICAgICAoSlNDOjpERkc6OkpJVENvZGVHZW5lcmF0b3I6OmZpbGxE b3VibGUpOgorICAgICAgICAqIGRmZy9ERkdKSVRDb2RlR2VuZXJhdG9yLmg6CisgICAgICAgIChK U0M6OkRGRzo6SklUQ29kZUdlbmVyYXRvcjo6Ym94RG91YmxlKToKKyAgICAgICAgKEpTQzo6REZH OjpKSVRDb2RlR2VuZXJhdG9yOjp1bmJveERvdWJsZSk6CisgICAgICAgICogZGZnL0RGR0pJVENv bXBpbGVyLmNwcDoKKyAgICAgICAgKEpTQzo6REZHOjpKSVRDb21waWxlcjo6ZmlsbE51bWVyaWNU b0RvdWJsZSk6CisgICAgICAgIChKU0M6OkRGRzo6R2VuZXJhbGl6ZWRSZWdpc3Rlcjo6bW92ZVRv KToKKyAgICAgICAgKEpTQzo6REZHOjpHZW5lcmFsaXplZFJlZ2lzdGVyOjpzd2FwV2l0aCk6Cisg ICAgICAgICogZGZnL0RGR0pJVENvbXBpbGVyLmg6CisgICAgICAgIChKU0M6OkRGRzo6SklUQ29t cGlsZXI6OmJveERvdWJsZSk6CisgICAgICAgIChKU0M6OkRGRzo6SklUQ29tcGlsZXI6OnVuYm94 RG91YmxlKToKKyAgICAgICAgKiBkZmcvREZHTm9kZS5oOgorICAgICAgICAqIGRmZy9ERkdOb25T cGVjdWxhdGl2ZUpJVC5jcHA6CisgICAgICAgIChKU0M6OkRGRzo6Tm9uU3BlY3VsYXRpdmVKSVQ6 Omtub3duQ29uc3RhbnRBcml0aE9wKToKKyAgICAgICAgKEpTQzo6REZHOjpOb25TcGVjdWxhdGl2 ZUpJVDo6Y29tcGlsZSk6CisgICAgICAgICogZGZnL0RGR1NwZWN1bGF0aXZlSklULmNwcDoKKyAg ICAgICAgKEpTQzo6REZHOjpTcGVjdWxhdGl2ZUpJVDo6ZmlsbFNwZWN1bGF0ZURvdWJsZSk6Cisg ICAgICAgIChKU0M6OkRGRzo6U3BlY3VsYXRpdmVKSVQ6OmNvbnZlcnRUb0RvdWJsZSk6CisKIDIw MTEtMDgtMTIgIEZpbGlwIFBpemxvICA8ZnBpemxvQGFwcGxlLmNvbT4KIAogICAgICAgICBSRUdS RVNTSU9OIChyOTE2MTA/KTogQmluZyBNYXBzIGZhaWwgdG8gaW5pdGlhbGl6ZSAoSW52YWxpZE9w ZXJhdGlvbjoKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHSklUQ29kZUdlbmVy YXRvci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdKSVRD b2RlR2VuZXJhdG9yLmNwcAkocmV2aXNpb24gOTI5ODIpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENv cmUvZGZnL0RGR0pJVENvZGVHZW5lcmF0b3IuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNjgsOCAr MTY4LDcgQEAgRlBSUmVnIEpJVENvZGVHZW5lcmF0b3I6OmZpbGxEb3VibGUoTm9kZQogCiAgICAg ICAgIC8vIEZpcnN0LCBpZiB3ZSBnZXQgaGVyZSB3ZSBoYXZlIGEgZG91YmxlIGVuY29kZWQgYXMg YSBKU1ZhbHVlCiAgICAgICAgIG1faml0Lm1vdmUoanNWYWx1ZUdwciwgdGVtcEdwcik7Ci0gICAg ICAgIG1faml0LmFkZFB0cihHUFJJbmZvOjp0YWdUeXBlTnVtYmVyUmVnaXN0ZXIsIHRlbXBHcHIp OwotICAgICAgICBtX2ppdC5tb3ZlUHRyVG9Eb3VibGUodGVtcEdwciwgZnByKTsKKyAgICAgICAg dW5ib3hEb3VibGUodGVtcEdwciwgZnByKTsKICAgICAgICAgSklUQ29tcGlsZXI6Okp1bXAgaGFz VW5ib3hlZERvdWJsZSA9IG1faml0Lmp1bXAoKTsKIAogICAgICAgICAvLyBGaW5hbGx5LCBoYW5k bGUgaW50ZWdlcnMuCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0pJVENvZGVH ZW5lcmF0b3IuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0pJ VENvZGVHZW5lcmF0b3IuaAkocmV2aXNpb24gOTI5ODIpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENv cmUvZGZnL0RGR0pJVENvZGVHZW5lcmF0b3IuaAkod29ya2luZyBjb3B5KQpAQCAtMzU3LDE1ICsz NTcsMTEgQEAgcHJvdGVjdGVkOgogICAgIC8vIFRoZXNlIG1ldGhvZHMgY29udmVydCBiZXR3ZWVu IGRvdWJsZXMsIGFuZCBkb3VibGVzIGJveGVkIGFuZCBKU1ZhbHVlcy4KICAgICBHUFJSZWcgYm94 RG91YmxlKEZQUlJlZyBmcHIsIEdQUlJlZyBncHIpCiAgICAgewotICAgICAgICBtX2ppdC5tb3Zl RG91YmxlVG9QdHIoZnByLCBncHIpOwotICAgICAgICBtX2ppdC5zdWJQdHIoR1BSSW5mbzo6dGFn VHlwZU51bWJlclJlZ2lzdGVyLCBncHIpOwotICAgICAgICByZXR1cm4gZ3ByOworICAgICAgICBy ZXR1cm4gbV9qaXQuYm94RG91YmxlKGZwciwgZ3ByKTsKICAgICB9CiAgICAgRlBSUmVnIHVuYm94 RG91YmxlKEdQUlJlZyBncHIsIEZQUlJlZyBmcHIpCiAgICAgewotICAgICAgICBtX2ppdC5hZGRQ dHIoR1BSSW5mbzo6dGFnVHlwZU51bWJlclJlZ2lzdGVyLCBncHIpOwotICAgICAgICBtX2ppdC5t b3ZlUHRyVG9Eb3VibGUoZ3ByLCBmcHIpOwotICAgICAgICByZXR1cm4gZnByOworICAgICAgICBy ZXR1cm4gbV9qaXQudW5ib3hEb3VibGUoZ3ByLCBmcHIpOwogICAgIH0KICAgICBHUFJSZWcgYm94 RG91YmxlKEZQUlJlZyBmcHIpCiAgICAgewpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2Rm Zy9ERkdKSVRDb21waWxlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3Jl L2RmZy9ERkdKSVRDb21waWxlci5jcHAJKHJldmlzaW9uIDkyOTgyKQorKysgU291cmNlL0phdmFT Y3JpcHRDb3JlL2RmZy9ERkdKSVRDb21waWxlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTUxLDkg KzUxLDcgQEAgdm9pZCBKSVRDb21waWxlcjo6ZmlsbE51bWVyaWNUb0RvdWJsZShObwogICAgIH0g ZWxzZSB7CiAgICAgICAgIGxvYWRQdHIoYWRkcmVzc0Zvcihub2RlLnZpcnR1YWxSZWdpc3Rlcigp KSwgdGVtcG9yYXJ5KTsKICAgICAgICAgSnVtcCBpc0ludGVnZXIgPSBicmFuY2hQdHIoTWFjcm9B c3NlbWJsZXI6OkFib3ZlT3JFcXVhbCwgdGVtcG9yYXJ5LCBHUFJJbmZvOjp0YWdUeXBlTnVtYmVy UmVnaXN0ZXIpOwotICAgICAgICBqaXRBc3NlcnRJc0pTRG91YmxlKHRlbXBvcmFyeSk7Ci0gICAg ICAgIGFkZFB0cihHUFJJbmZvOjp0YWdUeXBlTnVtYmVyUmVnaXN0ZXIsIHRlbXBvcmFyeSk7Ci0g ICAgICAgIG1vdmVQdHJUb0RvdWJsZSh0ZW1wb3JhcnksIGZwcik7CisgICAgICAgIHVuYm94RG91 YmxlKHRlbXBvcmFyeSwgZnByKTsKICAgICAgICAgSnVtcCBoYXNVbmJveGVkRG91YmxlID0ganVt cCgpOwogICAgICAgICBpc0ludGVnZXIubGluayh0aGlzKTsKICAgICAgICAgY29udmVydEludDMy VG9Eb3VibGUodGVtcG9yYXJ5LCBmcHIpOwpAQCAtMTk3LDggKzE5NSw3IEBAIHB1YmxpYzoKICAg ICAgICAgICAgICAgICBub3RJbnQubGluaygmaml0KTsKICAgICAgICAgICAgIH0KICAgICAgICAg ICAgIAotICAgICAgICAgICAgaml0Lm1vdmVEb3VibGVUb1B0cihmcHIoKSwgb3RoZXIuZ3ByKCkp OwotICAgICAgICAgICAgaml0LnN1YlB0cihHUFJJbmZvOjp0YWdUeXBlTnVtYmVyUmVnaXN0ZXIs IG90aGVyLmdwcigpKTsKKyAgICAgICAgICAgIGppdC5ib3hEb3VibGUoZnByKCksIG90aGVyLmdw cigpKTsKICAgICAgICAgICAgIAogICAgICAgICAgICAgaWYgKGRvbmUuaXNTZXQoKSkKICAgICAg ICAgICAgICAgICBkb25lLmxpbmsoJmppdCk7CkBAIC0yMDYsOCArMjAzLDcgQEAgcHVibGljOgog ICAgICAgICB9CiAgICAgICAgIAogICAgICAgICBpZiAoVU5MSUtFTFkob3RoZXIuaXNGUFIoKSkp IHsKLSAgICAgICAgICAgIGppdC5hZGRQdHIoR1BSSW5mbzo6dGFnVHlwZU51bWJlclJlZ2lzdGVy LCBncHIoKSk7Ci0gICAgICAgICAgICBqaXQubW92ZVB0clRvRG91YmxlKGdwcigpLCBvdGhlci5m cHIoKSk7CisgICAgICAgICAgICBqaXQudW5ib3hEb3VibGUoZ3ByKCksIG90aGVyLmZwcigpKTsK ICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogICAgICAgICAKQEAgLTI1MywxNCArMjQ5 LDEyIEBAIHB1YmxpYzoKICAgICAgICAgICAgICAgICBub3RJbnQubGluaygmaml0KTsKICAgICAg ICAgICAgIH0KICAgICAgICAgICAgIAotICAgICAgICAgICAgaml0Lm1vdmVEb3VibGVUb1B0cihm cHIoKSwgb3RoZXIuZ3ByKCkpOwotICAgICAgICAgICAgaml0LnN1YlB0cihHUFJJbmZvOjp0YWdU eXBlTnVtYmVyUmVnaXN0ZXIsIG90aGVyLmdwcigpKTsKKyAgICAgICAgICAgIGppdC5ib3hEb3Vi bGUoZnByKCksIG90aGVyLmdwcigpKTsKICAgICAgICAgICAgIAogICAgICAgICAgICAgaWYgKGRv bmUuaXNTZXQoKSkKICAgICAgICAgICAgICAgICBkb25lLmxpbmsoJmppdCk7CiAgICAgICAgICAg ICAKLSAgICAgICAgICAgIGppdC5hZGRQdHIoR1BSSW5mbzo6dGFnVHlwZU51bWJlclJlZ2lzdGVy LCBzY3JhdGNoR1BSKTsKLSAgICAgICAgICAgIGppdC5tb3ZlUHRyVG9Eb3VibGUoc2NyYXRjaEdQ UiwgZnByKCkpOworICAgICAgICAgICAgaml0LnVuYm94RG91YmxlKHNjcmF0Y2hHUFIsIGZwcigp KTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogICAgICAgICAKSW5kZXg6IFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHSklUQ29tcGlsZXIuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0pJVENvbXBpbGVyLmgJKHJldmlzaW9uIDkyOTgyKQor KysgU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdKSVRDb21waWxlci5oCSh3b3JraW5nIGNv cHkpCkBAIC0yNTYsNiArMjU2LDIxIEBAIHB1YmxpYzoKICAgICB2b2lkIGppdEFzc2VydElzQ2Vs bChHUFJSZWcpIHt9CiAjZW5kaWYKIAorICAgIC8vIFRoZXNlIG1ldGhvZHMgY29udmVydCBiZXR3 ZWVuIGRvdWJsZXMsIGFuZCBkb3VibGVzIGJveGVkIGFuZCBKU1ZhbHVlcy4KKyAgICBHUFJSZWcg Ym94RG91YmxlKEZQUlJlZyBmcHIsIEdQUlJlZyBncHIpCisgICAgeworICAgICAgICBtb3ZlRG91 YmxlVG9QdHIoZnByLCBncHIpOworICAgICAgICBzdWJQdHIoR1BSSW5mbzo6dGFnVHlwZU51bWJl clJlZ2lzdGVyLCBncHIpOworICAgICAgICByZXR1cm4gZ3ByOworICAgIH0KKyAgICBGUFJSZWcg dW5ib3hEb3VibGUoR1BSUmVnIGdwciwgRlBSUmVnIGZwcikKKyAgICB7CisgICAgICAgIGppdEFz c2VydElzSlNEb3VibGUoZ3ByKTsKKyAgICAgICAgYWRkUHRyKEdQUkluZm86OnRhZ1R5cGVOdW1i ZXJSZWdpc3RlciwgZ3ByKTsKKyAgICAgICAgbW92ZVB0clRvRG91YmxlKGdwciwgZnByKTsKKyAg ICAgICAgcmV0dXJuIGZwcjsKKyAgICB9CisKICNpZiBFTkFCTEUoU0FNUExJTkdfQ09VTlRFUlMp CiAgICAgLy8gRGVidWcgcHJvZmlsaW5nIHRvb2wuCiAgICAgdm9pZCBlbWl0Q291bnQoQWJzdHJh Y3RTYW1wbGluZ0NvdW50ZXImLCB1aW50MzJfdCBpbmNyZW1lbnQgPSAxKTsKSW5kZXg6IFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHTm9kZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9kZmcvREZHTm9kZS5oCShyZXZpc2lvbiA5Mjk4MikKKysrIFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9kZmcvREZHTm9kZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0yOSw3ICsyOSwxMSBA QAogLy8gRW1pdCB2YXJpb3VzIGxvZ2dpbmcgaW5mb3JtYXRpb24gZm9yIGRlYnVnZ2luZywgaW5j bHVkaW5nIGR1bXBpbmcgdGhlIGRhdGFmbG93IGdyYXBocy4KICNkZWZpbmUgREZHX0RFQlVHX1ZF UkJPU0UgMAogLy8gRW5hYmxlIGdlbmVyYXRpb24gb2YgZHluYW1pYyBjaGVja3MgaW50byB0aGUg aW5zdHJ1Y3Rpb24gc3RyZWFtLgorI2lmICFBU1NFUlRfRElTQUJMRUQKKyNkZWZpbmUgREZHX0pJ VF9BU1NFUlQgMQorI2Vsc2UKICNkZWZpbmUgREZHX0pJVF9BU1NFUlQgMAorI2VuZGlmCiAvLyBD b25zaXN0ZW5jeSBjaGVjayBjb250ZW50cyBjb21waWxlciBkYXRhIHN0cnVjdHVyZXMuCiAjZGVm aW5lIERGR19DT05TSVNURU5DWV9DSEVDSyAwCiAvLyBFbWl0IGEgYnJlYWtwb2ludCBpbnRvIHRo ZSBoZWFkIG9mIGV2ZXJ5IGdlbmVyYXRlZCBmdW5jdGlvbiwgdG8gYWlkIGRlYnVnZ2luZyBpbiBH REIuCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR05vblNwZWN1bGF0aXZlSklU LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR05vblNwZWN1 bGF0aXZlSklULmNwcAkocmV2aXNpb24gOTI5ODIpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUv ZGZnL0RGR05vblNwZWN1bGF0aXZlSklULmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjAxLDggKzIw MSw3IEBAIHZvaWQgTm9uU3BlY3VsYXRpdmVKSVQ6Omtub3duQ29uc3RhbnRBcmkKICAgICAgICAg ICAgIG5vdEludC5saW5rKCZtX2ppdCk7CiAgICAgICAgICAgICAKICAgICAgICAgICAgIG1faml0 Lm1vdmUocmVnQXJnR1BSLCByZXN1bHRHUFIpOwotICAgICAgICAgICAgbV9qaXQuYWRkUHRyKEdQ UkluZm86OnRhZ1R5cGVOdW1iZXJSZWdpc3RlciwgcmVzdWx0R1BSKTsKLSAgICAgICAgICAgIG1f aml0Lm1vdmVQdHJUb0RvdWJsZShyZXN1bHRHUFIsIHRtcDJGUFIpOworICAgICAgICAgICAgdW5i b3hEb3VibGUocmVzdWx0R1BSLCB0bXAyRlBSKTsKICAgICAgICAgICAgIAogICAgICAgICAgICAg aGF2ZVZhbHVlLmxpbmsoJm1faml0KTsKICAgICAgICAgfQpAQCAtMjEzLDggKzIxMiw3IEBAIHZv aWQgTm9uU3BlY3VsYXRpdmVKSVQ6Omtub3duQ29uc3RhbnRBcmkKICAgICAgICAgICAgIG1faml0 LmFkZERvdWJsZSh0bXAxRlBSLCB0bXAyRlBSKTsKICAgICAgICAgZWxzZQogICAgICAgICAgICAg bV9qaXQuc3ViRG91YmxlKHRtcDFGUFIsIHRtcDJGUFIpOwotICAgICAgICBtX2ppdC5tb3ZlRG91 YmxlVG9QdHIodG1wMkZQUiwgcmVzdWx0R1BSKTsKLSAgICAgICAgbV9qaXQuc3ViUHRyKEdQUklu Zm86OnRhZ1R5cGVOdW1iZXJSZWdpc3RlciwgcmVzdWx0R1BSKTsKKyAgICAgICAgYm94RG91Ymxl KHRtcDJGUFIsIHJlc3VsdEdQUik7CiAgICAgICAgIGJyZWFrOwogICAgICAgICAKICAgICBkZWZh dWx0OgpAQCAtNDgwLDggKzQ3OCw3IEBAIHZvaWQgTm9uU3BlY3VsYXRpdmVKSVQ6OmNvbXBpbGUo U3BlY3VsYXQKICAgICAgICAgbV9qaXQuY29udmVydEludDMyVG9Eb3VibGUob3AxLmdwcigpLCBi b3hlci5mcHIoKSk7CiAgICAgICAgIG1faml0LmFkZERvdWJsZShKSVRDb21waWxlcjo6QWJzb2x1 dGVBZGRyZXNzKCZ0d29Ub1RoZTMyKSwgYm94ZXIuZnByKCkpOwogICAgICAgICAKLSAgICAgICAg bV9qaXQubW92ZURvdWJsZVRvUHRyKGJveGVyLmZwcigpLCByZXN1bHQuZ3ByKCkpOwotICAgICAg ICBtX2ppdC5zdWJQdHIoR1BSSW5mbzo6dGFnVHlwZU51bWJlclJlZ2lzdGVyLCByZXN1bHQuZ3By KCkpOworICAgICAgICBib3hEb3VibGUoYm94ZXIuZnByKCksIHJlc3VsdC5ncHIoKSk7CiAgICAg ICAgIAogICAgICAgICBKSVRDb21waWxlcjo6SnVtcCBkb25lID0gbV9qaXQuanVtcCgpOwogICAg ICAgICAKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU3BlY3VsYXRp dmVKSVQuY3BwCShyZXZpc2lvbiA5Mjk4MikKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcv REZHU3BlY3VsYXRpdmVKSVQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNDEsOCArMjQxLDcgQEAg RlBSUmVnIFNwZWN1bGF0aXZlSklUOjpmaWxsU3BlY3VsYXRlRG91YgogCiAgICAgICAgIC8vIEZp cnN0LCBpZiB3ZSBnZXQgaGVyZSB3ZSBoYXZlIGEgZG91YmxlIGVuY29kZWQgYXMgYSBKU1ZhbHVl CiAgICAgICAgIG1faml0Lm1vdmUoanNWYWx1ZUdwciwgdGVtcEdwcik7Ci0gICAgICAgIG1faml0 LmFkZFB0cihHUFJJbmZvOjp0YWdUeXBlTnVtYmVyUmVnaXN0ZXIsIHRlbXBHcHIpOwotICAgICAg ICBtX2ppdC5tb3ZlUHRyVG9Eb3VibGUodGVtcEdwciwgZnByKTsKKyAgICAgICAgdW5ib3hEb3Vi bGUodGVtcEdwciwgZnByKTsKICAgICAgICAgSklUQ29tcGlsZXI6Okp1bXAgaGFzVW5ib3hlZERv dWJsZSA9IG1faml0Lmp1bXAoKTsKIAogICAgICAgICAvLyBGaW5hbGx5LCBoYW5kbGUgaW50ZWdl cnMuCkBAIC0zOTIsOCArMzkxLDcgQEAgSklUQ29tcGlsZXI6Okp1bXAgU3BlY3VsYXRpdmVKSVQ6 OmNvbnZlcgogICAgIEpJVENvbXBpbGVyOjpKdW1wIG5vdE51bWJlciA9IG1faml0LmJyYW5jaFRl c3RQdHIoTWFjcm9Bc3NlbWJsZXI6Olplcm8sIHZhbHVlLCBHUFJJbmZvOjp0YWdUeXBlTnVtYmVy UmVnaXN0ZXIpOwogICAgIAogICAgIG1faml0Lm1vdmUodmFsdWUsIHRtcCk7Ci0gICAgbV9qaXQu YWRkUHRyKEdQUkluZm86OnRhZ1R5cGVOdW1iZXJSZWdpc3RlciwgdG1wKTsKLSAgICBtX2ppdC5t b3ZlUHRyVG9Eb3VibGUodG1wLCByZXN1bHQpOworICAgIHVuYm94RG91YmxlKHRtcCwgcmVzdWx0 KTsKICAgICAKICAgICBKSVRDb21waWxlcjo6SnVtcCBkb25lID0gbV9qaXQuanVtcCgpOwogICAg IAo=