187119 2018-06-27 15:18:54 -0700 Fix a bug in $vm.callFrame() and apply previously requested renaming of $vm.println to print. 2018-06-27 16:14:39 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 mark.lam mark.lam commit-queue fpizlo keith_miller msaboff rmorisset saam tzagallo webkit-bug-importer oldest_to_newest 1437129 0 mark.lam 2018-06-27 15:18:54 -0700 I also renamed some other "print" functions to use "dump" instead to match their underlying C++ code that they will call e.g. CodeBlock::dumpSource(). 1437131 1 343761 mark.lam 2018-06-27 15:22:24 -0700 Created attachment 343761 proposed patch. 1437134 2 343761 keith_miller 2018-06-27 15:33:26 -0700 Comment on attachment 343761 proposed patch. r=me 1437135 3 343761 mark.lam 2018-06-27 15:34:04 -0700 Comment on attachment 343761 proposed patch. Thanks for the review. Landing now. 1437156 4 343761 commit-queue 2018-06-27 16:14:00 -0700 Comment on attachment 343761 proposed patch. Clearing flags on attachment: 343761 Committed r233285: <https://trac.webkit.org/changeset/233285> 1437157 5 commit-queue 2018-06-27 16:14:01 -0700 All reviewed patches have been landed. Closing bug. 1437158 6 webkit-bug-importer 2018-06-27 16:14:39 -0700 <rdar://problem/41550102> 343761 2018-06-27 15:22:24 -0700 2018-06-27 16:14:00 -0700 proposed patch. bug-187119.patch text/plain 13680 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjMzMjgwKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQ3IEBA CisyMDE4LTA2LTI3ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBG aXggYSBidWcgaW4gJHZtLmNhbGxGcmFtZSgpIGFuZCBhcHBseSBwcmV2aW91c2x5IHJlcXVlc3Rl ZCByZW5hbWluZyBvZiAkdm0ucHJpbnRsbiB0byBwcmludC4KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4NzExOQorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICR2bS5jYWxsRnJhbWUoKSdzIEpTRG9sbGFyVk1D YWxsRnJhbWU6OmZpbmlzaENyZWF0aW9uKCkKKyAgICAgICAgc2hvdWxkIGJlIGNoZWNraW5nIGZv ciBjb2RlQmxvY2sgaW5zdGVhZCBvZiAhY29kZUJsb2NrCisgICAgICAgIGJlZm9yZSB1c2luZyB0 aGUgY29kZUJsb2NrLgorCisgICAgICAgIEkgYWxzbyByZW5hbWVkIHNvbWUgb3RoZXIgInByaW50 IiBmdW5jdGlvbnMgdG8gdXNlICJkdW1wIiBpbnN0ZWFkCisgICAgICAgIHRvIG1hdGNoIHRoZWly IHVuZGVybHlpbmcgQysrIGNvZGUgdGhhdCB0aGV5IHdpbGwgY2FsbCBlLmcuCisgICAgICAgIENv ZGVCbG9jazo6ZHVtcFNvdXJjZSgpLgorCisgICAgICAgICogdG9vbHMvSlNEb2xsYXJWTS5jcHA6 CisgICAgICAgIChXVEY6OkpTRG9sbGFyVk1DYWxsRnJhbWU6OmZpbmlzaENyZWF0aW9uKToKKyAg ICAgICAgKEpTQzo6ZnVuY3Rpb25EdW1wU291cmNlRm9yKToKKyAgICAgICAgKEpTQzo6ZnVuY3Rp b25EdW1wQnl0ZWNvZGVGb3IpOgorICAgICAgICAoSlNDOjpkb1ByaW50KToKKyAgICAgICAgKEpT Qzo6ZnVuY3Rpb25EYXRhTG9nKToKKyAgICAgICAgKEpTQzo6ZnVuY3Rpb25QcmludCk6CisgICAg ICAgIChKU0M6OmZ1bmN0aW9uRHVtcENhbGxGcmFtZSk6CisgICAgICAgIChKU0M6OmZ1bmN0aW9u RHVtcFN0YWNrKToKKyAgICAgICAgKEpTQzo6SlNEb2xsYXJWTTo6ZmluaXNoQ3JlYXRpb24pOgor ICAgICAgICAoSlNDOjpmdW5jdGlvblByaW50U291cmNlRm9yKTogRGVsZXRlZC4KKyAgICAgICAg KEpTQzo6ZnVuY3Rpb25QcmludEJ5dGVjb2RlRm9yKTogRGVsZXRlZC4KKyAgICAgICAgKEpTQzo6 ZG9QcmludGxuKTogRGVsZXRlZC4KKyAgICAgICAgKEpTQzo6ZnVuY3Rpb25QcmludGxuKTogRGVs ZXRlZC4KKyAgICAgICAgKEpTQzo6ZnVuY3Rpb25QcmludENhbGxGcmFtZSk6IERlbGV0ZWQuCisg ICAgICAgIChKU0M6OmZ1bmN0aW9uUHJpbnRTdGFjayk6IERlbGV0ZWQuCisgICAgICAgICogdG9v bHMvVk1JbnNwZWN0b3IuY3BwOgorICAgICAgICAoSlNDOjpEdW1wRnJhbWVGdW5jdG9yOjpEdW1w RnJhbWVGdW5jdG9yKToKKyAgICAgICAgKEpTQzo6RHVtcEZyYW1lRnVuY3Rvcjo6b3BlcmF0b3Io KSBjb25zdCk6CisgICAgICAgIChKU0M6OlZNSW5zcGVjdG9yOjpkdW1wQ2FsbEZyYW1lKToKKyAg ICAgICAgKEpTQzo6Vk1JbnNwZWN0b3I6OmR1bXBTdGFjayk6CisgICAgICAgIChKU0M6OlZNSW5z cGVjdG9yOjpkdW1wVmFsdWUpOgorICAgICAgICAoSlNDOjpQcmludEZyYW1lRnVuY3Rvcjo6UHJp bnRGcmFtZUZ1bmN0b3IpOiBEZWxldGVkLgorICAgICAgICAoSlNDOjpQcmludEZyYW1lRnVuY3Rv cjo6b3BlcmF0b3IoKSBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgIChKU0M6OlZNSW5zcGVjdG9y OjpwcmludENhbGxGcmFtZSk6IERlbGV0ZWQuCisgICAgICAgIChKU0M6OlZNSW5zcGVjdG9yOjpw cmludFN0YWNrKTogRGVsZXRlZC4KKyAgICAgICAgKEpTQzo6Vk1JbnNwZWN0b3I6OnByaW50VmFs dWUpOiBEZWxldGVkLgorICAgICAgICAqIHRvb2xzL1ZNSW5zcGVjdG9yLmg6CisKIDIwMTgtMDYt MjcgIEtlaXRoIE1pbGxlciAgPGtlaXRoX21pbGxlckBhcHBsZS5jb20+CiAKICAgICAgICAgQWRk IGxvZ2dpbmcgdG8gdHJ5IHRvIGRpYWdub3NlIHdoZXJlIHdlIGdldCBhIG51bGwgc3RydWN0dXJl LgpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3Rvb2xzL0pTRG9sbGFyVk0uY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS90b29scy9KU0RvbGxhclZNLmNwcAkocmV2 aXNpb24gMjMzMjc1KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3Rvb2xzL0pTRG9sbGFyVk0u Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC05OSw3ICs5OSw3IEBAIHB1YmxpYzoKICAgICAgICAgICAg ICAgICBhZGRQcm9wZXJ0eSh2bSwgImNhbGxlZSIsIHZpc2l0b3ItPmNhbGxlZSgpLmFzQ2VsbCgp KTsKIAogICAgICAgICAgICAgQ29kZUJsb2NrKiBjb2RlQmxvY2sgPSB2aXNpdG9yLT5jb2RlQmxv Y2soKTsKLSAgICAgICAgICAgIGlmICghY29kZUJsb2NrKSB7CisgICAgICAgICAgICBpZiAoY29k ZUJsb2NrKSB7CiAgICAgICAgICAgICAgICAgYWRkUHJvcGVydHkodm0sICJjb2RlQmxvY2siLCBj b2RlQmxvY2spOwogICAgICAgICAgICAgICAgIGFkZFByb3BlcnR5KHZtLCAidW5saW5rZWRDb2Rl QmxvY2siLCBjb2RlQmxvY2stPnVubGlua2VkQ29kZUJsb2NrKCkpOwogICAgICAgICAgICAgICAg IGFkZFByb3BlcnR5KHZtLCAiZXhlY3V0YWJsZSIsIGNvZGVCbG9jay0+b3duZXJFeGVjdXRhYmxl KCkpOwpAQCAtMTMxNiw2ICsxMzE2LDE3IEBAIHN0YXRpYyBFbmNvZGVkSlNWYWx1ZSBKU0NfSE9T VF9DQUxMIGZ1bmMKIC8vIEdldHMgYSBKU0RvbGxhclZNQ2FsbEZyYW1lIGZvciBhIHNwZWNpZmll ZCBmcmFtZSBpbmRleC4KIC8vIFVzYWdlOiB2YXIgY2FsbEZyYW1lID0gJHZtLmNhbGxGcmFtZSgw KSAvLyBmcmFtZSAwIGlzIHRoZSB0b3AgZnJhbWUuCiAvLyBVc2FnZTogdmFyIGNhbGxGcmFtZSA9 ICR2bS5jYWxsRnJhbWUoKSAvLyBpbXBsaWVzIGZyYW1lIDAgaS5lLiBjdXJyZW50IGZyYW1lLgor Ly8KKy8vIFRoaXMgZ2l2ZXMgeW91IHRoZSBhYmlsaXR5IHRvIHF1ZXJ5IHRoZSBmb2xsb3dpbmc6 CisvLyAgICBjYWxsRnJhbWUudmFsaWQ7IC8vIGZhbHNlIGlmIHdlIGFza2VkIGZvciBhIGZyYW1l IGJleW9uZCB0aGUgZW5kIG9mIHRoZSBzdGFjaywgZWxzZSB0cnVlLgorLy8gICAgY2FsbEZyYW1l LmNhbGxlZTsKKy8vICAgIGNhbGxGcmFtZS5jb2RlQmxvY2s7CisvLyAgICBjYWxsRnJhbWUudW5s aW5rZWRDb2RlQmxvY2s7CisvLyAgICBjYWxsRnJhbWUuZXhlY3V0YWJsZTsKKy8vCisvLyBOb3Rl OiB5b3UgY2Fubm90IHRvU3RyaW5nKCkgYSBjb2RlQmxvY2ssIHVubGlua2VkQ29kZUJsb2NrLCBv ciBleGVjdXRhYmxlIGJlY2F1c2UKKy8vIHRoZXJlIGFyZSBpbnRlcm5hbCBvYmplY3RzIGFuZCBu b3QgYSBKUyBvYmplY3QuIEhlbmNlLCB5b3UgY2Fubm90IGRvIHN0cmluZworLy8gY29uY2F0ZW5h dGlvbiB3aXRoIHRoZW0uCiBzdGF0aWMgRW5jb2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCBmdW5j dGlvbkNhbGxGcmFtZShFeGVjU3RhdGUqIGV4ZWMpCiB7CiAgICAgdW5zaWduZWQgZnJhbWVOdW1i ZXIgPSAxOwpAQCAtMTM4NSw4ICsxMzk2LDEwIEBAIHN0YXRpYyBDb2RlQmxvY2sqIGNvZGVCbG9j a0Zyb21BcmcoRXhlY1MKICAgICByZXR1cm4gbnVsbHB0cjsKIH0KIAotLy8gVXNhZ2U6IHByaW50 KCJjb2RlYmxvY2sgPSAiICsgJHZtLmNvZGVCbG9ja0ZvcihmdW5jdGlvbk9iaikpCi0vLyBVc2Fn ZTogcHJpbnQoImNvZGVibG9jayA9ICIgKyAkdm0uY29kZUJsb2NrRm9yKGNvZGVCbG9ja1Rva2Vu KSkKKy8vIFVzYWdlOiAkdm0ucHJpbnQoImNvZGVibG9jayA9ICIsICR2bS5jb2RlQmxvY2tGb3Io ZnVuY3Rpb25PYmopKQorLy8gVXNhZ2U6ICR2bS5wcmludCgiY29kZWJsb2NrID0gIiwgJHZtLmNv ZGVCbG9ja0Zvcihjb2RlQmxvY2tUb2tlbikpCisvLyBOb3RlOiB5b3UgY2Fubm90IHRvU3RyaW5n KCkgYSBjb2RlQmxvY2sgYmVjYXVzZSBpdCdzIGFuIGludGVybmFsIG9iamVjdCBhbmQgbm90Cisv LyBhIEpTIG9iamVjdC4gSGVuY2UsIHlvdSBjYW5ub3QgZG8gc3RyaW5nIGNvbmNhdGVuYXRpb24g d2l0aCBpdC4KIHN0YXRpYyBFbmNvZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxMIGZ1bmN0aW9uQ29k ZUJsb2NrRm9yKEV4ZWNTdGF0ZSogZXhlYykKIHsKICAgICBDb2RlQmxvY2sqIGNvZGVCbG9jayA9 IGNvZGVCbG9ja0Zyb21BcmcoZXhlYyk7CkBAIC0xMzk4LDkgKzE0MTEsOSBAQCBzdGF0aWMgRW5j b2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCBmdW5jCiAgICAgcmV0dXJuIEpTVmFsdWU6OmVuY29k ZShqc1VuZGVmaW5lZCgpKTsKIH0KIAotLy8gVXNhZ2U6ICR2bS5wcmludFNvdXJjZUZvcihmdW5j dGlvbk9iaikKLS8vIFVzYWdlOiAkdm0ucHJpbnRTb3VyY2VGb3IoY29kZUJsb2NrVG9rZW4pCi1z dGF0aWMgRW5jb2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCBmdW5jdGlvblByaW50U291cmNlRm9y KEV4ZWNTdGF0ZSogZXhlYykKKy8vIFVzYWdlOiAkdm0uZHVtcFNvdXJjZUZvcihmdW5jdGlvbk9i aikKKy8vIFVzYWdlOiAkdm0uZHVtcFNvdXJjZUZvcihjb2RlQmxvY2tUb2tlbikKK3N0YXRpYyBF bmNvZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxMIGZ1bmN0aW9uRHVtcFNvdXJjZUZvcihFeGVjU3Rh dGUqIGV4ZWMpCiB7CiAgICAgQ29kZUJsb2NrKiBjb2RlQmxvY2sgPSBjb2RlQmxvY2tGcm9tQXJn KGV4ZWMpOwogICAgIGlmIChjb2RlQmxvY2spCkBAIC0xNDA4LDkgKzE0MjEsOSBAQCBzdGF0aWMg RW5jb2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCBmdW5jCiAgICAgcmV0dXJuIEpTVmFsdWU6OmVu Y29kZShqc1VuZGVmaW5lZCgpKTsKIH0KIAotLy8gVXNhZ2U6ICR2bS5wcmludEJ5dGVjb2RlRm9y KGZ1bmN0aW9uT2JqKQotLy8gVXNhZ2U6ICR2bS5wcmludEJ5dGVjb2RlKGNvZGVCbG9ja1Rva2Vu KQotc3RhdGljIEVuY29kZWRKU1ZhbHVlIEpTQ19IT1NUX0NBTEwgZnVuY3Rpb25QcmludEJ5dGVj b2RlRm9yKEV4ZWNTdGF0ZSogZXhlYykKKy8vIFVzYWdlOiAkdm0uZHVtcEJ5dGVjb2RlRm9yKGZ1 bmN0aW9uT2JqKQorLy8gVXNhZ2U6ICR2bS5kdW1wQnl0ZWNvZGVGb3IoY29kZUJsb2NrKQorc3Rh dGljIEVuY29kZWRKU1ZhbHVlIEpTQ19IT1NUX0NBTEwgZnVuY3Rpb25EdW1wQnl0ZWNvZGVGb3Io RXhlY1N0YXRlKiBleGVjKQogewogICAgIENvZGVCbG9jayogY29kZUJsb2NrID0gY29kZUJsb2Nr RnJvbUFyZyhleGVjKTsKICAgICBpZiAoY29kZUJsb2NrKQpAQCAtMTQxOCw3ICsxNDMxLDcgQEAg c3RhdGljIEVuY29kZWRKU1ZhbHVlIEpTQ19IT1NUX0NBTEwgZnVuYwogICAgIHJldHVybiBKU1Zh bHVlOjplbmNvZGUoanNVbmRlZmluZWQoKSk7CiB9CiAKLXN0YXRpYyBFbmNvZGVkSlNWYWx1ZSBk b1ByaW50bG4oRXhlY1N0YXRlKiBleGVjLCBib29sIGFkZExpbmVGZWVkKQorc3RhdGljIEVuY29k ZWRKU1ZhbHVlIGRvUHJpbnQoRXhlY1N0YXRlKiBleGVjLCBib29sIGFkZExpbmVGZWVkKQogewog ICAgIGF1dG8gc2NvcGUgPSBERUNMQVJFX1RIUk9XX1NDT1BFKGV4ZWMtPnZtKCkpOwogICAgIGZv ciAodW5zaWduZWQgaSA9IDA7IGkgPCBleGVjLT5hcmd1bWVudENvdW50KCk7ICsraSkgewpAQCAt MTQ0MCw0MyArMTQ1Myw0MyBAQCBzdGF0aWMgRW5jb2RlZEpTVmFsdWUgZG9QcmludGxuKEV4ZWNT dGF0CiB9CiAKIC8vIFByaW50cyBhIHNlcmllcyBvZiBjb21tYSBzZXBhcmF0ZSBzdHJpbmdzIHdp dGhvdXQgYXBwZW5kaW5nIGEgbmV3bGluZS4KLS8vIFVzYWdlOiAkdm0ucHJpbnQoc3RyMSwgc3Ry Miwgc3RyMykKLXN0YXRpYyBFbmNvZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxMIGZ1bmN0aW9uUHJp bnQoRXhlY1N0YXRlKiBleGVjKQorLy8gVXNhZ2U6ICR2bS5kYXRhTG9nKHN0cjEsIHN0cjIsIHN0 cjMpCitzdGF0aWMgRW5jb2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCBmdW5jdGlvbkRhdGFMb2co RXhlY1N0YXRlKiBleGVjKQogewogICAgIGNvbnN0IGJvb2wgYWRkTGluZUZlZWQgPSBmYWxzZTsK LSAgICByZXR1cm4gZG9QcmludGxuKGV4ZWMsIGFkZExpbmVGZWVkKTsKKyAgICByZXR1cm4gZG9Q cmludChleGVjLCBhZGRMaW5lRmVlZCk7CiB9CiAKIC8vIFByaW50cyBhIHNlcmllcyBvZiBjb21t YSBzZXBhcmF0ZSBzdHJpbmdzIGFuZCBhcHBlbmRzIGEgbmV3bGluZS4KLS8vIFVzYWdlOiAkdm0u cHJpbnRsbihzdHIxLCBzdHIyLCBzdHIzKQotc3RhdGljIEVuY29kZWRKU1ZhbHVlIEpTQ19IT1NU X0NBTEwgZnVuY3Rpb25QcmludGxuKEV4ZWNTdGF0ZSogZXhlYykKKy8vIFVzYWdlOiAkdm0ucHJp bnQoc3RyMSwgc3RyMiwgc3RyMykKK3N0YXRpYyBFbmNvZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxM IGZ1bmN0aW9uUHJpbnQoRXhlY1N0YXRlKiBleGVjKQogewogICAgIGNvbnN0IGJvb2wgYWRkTGlu ZUZlZWQgPSB0cnVlOwotICAgIHJldHVybiBkb1ByaW50bG4oZXhlYywgYWRkTGluZUZlZWQpOwor ICAgIHJldHVybiBkb1ByaW50KGV4ZWMsIGFkZExpbmVGZWVkKTsKIH0KIAotLy8gUHJpbnRzIHRo ZSBjdXJyZW50IENhbGxGcmFtZS4KLS8vIFVzYWdlOiAkdm0ucHJpbnRDYWxsRnJhbWUoKQotc3Rh dGljIEVuY29kZWRKU1ZhbHVlIEpTQ19IT1NUX0NBTEwgZnVuY3Rpb25QcmludENhbGxGcmFtZShF eGVjU3RhdGUqIGV4ZWMpCisvLyBEdW1wcyB0aGUgY3VycmVudCBDYWxsRnJhbWUuCisvLyBVc2Fn ZTogJHZtLmR1bXBDYWxsRnJhbWUoKQorc3RhdGljIEVuY29kZWRKU1ZhbHVlIEpTQ19IT1NUX0NB TEwgZnVuY3Rpb25EdW1wQ2FsbEZyYW1lKEV4ZWNTdGF0ZSogZXhlYykKIHsKLSAgICAvLyBXaGVu IHRoZSBjYWxsZXJzIGNhbGwgdGhpcyBmdW5jdGlvbiwgdGhleSBhcmUgZXhwZWN0aW5nIHRvIHBy aW50IHRoZWlyCisgICAgLy8gV2hlbiB0aGUgY2FsbGVycyBjYWxsIHRoaXMgZnVuY3Rpb24sIHRo ZXkgYXJlIGV4cGVjdGluZyB0byBkdW1wIHRoZWlyCiAgICAgLy8gb3duIGZyYW1lLiBTbyBza2lw IDEgZm9yIHRoaXMgZnJhbWUuCi0gICAgVk1JbnNwZWN0b3I6OnByaW50Q2FsbEZyYW1lKGV4ZWMs IDEpOworICAgIFZNSW5zcGVjdG9yOjpkdW1wQ2FsbEZyYW1lKGV4ZWMsIDEpOwogICAgIHJldHVy biBKU1ZhbHVlOjplbmNvZGUoanNVbmRlZmluZWQoKSk7CiB9CiAKLS8vIFByaW50cyB0aGUgSlMg c3RhY2suCisvLyBEdW1wcyB0aGUgSlMgc3RhY2suCiAvLyBVc2FnZTogJHZtLnByaW50U3RhY2so KQotc3RhdGljIEVuY29kZWRKU1ZhbHVlIEpTQ19IT1NUX0NBTEwgZnVuY3Rpb25QcmludFN0YWNr KEV4ZWNTdGF0ZSogZXhlYykKK3N0YXRpYyBFbmNvZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxMIGZ1 bmN0aW9uRHVtcFN0YWNrKEV4ZWNTdGF0ZSogZXhlYykKIHsKLSAgICAvLyBXaGVuIHRoZSBjYWxs ZXJzIGNhbGwgdGhpcyBmdW5jdGlvbiwgdGhleSBhcmUgZXhwZWN0aW5nIHRvIHByaW50IHRoZQor ICAgIC8vIFdoZW4gdGhlIGNhbGxlcnMgY2FsbCB0aGlzIGZ1bmN0aW9uLCB0aGV5IGFyZSBleHBl Y3RpbmcgdG8gZHVtcCB0aGUKICAgICAvLyBzdGFjayBzdGFydGluZyB0aGVpciBvd24gZnJhbWUu IFNvIHNraXAgMSBmb3IgdGhpcyBmcmFtZS4KLSAgICBWTUluc3BlY3Rvcjo6cHJpbnRTdGFjayhl eGVjLCAxKTsKKyAgICBWTUluc3BlY3Rvcjo6ZHVtcFN0YWNrKGV4ZWMsIDEpOwogICAgIHJldHVy biBKU1ZhbHVlOjplbmNvZGUoanNVbmRlZmluZWQoKSk7CiB9CiAKIC8vIEdldHMgdGhlIGRhdGFM b2cgZHVtcCBvZiB0aGUgaW5kZXhpbmdNb2RlIG9mIHRoZSBwYXNzZWQgdmFsdWUuCi0vLyBVc2Fn ZTogcHJpbnQoImluZGV4aW5nTW9kZSA9ICIgKyAkdm0uaW5kZXhpbmdNb2RlKGpzVmFsdWUpKQor Ly8gVXNhZ2U6ICR2bS5wcmludCgiaW5kZXhpbmdNb2RlID0gIiArICR2bS5pbmRleGluZ01vZGUo anNWYWx1ZSkpCiBzdGF0aWMgRW5jb2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCBmdW5jdGlvbklu ZGV4aW5nTW9kZShFeGVjU3RhdGUqIGV4ZWMpCiB7CiAgICAgaWYgKCFleGVjLT5hcmd1bWVudCgw KS5pc09iamVjdCgpKQpAQCAtMTQ5Nyw3ICsxNTEwLDcgQEAgc3RhdGljIEVuY29kZWRKU1ZhbHVl IEpTQ19IT1NUX0NBTEwgZnVuYwogfQogCiAvLyBHZXRzIHRoZSBkYXRhTG9nIGR1bXAgb2YgYSBn aXZlbiBKUyB2YWx1ZSBhcyBhIHN0cmluZy4KLS8vIFVzYWdlOiBwcmludCgidmFsdWUgPSAiICsg JHZtLnZhbHVlKGpzVmFsdWUpKQorLy8gVXNhZ2U6ICR2bS5wcmludCgidmFsdWUgPSAiICsgJHZt LnZhbHVlKGpzVmFsdWUpKQogc3RhdGljIEVuY29kZWRKU1ZhbHVlIEpTQ19IT1NUX0NBTEwgZnVu Y3Rpb25WYWx1ZShFeGVjU3RhdGUqIGV4ZWMpCiB7CiAgICAgV1RGOjpTdHJpbmdQcmludFN0cmVh bSBzdHJlYW07CkBAIC0xNTExLDcgKzE1MjQsNyBAQCBzdGF0aWMgRW5jb2RlZEpTVmFsdWUgSlND X0hPU1RfQ0FMTCBmdW5jCiB9CiAKIC8vIEdldHMgdGhlIHBpZCBvZiB0aGUgY3VycmVudCBwcm9j ZXNzLgotLy8gVXNhZ2U6IHByaW50KCJwaWQgPSAiICsgJHZtLmdldHBpZCgpKQorLy8gVXNhZ2U6 ICR2bS5wcmludCgicGlkID0gIiArICR2bS5nZXRwaWQoKSkKIHN0YXRpYyBFbmNvZGVkSlNWYWx1 ZSBKU0NfSE9TVF9DQUxMIGZ1bmN0aW9uR2V0UElEKEV4ZWNTdGF0ZSopCiB7CiAgICAgcmV0dXJu IEpTVmFsdWU6OmVuY29kZShqc051bWJlcihnZXRDdXJyZW50UHJvY2Vzc0lEKCkpKTsKQEAgLTE5 NjgsMTMgKzE5ODEsMTMgQEAgdm9pZCBKU0RvbGxhclZNOjpmaW5pc2hDcmVhdGlvbihWTSYgdm0p CiAgICAgYWRkRnVuY3Rpb24odm0sICJjYWxsRnJhbWUiLCBmdW5jdGlvbkNhbGxGcmFtZSwgMSk7 CiAgICAgYWRkRnVuY3Rpb24odm0sICJjb2RlQmxvY2tGb3IiLCBmdW5jdGlvbkNvZGVCbG9ja0Zv ciwgMSk7CiAgICAgYWRkRnVuY3Rpb24odm0sICJjb2RlQmxvY2tGb3JGcmFtZSIsIGZ1bmN0aW9u Q29kZUJsb2NrRm9yRnJhbWUsIDEpOwotICAgIGFkZEZ1bmN0aW9uKHZtLCAicHJpbnRTb3VyY2VG b3IiLCBmdW5jdGlvblByaW50U291cmNlRm9yLCAxKTsKLSAgICBhZGRGdW5jdGlvbih2bSwgInBy aW50Qnl0ZWNvZGVGb3IiLCBmdW5jdGlvblByaW50Qnl0ZWNvZGVGb3IsIDEpOworICAgIGFkZEZ1 bmN0aW9uKHZtLCAiZHVtcFNvdXJjZUZvciIsIGZ1bmN0aW9uRHVtcFNvdXJjZUZvciwgMSk7Cisg ICAgYWRkRnVuY3Rpb24odm0sICJkdW1wQnl0ZWNvZGVGb3IiLCBmdW5jdGlvbkR1bXBCeXRlY29k ZUZvciwgMSk7CiAKKyAgICBhZGRGdW5jdGlvbih2bSwgImRhdGFMb2ciLCBmdW5jdGlvbkRhdGFM b2csIDEpOwogICAgIGFkZEZ1bmN0aW9uKHZtLCAicHJpbnQiLCBmdW5jdGlvblByaW50LCAxKTsK LSAgICBhZGRGdW5jdGlvbih2bSwgInByaW50bG4iLCBmdW5jdGlvblByaW50bG4sIDEpOwotICAg IGFkZEZ1bmN0aW9uKHZtLCAicHJpbnRDYWxsRnJhbWUiLCBmdW5jdGlvblByaW50Q2FsbEZyYW1l LCAwKTsKLSAgICBhZGRGdW5jdGlvbih2bSwgInByaW50U3RhY2siLCBmdW5jdGlvblByaW50U3Rh Y2ssIDApOworICAgIGFkZEZ1bmN0aW9uKHZtLCAiZHVtcENhbGxGcmFtZSIsIGZ1bmN0aW9uRHVt cENhbGxGcmFtZSwgMCk7CisgICAgYWRkRnVuY3Rpb24odm0sICJkdW1wU3RhY2siLCBmdW5jdGlv bkR1bXBTdGFjaywgMCk7CiAKICAgICBhZGRGdW5jdGlvbih2bSwgImluZGV4aW5nTW9kZSIsIGZ1 bmN0aW9uSW5kZXhpbmdNb2RlLCAxKTsKICAgICBhZGRGdW5jdGlvbih2bSwgImlubGluZUNhcGFj aXR5IiwgZnVuY3Rpb25JbmxpbmVDYXBhY2l0eSwgMSk7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlw dENvcmUvdG9vbHMvVk1JbnNwZWN0b3IuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS90b29scy9WTUluc3BlY3Rvci5jcHAJKHJldmlzaW9uIDIzMzI3NSkKKysrIFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS90b29scy9WTUluc3BlY3Rvci5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTEsNSArMSw1IEBACiAvKgotICogQ29weXJpZ2h0IChDKSAyMDE3IEFwcGxlIEluYy4gQWxsIHJp Z2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAxNy0yMDE4IEFwcGxlIEluYy4gQWxs IHJpZ2h0cyByZXNlcnZlZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJj ZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJl IHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtMzI2 LDE0ICszMjYsMTQgQEAgQ29kZUJsb2NrKiBWTUluc3BlY3Rvcjo6Y29kZUJsb2NrRm9yRnJhbQog ICAgIHJldHVybiBmdW5jdG9yLmNvZGVCbG9jazsKIH0KIAotY2xhc3MgUHJpbnRGcmFtZUZ1bmN0 b3IgeworY2xhc3MgRHVtcEZyYW1lRnVuY3RvciB7CiBwdWJsaWM6CiAgICAgZW51bSBBY3Rpb24g ewotICAgICAgICBQcmludE9uZSwKLSAgICAgICAgUHJpbnRBbGwKKyAgICAgICAgRHVtcE9uZSwK KyAgICAgICAgRHVtcEFsbAogICAgIH07CiAKLSAgICBQcmludEZyYW1lRnVuY3RvcihBY3Rpb24g YWN0aW9uLCB1bnNpZ25lZCBmcmFtZXNUb1NraXApCisgICAgRHVtcEZyYW1lRnVuY3RvcihBY3Rp b24gYWN0aW9uLCB1bnNpZ25lZCBmcmFtZXNUb1NraXApCiAgICAgICAgIDogbV9hY3Rpb24oYWN0 aW9uKQogICAgICAgICAsIG1fZnJhbWVzVG9Ta2lwKGZyYW1lc1RvU2tpcCkKICAgICB7CkBAIC0z NDcsNyArMzQ3LDcgQEAgcHVibGljOgogICAgICAgICAgICAgICAgIG91dC5wcmludCgiWyIsICht X2N1cnJlbnRGcmFtZSAtIG1fZnJhbWVzVG9Ta2lwIC0gMSksICJdICIpOwogICAgICAgICAgICAg fSk7CiAgICAgICAgIH0KLSAgICAgICAgaWYgKG1fYWN0aW9uID09IFByaW50T25lICYmIG1fY3Vy cmVudEZyYW1lID4gbV9mcmFtZXNUb1NraXApCisgICAgICAgIGlmIChtX2FjdGlvbiA9PSBEdW1w T25lICYmIG1fY3VycmVudEZyYW1lID4gbV9mcmFtZXNUb1NraXApCiAgICAgICAgICAgICByZXR1 cm4gU3RhY2tWaXNpdG9yOjpEb25lOwogICAgICAgICByZXR1cm4gU3RhY2tWaXNpdG9yOjpDb250 aW51ZTsKICAgICB9CkBAIC0zNTgsMjUgKzM1OCwyNSBAQCBwcml2YXRlOgogICAgIG11dGFibGUg dW5zaWduZWQgbV9jdXJyZW50RnJhbWUgeyAwIH07CiB9OwogCi12b2lkIFZNSW5zcGVjdG9yOjpw cmludENhbGxGcmFtZShDYWxsRnJhbWUqIGNhbGxGcmFtZSwgdW5zaWduZWQgZnJhbWVzVG9Ta2lw KQordm9pZCBWTUluc3BlY3Rvcjo6ZHVtcENhbGxGcmFtZShDYWxsRnJhbWUqIGNhbGxGcmFtZSwg dW5zaWduZWQgZnJhbWVzVG9Ta2lwKQogewogICAgIGlmICghZW5zdXJlQ3VycmVudFRocmVhZE93 bnNKU0xvY2soY2FsbEZyYW1lKSkKICAgICAgICAgcmV0dXJuOwotICAgIFByaW50RnJhbWVGdW5j dG9yIGZ1bmN0b3IoUHJpbnRGcmFtZUZ1bmN0b3I6OlByaW50T25lLCBmcmFtZXNUb1NraXApOwor ICAgIER1bXBGcmFtZUZ1bmN0b3IgZnVuY3RvcihEdW1wRnJhbWVGdW5jdG9yOjpEdW1wT25lLCBm cmFtZXNUb1NraXApOwogICAgIGNhbGxGcmFtZS0+aXRlcmF0ZShmdW5jdG9yKTsKIH0KIAotdm9p ZCBWTUluc3BlY3Rvcjo6cHJpbnRTdGFjayhDYWxsRnJhbWUqIHRvcENhbGxGcmFtZSwgdW5zaWdu ZWQgZnJhbWVzVG9Ta2lwKQordm9pZCBWTUluc3BlY3Rvcjo6ZHVtcFN0YWNrKENhbGxGcmFtZSog dG9wQ2FsbEZyYW1lLCB1bnNpZ25lZCBmcmFtZXNUb1NraXApCiB7CiAgICAgaWYgKCFlbnN1cmVD dXJyZW50VGhyZWFkT3duc0pTTG9jayh0b3BDYWxsRnJhbWUpKQogICAgICAgICByZXR1cm47CiAg ICAgaWYgKCF0b3BDYWxsRnJhbWUpCiAgICAgICAgIHJldHVybjsKLSAgICBQcmludEZyYW1lRnVu Y3RvciBmdW5jdG9yKFByaW50RnJhbWVGdW5jdG9yOjpQcmludEFsbCwgZnJhbWVzVG9Ta2lwKTsK KyAgICBEdW1wRnJhbWVGdW5jdG9yIGZ1bmN0b3IoRHVtcEZyYW1lRnVuY3Rvcjo6RHVtcEFsbCwg ZnJhbWVzVG9Ta2lwKTsKICAgICB0b3BDYWxsRnJhbWUtPml0ZXJhdGUoZnVuY3Rvcik7CiB9CiAK LXZvaWQgVk1JbnNwZWN0b3I6OnByaW50VmFsdWUoSlNWYWx1ZSB2YWx1ZSkKK3ZvaWQgVk1JbnNw ZWN0b3I6OmR1bXBWYWx1ZShKU1ZhbHVlIHZhbHVlKQogewogICAgIGRhdGFMb2codmFsdWUpOwog fQpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3Rvb2xzL1ZNSW5zcGVjdG9yLmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL3Rvb2xzL1ZNSW5zcGVjdG9yLmgJKHJldmlz aW9uIDIzMzI3NSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS90b29scy9WTUluc3BlY3Rvci5o CSh3b3JraW5nIGNvcHkpCkBAIC0xLDUgKzEsNSBAQAogLyoKLSAqIENvcHlyaWdodCAoQykgMjAx NyBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMTct MjAxOCBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0cmlidXRp b24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAg KiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5n IGNvbmRpdGlvbnMKQEAgLTY5LDkgKzY5LDkgQEAgcHVibGljOgogICAgIEpTX0VYUE9SVF9QUklW QVRFIHN0YXRpYyBib29sIGlzVmFsaWRDZWxsKEhlYXAqLCBKU0NlbGwqKTsKICAgICBKU19FWFBP UlRfUFJJVkFURSBzdGF0aWMgYm9vbCBpc1ZhbGlkQ29kZUJsb2NrKEV4ZWNTdGF0ZSosIENvZGVC bG9jayopOwogICAgIEpTX0VYUE9SVF9QUklWQVRFIHN0YXRpYyBDb2RlQmxvY2sqIGNvZGVCbG9j a0ZvckZyYW1lKENhbGxGcmFtZSogdG9wQ2FsbEZyYW1lLCB1bnNpZ25lZCBmcmFtZU51bWJlcik7 Ci0gICAgSlNfRVhQT1JUX1BSSVZBVEUgc3RhdGljIHZvaWQgcHJpbnRDYWxsRnJhbWUoQ2FsbEZy YW1lKiwgdW5zaWduZWQgZnJhbWVzVG9Ta2lwID0gMCk7Ci0gICAgSlNfRVhQT1JUX1BSSVZBVEUg c3RhdGljIHZvaWQgcHJpbnRTdGFjayhDYWxsRnJhbWUqIHRvcENhbGxGcmFtZSwgdW5zaWduZWQg ZnJhbWVzVG9Ta2lwID0gMCk7Ci0gICAgSlNfRVhQT1JUX1BSSVZBVEUgc3RhdGljIHZvaWQgcHJp bnRWYWx1ZShKU1ZhbHVlKTsKKyAgICBKU19FWFBPUlRfUFJJVkFURSBzdGF0aWMgdm9pZCBkdW1w Q2FsbEZyYW1lKENhbGxGcmFtZSosIHVuc2lnbmVkIGZyYW1lc1RvU2tpcCA9IDApOworICAgIEpT X0VYUE9SVF9QUklWQVRFIHN0YXRpYyB2b2lkIGR1bXBTdGFjayhDYWxsRnJhbWUqIHRvcENhbGxG cmFtZSwgdW5zaWduZWQgZnJhbWVzVG9Ta2lwID0gMCk7CisgICAgSlNfRVhQT1JUX1BSSVZBVEUg c3RhdGljIHZvaWQgZHVtcFZhbHVlKEpTVmFsdWUpOwogCiBwcml2YXRlOgogICAgIHRlbXBsYXRl IDx0eXBlbmFtZSBGdW5jdG9yPiB2b2lkIGl0ZXJhdGUoY29uc3QgRnVuY3RvciYgZnVuY3RvcikK