65047 2011-07-22 14:33:31 -0700 DFG JIT - Add support for op_resolve/op_resolve_base 2011-07-25 13:22:57 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 barraclough webkit-unassigned oldest_to_newest 441178 0 barraclough 2011-07-22 14:33:31 -0700 These are necessary for any significant eval code coverage (and as such increase LayoutTest coverage). 441197 1 101772 barraclough 2011-07-22 15:04:04 -0700 Created attachment 101772 The patch 441199 2 101772 sam 2011-07-22 15:08:20 -0700 Comment on attachment 101772 The patch View in context: https://bugs.webkit.org/attachment.cgi?id=101772&action=review > Source/JavaScriptCore/dfg/DFGNode.h:274 > +#ifndef NDEBUG This should be #if !ASSERT_DISABLED (or however it is spelled). 441823 3 barraclough 2011-07-25 13:22:57 -0700 Fixed in r91670 101772 2011-07-22 15:04:04 -0700 2011-07-22 15:08:20 -0700 The patch 65047.patch text/plain 12504 barraclough SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gOTE2MDYpCisrKyBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzYgQEAK KzIwMTEtMDctMjIgIEdhdmluIEJhcnJhY2xvdWdoICA8YmFycmFjbG91Z2hAYXBwbGUuY29tPgor CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NTA0Nwor ICAgICAgICBERkcgSklUIC0gQWRkIHN1cHBvcnQgZm9yIG9wX3Jlc29sdmUvb3BfcmVzb2x2ZV9i YXNlCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhl c2UgYXJlIG5lY2Vzc2FyeSBmb3IgYW55IHNpZ25pZmljYW50IGV2YWwgY29kZSBjb3ZlcmFnZQor ICAgICAgICAoYW5kIGFzIHN1Y2ggaW5jcmVhc2UgTGF5b3V0VGVzdCBjb3ZlcmFnZSkuCisKKyAg ICAgICAgKiBkZmcvREZHQWxpYXNUcmFja2VyLmg6CisgICAgICAgIChKU0M6OkRGRzo6QWxpYXNU cmFja2VyOjpyZWNvcmRSZXNvbHZlKToKKyAgICAgICAgICAgIC0gQ29uc2VydmF0aXZlbHkgYmxv dyBhbGlhc2luZyBvcHRpbWl6YXRpb25zIGZvciBub3cuCisgICAgICAgICogZGZnL0RGR0J5dGVD b2RlUGFyc2VyLmNwcDoKKyAgICAgICAgKEpTQzo6REZHOjpCeXRlQ29kZVBhcnNlcjo6cGFyc2VC bG9jayk6CisgICAgICAgICAgICAtIEFkZCBzdXBwb3J0IGZvciBvcF9yZXNvbHZlL29wX3Jlc29s dmVfYmFzZS4KKyAgICAgICAgKiBkZmcvREZHSklUQ29kZUdlbmVyYXRvci5oOgorICAgICAgICAo SlNDOjpERkc6OkpJVENvZGVHZW5lcmF0b3I6OmNhbGxPcGVyYXRpb24pOgorICAgICAgICAgICAg LSBBZGQgY2FsbCB3aXRoIGV4ZWMsIGlkZW50aWZlciBhZ3VtZW50cy4KKyAgICAgICAgKiBkZmcv REZHTm9kZS5oOgorICAgICAgICAgICAgLSBBZGQgbmV3IG5vZGUgdHlwZXMuCisgICAgICAgIChK U0M6OkRGRzo6Tm9kZTo6aGFzSWRlbnRpZmllcik6CisgICAgICAgICAgICAtIFJlc29sdmUgbm9k ZXMgaGF2ZSBpZGVudGlmaWVycywgdG9vIQorICAgICAgICAqIGRmZy9ERkdOb25TcGVjdWxhdGl2 ZUpJVC5jcHA6CisgICAgICAgIChKU0M6OkRGRzo6Tm9uU3BlY3VsYXRpdmVKSVQ6OmNvbXBpbGUp OgorICAgICAgICAgICAgLSBBZGQgZ2VuZXJhdGlvbiBmb3IgbmV3IE5vZGVzLgorICAgICAgICAq IGRmZy9ERkdPcGVyYXRpb25zLmNwcDoKKyAgICAgICAgKiBkZmcvREZHT3BlcmF0aW9ucy5oOgor ICAgICAgICAgICAgLSBBZGRlZCBuZXcgb3BlcmF0aW9ucy4KKyAgICAgICAgKiBkZmcvREZHU3Bl Y3VsYXRpdmVKSVQuY3BwOgorICAgICAgICAoSlNDOjpERkc6OlNwZWN1bGF0aXZlSklUOjpjb21w aWxlKToKKyAgICAgICAgICAgIC0gQWRkIGdlbmVyYXRpb24gZm9yIG5ldyBOb2Rlcy4KKwogMjAx MS0wNy0yMiAgR2F2aW4gQmFycmFjbG91Z2ggIDxiYXJyYWNsb3VnaEBhcHBsZS5jb20+CiAKICAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY1MDM2CkluZGV4 OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0FsaWFzVHJhY2tlci5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQWxpYXNUcmFja2VyLmgJKHJldmlzaW9u IDkxNTU3KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdBbGlhc1RyYWNrZXIuaAko d29ya2luZyBjb3B5KQpAQCAtMTEzLDYgKzExMywxNCBAQCBwdWJsaWM6CiAgICAgICAgIG1fY2Fu ZGlkYXRlQWxpYXNHZXRCeVZhbCA9IE5vTm9kZTsKICAgICB9CiAKKyAgICB2b2lkIHJlY29yZFJl c29sdmUoTm9kZUluZGV4IHJlc29sdmUpCisgICAgeworICAgICAgICBBU1NFUlRfVU5VU0VEKHJl c29sdmUsIG1fZ3JhcGhbcmVzb2x2ZV0ub3AgPT0gUmVzb2x2ZQorICAgICAgICAgICAgfHwgbV9n cmFwaFtyZXNvbHZlXS5vcCA9PSBSZXNvbHZlQmFzZQorICAgICAgICAgICAgfHwgbV9ncmFwaFty ZXNvbHZlXS5vcCA9PSBSZXNvbHZlQmFzZVN0cmljdFB1dCk7CisgICAgICAgIG1fY2FuZGlkYXRl QWxpYXNHZXRCeVZhbCA9IE5vTm9kZTsKKyAgICB9CisKIHByaXZhdGU6CiAgICAgLy8gVGhpcyBt ZXRob2QgcmV0dXJucyB0cnVlIGZvciBhcmd1bWVudHM6CiAgICAgLy8gICAtIChYLCBYKQpJbmRl eDogU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdCeXRlQ29kZVBhcnNlci5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdCeXRlQ29kZVBhcnNlci5jcHAJ KHJldmlzaW9uIDkxNTU3KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdCeXRlQ29k ZVBhcnNlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTExMzEsOCArMTEzMSwyOSBAQCBib29sIEJ5 dGVDb2RlUGFyc2VyOjpwYXJzZUJsb2NrKHVuc2lnbmVkCiAgICAgICAgICAgICBORVhUX09QQ09E RShvcF9jb25zdHJ1Y3QpOwogICAgICAgICB9CiAgICAgICAgICAgICAKLSAgICAgICAgY2FzZSBv cF9jYWxsX3B1dF9yZXN1bHQ6IHsKKyAgICAgICAgY2FzZSBvcF9jYWxsX3B1dF9yZXN1bHQ6CiAg ICAgICAgICAgICBORVhUX09QQ09ERShvcF9jYWxsX3B1dF9yZXN1bHQpOworCisgICAgICAgIGNh c2Ugb3BfcmVzb2x2ZTogeworICAgICAgICAgICAgUFJPUEVSVFlfQUNDRVNTX09QKCk7CisgICAg ICAgICAgICB1bnNpZ25lZCBpZGVudGlmaWVyID0gY3VycmVudEluc3RydWN0aW9uWzJdLnUub3Bl cmFuZDsKKworICAgICAgICAgICAgTm9kZUluZGV4IHJlc29sdmUgPSBhZGRUb0dyYXBoKFJlc29s dmUsIE9wSW5mbyhpZGVudGlmaWVyKSk7CisgICAgICAgICAgICBzZXQoY3VycmVudEluc3RydWN0 aW9uWzFdLnUub3BlcmFuZCwgcmVzb2x2ZSk7CisgICAgICAgICAgICBhbGlhc2VzLnJlY29yZFJl c29sdmUocmVzb2x2ZSk7CisKKyAgICAgICAgICAgIE5FWFRfT1BDT0RFKG9wX3Jlc29sdmUpOwor ICAgICAgICB9CisKKyAgICAgICAgY2FzZSBvcF9yZXNvbHZlX2Jhc2U6IHsKKyAgICAgICAgICAg IFBST1BFUlRZX0FDQ0VTU19PUCgpOworICAgICAgICAgICAgdW5zaWduZWQgaWRlbnRpZmllciA9 IGN1cnJlbnRJbnN0cnVjdGlvblsyXS51Lm9wZXJhbmQ7CisKKyAgICAgICAgICAgIE5vZGVJbmRl eCByZXNvbHZlID0gYWRkVG9HcmFwaChjdXJyZW50SW5zdHJ1Y3Rpb25bM10udS5vcGVyYW5kID8g UmVzb2x2ZUJhc2VTdHJpY3RQdXQgOiBSZXNvbHZlQmFzZSwgT3BJbmZvKGlkZW50aWZpZXIpKTsK KyAgICAgICAgICAgIHNldChjdXJyZW50SW5zdHJ1Y3Rpb25bMV0udS5vcGVyYW5kLCByZXNvbHZl KTsKKyAgICAgICAgICAgIGFsaWFzZXMucmVjb3JkUmVzb2x2ZShyZXNvbHZlKTsKKworICAgICAg ICAgICAgTkVYVF9PUENPREUob3BfcmVzb2x2ZV9iYXNlKTsKICAgICAgICAgfQogCiAgICAgICAg IGRlZmF1bHQ6CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0pJVENvZGVHZW5l cmF0b3IuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0pJVENv ZGVHZW5lcmF0b3IuaAkocmV2aXNpb24gOTE1NTcpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUv ZGZnL0RGR0pJVENvZGVHZW5lcmF0b3IuaAkod29ya2luZyBjb3B5KQpAQCAtODAyLDYgKzgwMiwy MCBAQCBwcm90ZWN0ZWQ6CiAgICAgfQogCiAgICAgLy8gVGhlc2UgbWV0aG9kcyBhZGQgY2FsbHMg dG8gQysrIGhlbHBlciBmdW5jdGlvbnMuCisgICAgdm9pZCBjYWxsT3BlcmF0aW9uKEpfREZHT3Bl cmF0aW9uX0VQIG9wZXJhdGlvbiwgR1BSUmVnIHJlc3VsdCwgdm9pZCogcG9pbnRlcikKKyAgICB7 CisgICAgICAgIEFTU0VSVChpc0ZsdXNoZWQoKSk7CisKKyAgICAgICAgbV9qaXQubW92ZShKSVRD b21waWxlcjo6VHJ1c3RlZEltbVB0cihwb2ludGVyKSwgR1BSSW5mbzo6YXJndW1lbnRHUFIxKTsK KyAgICAgICAgbV9qaXQubW92ZShHUFJJbmZvOjpjYWxsRnJhbWVSZWdpc3RlciwgR1BSSW5mbzo6 YXJndW1lbnRHUFIwKTsKKworICAgICAgICBhcHBlbmRDYWxsV2l0aEV4Y2VwdGlvbkNoZWNrKG9w ZXJhdGlvbik7CisgICAgICAgIG1faml0Lm1vdmUoR1BSSW5mbzo6cmV0dXJuVmFsdWVHUFIsIHJl c3VsdCk7CisgICAgfQorICAgIHZvaWQgY2FsbE9wZXJhdGlvbihKX0RGR09wZXJhdGlvbl9FSSBv cGVyYXRpb24sIEdQUlJlZyByZXN1bHQsIElkZW50aWZpZXIqIGlkZW50aWZpZXIpCisgICAgewor ICAgICAgICBjYWxsT3BlcmF0aW9uKChKX0RGR09wZXJhdGlvbl9FUClvcGVyYXRpb24sIHJlc3Vs dCwgaWRlbnRpZmllcik7CisgICAgfQogICAgIHZvaWQgY2FsbE9wZXJhdGlvbihKX0RGR09wZXJh dGlvbl9FSlAgb3BlcmF0aW9uLCBHUFJSZWcgcmVzdWx0LCBHUFJSZWcgYXJnMSwgdm9pZCogcG9p bnRlcikKICAgICB7CiAgICAgICAgIEFTU0VSVChpc0ZsdXNoZWQoKSk7CkluZGV4OiBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvZGZnL0RGR05vZGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNj cmlwdENvcmUvZGZnL0RGR05vZGUuaAkocmV2aXNpb24gOTE1NTcpCisrKyBTb3VyY2UvSmF2YVNj cmlwdENvcmUvZGZnL0RGR05vZGUuaAkod29ya2luZyBjb3B5KQpAQCAtMTQ0LDYgKzE0NCwxMSBA QCB0eXBlZGVmIHVpbnQzMl90IEV4Y2VwdGlvbkluZm87CiAgICAgbWFjcm8oQ2FsbCwgTm9kZVJl c3VsdEpTIHwgTm9kZU11c3RHZW5lcmF0ZSB8IE5vZGVIYXNWYXJBcmdzKSBcCiAgICAgbWFjcm8o Q29uc3RydWN0LCBOb2RlUmVzdWx0SlMgfCBOb2RlTXVzdEdlbmVyYXRlIHwgTm9kZUhhc1ZhckFy Z3MpIFwKICAgICBcCisgICAgLyogUmVzb2x2ZSBub2Rlcy4gKi9cCisgICAgbWFjcm8oUmVzb2x2 ZSwgTm9kZVJlc3VsdEpTIHwgTm9kZU11c3RHZW5lcmF0ZSkgXAorICAgIG1hY3JvKFJlc29sdmVC YXNlLCBOb2RlUmVzdWx0SlMgfCBOb2RlTXVzdEdlbmVyYXRlKSBcCisgICAgbWFjcm8oUmVzb2x2 ZUJhc2VTdHJpY3RQdXQsIE5vZGVSZXN1bHRKUyB8IE5vZGVNdXN0R2VuZXJhdGUpIFwKKyAgICBc CiAgICAgLyogTm9kZXMgZm9yIG1pc2Mgb3BlcmF0aW9ucy4gKi9cCiAgICAgbWFjcm8oQnJlYWtw b2ludCwgTm9kZU11c3RHZW5lcmF0ZSkgXAogICAgIG1hY3JvKENoZWNrSGFzSW5zdGFuY2UsIE5v ZGVNdXN0R2VuZXJhdGUpIFwKQEAgLTI2NiwxMCArMjcxLDE1IEBAIHN0cnVjdCBOb2RlIHsKICAg ICAgICAgcmV0dXJuIChWaXJ0dWFsUmVnaXN0ZXIpbV9vcEluZm87CiAgICAgfQogCisjaWZuZGVm IE5ERUJVRworICAgIC8vIElmIHdlIHdhbnQgdG8gdXNlIHRoaXMgaW4gcHJvZHVjdGlvbiBjb2Rl LCBzaG91bGQgbWFrZSBpdCBmYXN0ZXIgLQorICAgIC8vIGUuZy4gbWFrZSBoYXNJZGVudGlmaWVy IGEgZmxhZyBpbiB0aGUgYml0ZmllbGQuCiAgICAgYm9vbCBoYXNJZGVudGlmaWVyKCkKICAgICB7 Ci0gICAgICAgIHJldHVybiBvcCA9PSBHZXRCeUlkIHx8IG9wID09IFB1dEJ5SWQgfHwgb3AgPT0g UHV0QnlJZERpcmVjdCB8fCBvcCA9PSBHZXRNZXRob2Q7CisgICAgICAgIHJldHVybiBvcCA9PSBH ZXRCeUlkIHx8IG9wID09IFB1dEJ5SWQgfHwgb3AgPT0gUHV0QnlJZERpcmVjdCB8fCBvcCA9PSBH ZXRNZXRob2QKKyAgICAgICAgICAgIHx8IG9wID09IFJlc29sdmUgfHwgb3AgPT0gUmVzb2x2ZUJh c2UgfHwgb3AgPT0gUmVzb2x2ZUJhc2VTdHJpY3RQdXQ7CiAgICAgfQorI2VuZGlmCiAKICAgICB1 bnNpZ25lZCBpZGVudGlmaWVyTnVtYmVyKCkKICAgICB7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlw dENvcmUvZGZnL0RGR05vblNwZWN1bGF0aXZlSklULmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvZGZnL0RGR05vblNwZWN1bGF0aXZlSklULmNwcAkocmV2aXNpb24gOTE1 NzgpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR05vblNwZWN1bGF0aXZlSklULmNw cAkod29ya2luZyBjb3B5KQpAQCAtMTA0MSw2ICsxMDQxLDMwIEBAIHZvaWQgTm9uU3BlY3VsYXRp dmVKSVQ6OmNvbXBpbGUoU3BlY3VsYXQKICAgICBjYXNlIENvbnN0cnVjdDoKICAgICAgICAgZW1p dENhbGwobm9kZSk7CiAgICAgICAgIGJyZWFrOworCisgICAgY2FzZSBSZXNvbHZlOiB7CisgICAg ICAgIGZsdXNoUmVnaXN0ZXJzKCk7CisgICAgICAgIEdQUlJlc3VsdCByZXN1bHQodGhpcyk7Cisg ICAgICAgIGNhbGxPcGVyYXRpb24ob3BlcmF0aW9uUmVzb2x2ZSwgcmVzdWx0LmdwcigpLCBpZGVu dGlmaWVyKG5vZGUuaWRlbnRpZmllck51bWJlcigpKSk7CisgICAgICAgIGpzVmFsdWVSZXN1bHQo cmVzdWx0LmdwcigpLCBtX2NvbXBpbGVJbmRleCk7CisgICAgICAgIGJyZWFrOworICAgIH0KKwor ICAgIGNhc2UgUmVzb2x2ZUJhc2U6IHsKKyAgICAgICAgZmx1c2hSZWdpc3RlcnMoKTsKKyAgICAg ICAgR1BSUmVzdWx0IHJlc3VsdCh0aGlzKTsKKyAgICAgICAgY2FsbE9wZXJhdGlvbihvcGVyYXRp b25SZXNvbHZlQmFzZSwgcmVzdWx0LmdwcigpLCBpZGVudGlmaWVyKG5vZGUuaWRlbnRpZmllck51 bWJlcigpKSk7CisgICAgICAgIGpzVmFsdWVSZXN1bHQocmVzdWx0LmdwcigpLCBtX2NvbXBpbGVJ bmRleCk7CisgICAgICAgIGJyZWFrOworICAgIH0KKworICAgIGNhc2UgUmVzb2x2ZUJhc2VTdHJp Y3RQdXQ6IHsKKyAgICAgICAgZmx1c2hSZWdpc3RlcnMoKTsKKyAgICAgICAgR1BSUmVzdWx0IHJl c3VsdCh0aGlzKTsKKyAgICAgICAgY2FsbE9wZXJhdGlvbihvcGVyYXRpb25SZXNvbHZlQmFzZVN0 cmljdFB1dCwgcmVzdWx0LmdwcigpLCBpZGVudGlmaWVyKG5vZGUuaWRlbnRpZmllck51bWJlcigp KSk7CisgICAgICAgIGpzVmFsdWVSZXN1bHQocmVzdWx0LmdwcigpLCBtX2NvbXBpbGVJbmRleCk7 CisgICAgICAgIGJyZWFrOworICAgIH0KICAgICB9CiAKICAgICBpZiAobm9kZS5oYXNSZXN1bHQo KSAmJiBub2RlLm11c3RHZW5lcmF0ZSgpKQpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2Rm Zy9ERkdPcGVyYXRpb25zLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUv ZGZnL0RGR09wZXJhdGlvbnMuY3BwCShyZXZpc2lvbiA5MTU1NykKKysrIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9kZmcvREZHT3BlcmF0aW9ucy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTYyMywxNSAr NjIzLDQyIEBAIEVuY29kZWRKU1ZhbHVlIG9wZXJhdGlvbkluc3RhbmNlT2YoRXhlY1MKICAgICBy ZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKGpzQm9vbGVhbihhc09iamVjdChiYXNlKS0+aGFzSW5zdGFu Y2UoZXhlYywgdmFsdWUsIHByb3RvdHlwZSkpKTsKIH0KIAorRW5jb2RlZEpTVmFsdWUgb3BlcmF0 aW9uUmVzb2x2ZShFeGVjU3RhdGUqIGV4ZWMsIElkZW50aWZpZXIqIHByb3BlcnR5TmFtZSkKK3sK KyAgICBTY29wZUNoYWluTm9kZSogc2NvcGVDaGFpbiA9IGV4ZWMtPnNjb3BlQ2hhaW4oKTsKKyAg ICBTY29wZUNoYWluSXRlcmF0b3IgaXRlciA9IHNjb3BlQ2hhaW4tPmJlZ2luKCk7CisgICAgU2Nv cGVDaGFpbkl0ZXJhdG9yIGVuZCA9IHNjb3BlQ2hhaW4tPmVuZCgpOworICAgIEFTU0VSVChpdGVy ICE9IGVuZCk7CisKKyAgICBkbyB7CisgICAgICAgIEpTT2JqZWN0KiByZWNvcmQgPSBpdGVyLT5n ZXQoKTsKKyAgICAgICAgUHJvcGVydHlTbG90IHNsb3QocmVjb3JkKTsKKyAgICAgICAgaWYgKHJl Y29yZC0+Z2V0UHJvcGVydHlTbG90KGV4ZWMsICpwcm9wZXJ0eU5hbWUsIHNsb3QpKQorICAgICAg ICAgICAgcmV0dXJuIEpTVmFsdWU6OmVuY29kZShzbG90LmdldFZhbHVlKGV4ZWMsICpwcm9wZXJ0 eU5hbWUpKTsKKyAgICB9IHdoaWxlICgrK2l0ZXIgIT0gZW5kKTsKKworICAgIHJldHVybiB0aHJv d1ZNRXJyb3IoZXhlYywgY3JlYXRlVW5kZWZpbmVkVmFyaWFibGVFcnJvcihleGVjLCAqcHJvcGVy dHlOYW1lKSk7Cit9CisKK0VuY29kZWRKU1ZhbHVlIG9wZXJhdGlvblJlc29sdmVCYXNlKEV4ZWNT dGF0ZSogZXhlYywgSWRlbnRpZmllciogcHJvcGVydHlOYW1lKQoreworICAgIHJldHVybiBKU1Zh bHVlOjplbmNvZGUocmVzb2x2ZUJhc2UoZXhlYywgKnByb3BlcnR5TmFtZSwgZXhlYy0+c2NvcGVD aGFpbigpLCBmYWxzZSkpOworfQorCitFbmNvZGVkSlNWYWx1ZSBvcGVyYXRpb25SZXNvbHZlQmFz ZVN0cmljdFB1dChFeGVjU3RhdGUqIGV4ZWMsIElkZW50aWZpZXIqIHByb3BlcnR5TmFtZSkKK3sK KyAgICBKU1ZhbHVlIGJhc2UgPSByZXNvbHZlQmFzZShleGVjLCAqcHJvcGVydHlOYW1lLCBleGVj LT5zY29wZUNoYWluKCksIHRydWUpOworICAgIGlmICghYmFzZSkKKyAgICAgICAgdGhyb3dFcnJv cihleGVjLCBjcmVhdGVFcnJvckZvckludmFsaWRHbG9iYWxBc3NpZ25tZW50KGV4ZWMsIHByb3Bl cnR5TmFtZS0+dXN0cmluZygpKSk7CisgICAgcmV0dXJuIEpTVmFsdWU6OmVuY29kZShiYXNlKTsK K30KKwogdm9pZCBvcGVyYXRpb25UaHJvd0hhc0luc3RhbmNlRXJyb3IoRXhlY1N0YXRlKiBleGVj LCBFbmNvZGVkSlNWYWx1ZSBlbmNvZGVkQmFzZSkKIHsKICAgICBKU1ZhbHVlIGJhc2UgPSBKU1Zh bHVlOjpkZWNvZGUoZW5jb2RlZEJhc2UpOwogCi0jaWZuZGVmIE5ERUJVRwogICAgIC8vIFdlIHNo b3VsZCBvbmx5IGNhbGwgdGhpcyBmdW5jdGlvbiBpZiBiYXNlIGlzIG5vdCBhbiBvYmplY3QsIG9y IGlmIGl0IGRvZXMgbm90IGltcGxlbWVudCAnSGFzSW5zdGFuY2UnLgotICAgIFR5cGVJbmZvIHR5 cGVJbmZvKFVuc3BlY2lmaWVkVHlwZSk7Ci0gICAgQVNTRVJUKCFiYXNlLmlzT2JqZWN0KCkgfHwg ISh0eXBlSW5mbyA9IGFzT2JqZWN0KGJhc2UpLT5zdHJ1Y3R1cmUoKS0+dHlwZUluZm8oKSkuaW1w bGVtZW50c0hhc0luc3RhbmNlKCkpOwotI2VuZGlmCisgICAgQVNTRVJUKCFiYXNlLmlzT2JqZWN0 KCkgfHwgIWFzT2JqZWN0KGJhc2UpLT5zdHJ1Y3R1cmUoKS0+dHlwZUluZm8oKS5pbXBsZW1lbnRz SGFzSW5zdGFuY2UoKSk7CiAKICAgICB0aHJvd0Vycm9yKGV4ZWMsIGNyZWF0ZUludmFsaWRQYXJh bUVycm9yKGV4ZWMsICJpbnN0YW5jZW9mIiwgYmFzZSkpOwogfQpJbmRleDogU291cmNlL0phdmFT Y3JpcHRDb3JlL2RmZy9ERkdPcGVyYXRpb25zLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFT Y3JpcHRDb3JlL2RmZy9ERkdPcGVyYXRpb25zLmgJKHJldmlzaW9uIDkxNTU3KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL2RmZy9ERkdPcGVyYXRpb25zLmgJKHdvcmtpbmcgY29weSkKQEAgLTQy LDYgKzQyLDggQEAgdHlwZWRlZiBFbmNvZGVkSlNWYWx1ZSAoKkpfREZHT3BlcmF0aW9uXwogdHlw ZWRlZiBFbmNvZGVkSlNWYWx1ZSAoKkpfREZHT3BlcmF0aW9uX0VKKShFeGVjU3RhdGUqLCBFbmNv ZGVkSlNWYWx1ZSk7CiB0eXBlZGVmIEVuY29kZWRKU1ZhbHVlICgqSl9ERkdPcGVyYXRpb25fRUpQ KShFeGVjU3RhdGUqLCBFbmNvZGVkSlNWYWx1ZSwgdm9pZCopOwogdHlwZWRlZiBFbmNvZGVkSlNW YWx1ZSAoKkpfREZHT3BlcmF0aW9uX0VKSSkoRXhlY1N0YXRlKiwgRW5jb2RlZEpTVmFsdWUsIElk ZW50aWZpZXIqKTsKK3R5cGVkZWYgRW5jb2RlZEpTVmFsdWUgKCpKX0RGR09wZXJhdGlvbl9FUCko RXhlY1N0YXRlKiwgdm9pZCopOwordHlwZWRlZiBFbmNvZGVkSlNWYWx1ZSAoKkpfREZHT3BlcmF0 aW9uX0VJKShFeGVjU3RhdGUqLCBJZGVudGlmaWVyKik7CiB0eXBlZGVmIGJvb2wgKCpaX0RGR09w ZXJhdGlvbl9FSikoRXhlY1N0YXRlKiwgRW5jb2RlZEpTVmFsdWUpOwogdHlwZWRlZiBib29sICgq Wl9ERkdPcGVyYXRpb25fRUpKKShFeGVjU3RhdGUqLCBFbmNvZGVkSlNWYWx1ZSwgRW5jb2RlZEpT VmFsdWUpOwogdHlwZWRlZiB2b2lkICgqVl9ERkdPcGVyYXRpb25fRUpKSikoRXhlY1N0YXRlKiwg RW5jb2RlZEpTVmFsdWUsIEVuY29kZWRKU1ZhbHVlLCBFbmNvZGVkSlNWYWx1ZSk7CkBAIC02NSw2 ICs2Nyw5IEBAIEVuY29kZWRKU1ZhbHVlIG9wZXJhdGlvbkdldEJ5SWRQcm90b0J1aWwKIEVuY29k ZWRKU1ZhbHVlIG9wZXJhdGlvbkdldEJ5SWRPcHRpbWl6ZShFeGVjU3RhdGUqLCBFbmNvZGVkSlNW YWx1ZSBlbmNvZGVkQmFzZSwgSWRlbnRpZmllciopOwogRW5jb2RlZEpTVmFsdWUgb3BlcmF0aW9u R2V0TWV0aG9kT3B0aW1pemUoRXhlY1N0YXRlKiwgRW5jb2RlZEpTVmFsdWUgZW5jb2RlZEJhc2Us IElkZW50aWZpZXIqKTsKIEVuY29kZWRKU1ZhbHVlIG9wZXJhdGlvbkluc3RhbmNlT2YoRXhlY1N0 YXRlKiwgRW5jb2RlZEpTVmFsdWUgdmFsdWUsIEVuY29kZWRKU1ZhbHVlIGJhc2UsIEVuY29kZWRK U1ZhbHVlIHByb3RvdHlwZSk7CitFbmNvZGVkSlNWYWx1ZSBvcGVyYXRpb25SZXNvbHZlKEV4ZWNT dGF0ZSosIElkZW50aWZpZXIqKTsKK0VuY29kZWRKU1ZhbHVlIG9wZXJhdGlvblJlc29sdmVCYXNl KEV4ZWNTdGF0ZSosIElkZW50aWZpZXIqKTsKK0VuY29kZWRKU1ZhbHVlIG9wZXJhdGlvblJlc29s dmVCYXNlU3RyaWN0UHV0KEV4ZWNTdGF0ZSosIElkZW50aWZpZXIqKTsKIHZvaWQgb3BlcmF0aW9u VGhyb3dIYXNJbnN0YW5jZUVycm9yKEV4ZWNTdGF0ZSosIEVuY29kZWRKU1ZhbHVlIGJhc2UpOwog dm9pZCBvcGVyYXRpb25QdXRCeVZhbFN0cmljdChFeGVjU3RhdGUqLCBFbmNvZGVkSlNWYWx1ZSBl bmNvZGVkQmFzZSwgRW5jb2RlZEpTVmFsdWUgZW5jb2RlZFByb3BlcnR5LCBFbmNvZGVkSlNWYWx1 ZSBlbmNvZGVkVmFsdWUpOwogdm9pZCBvcGVyYXRpb25QdXRCeVZhbE5vblN0cmljdChFeGVjU3Rh dGUqLCBFbmNvZGVkSlNWYWx1ZSBlbmNvZGVkQmFzZSwgRW5jb2RlZEpTVmFsdWUgZW5jb2RlZFBy b3BlcnR5LCBFbmNvZGVkSlNWYWx1ZSBlbmNvZGVkVmFsdWUpOwpJbmRleDogU291cmNlL0phdmFT Y3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVC5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVC5jcHAJKHJldmlzaW9uIDkxNTU3 KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVC5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTExMzUsNiArMTEzNSwzMCBAQCB2b2lkIFNwZWN1bGF0aXZlSklUOjpj b21waWxlKE5vZGUmIG5vZGUpCiAgICAgY2FzZSBDb25zdHJ1Y3Q6CiAgICAgICAgIGVtaXRDYWxs KG5vZGUpOwogICAgICAgICBicmVhazsKKworICAgIGNhc2UgUmVzb2x2ZTogeworICAgICAgICBm bHVzaFJlZ2lzdGVycygpOworICAgICAgICBHUFJSZXN1bHQgcmVzdWx0KHRoaXMpOworICAgICAg ICBjYWxsT3BlcmF0aW9uKG9wZXJhdGlvblJlc29sdmUsIHJlc3VsdC5ncHIoKSwgaWRlbnRpZmll cihub2RlLmlkZW50aWZpZXJOdW1iZXIoKSkpOworICAgICAgICBqc1ZhbHVlUmVzdWx0KHJlc3Vs dC5ncHIoKSwgbV9jb21waWxlSW5kZXgpOworICAgICAgICBicmVhazsKKyAgICB9CisKKyAgICBj YXNlIFJlc29sdmVCYXNlOiB7CisgICAgICAgIGZsdXNoUmVnaXN0ZXJzKCk7CisgICAgICAgIEdQ UlJlc3VsdCByZXN1bHQodGhpcyk7CisgICAgICAgIGNhbGxPcGVyYXRpb24ob3BlcmF0aW9uUmVz b2x2ZUJhc2UsIHJlc3VsdC5ncHIoKSwgaWRlbnRpZmllcihub2RlLmlkZW50aWZpZXJOdW1iZXIo KSkpOworICAgICAgICBqc1ZhbHVlUmVzdWx0KHJlc3VsdC5ncHIoKSwgbV9jb21waWxlSW5kZXgp OworICAgICAgICBicmVhazsKKyAgICB9CisKKyAgICBjYXNlIFJlc29sdmVCYXNlU3RyaWN0UHV0 OiB7CisgICAgICAgIGZsdXNoUmVnaXN0ZXJzKCk7CisgICAgICAgIEdQUlJlc3VsdCByZXN1bHQo dGhpcyk7CisgICAgICAgIGNhbGxPcGVyYXRpb24ob3BlcmF0aW9uUmVzb2x2ZUJhc2VTdHJpY3RQ dXQsIHJlc3VsdC5ncHIoKSwgaWRlbnRpZmllcihub2RlLmlkZW50aWZpZXJOdW1iZXIoKSkpOwor ICAgICAgICBqc1ZhbHVlUmVzdWx0KHJlc3VsdC5ncHIoKSwgbV9jb21waWxlSW5kZXgpOworICAg ICAgICBicmVhazsKKyAgICB9CiAgICAgfQogCiAgICAgaWYgKG5vZGUuaGFzUmVzdWx0KCkgJiYg bm9kZS5tdXN0R2VuZXJhdGUoKSkK