152897 2016-01-08 09:45:07 -0800 Rename StringFromCharCode to StringFromSingleCharCode. 2016-01-08 10:45:40 -0800 1 1 1 Unclassified WebKit JavaScriptCore WebKit Local Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mark.lam mark.lam commit-queue fpizlo keith_miller msaboff saam oldest_to_newest 1153845 0 mark.lam 2016-01-08 09:45:07 -0800 StringFromSingleCharCode is a better name because the intrinsic it represents only applies when we are converting from a single char code. 1153846 1 268548 mark.lam 2016-01-08 09:50:22 -0800 Created attachment 268548 proposed patch. 1153849 2 268548 dbates 2016-01-08 10:02:37 -0800 Comment on attachment 268548 proposed patch. Mark Lam told me on IRC that the StringFromCharCode logic is called when the DFG detects that "String.fromCharCode is only passed a single value". For completeness the JavaScript API String.fromCharCode() takes more than one char code. 1153850 3 mark.lam 2016-01-08 10:07:06 -0800 (In reply to comment #2) > Comment on attachment 268548 [details] > proposed patch. > > Mark Lam told me on IRC that the StringFromCharCode logic is called when the > DFG detects that "String.fromCharCode is only passed a single value". For > completeness the JavaScript API String.fromCharCode() takes more than one > char code. To clarify, the StringFromCharCode logic here refers to a DFG intrinsic implementation of String.fromCharCode(). See DFGByteCodeParser.cpp for where it will only emit this intrinsic node if the number of arguments is 2 (this + the single char code). 1153851 4 mark.lam 2016-01-08 10:12:00 -0800 Thanks for the review. Landed in r194767: <http://trac.webkit.org/r194767>. 1153857 5 fpizlo 2016-01-08 10:22:13 -0800 I think that it should take more than a non-JSC reviewer to rename parts of DFG IR. 1153861 6 mark.lam 2016-01-08 10:40:03 -0800 Fil has told me offline that it is common practice to name DFG intrinsic nodes based on the functions they replace, even if the intrinsic does not fully implement the most generic form of said functions. For example, ArithMax, ArithMin, and NeewArray. I will roll out the patch. 1153866 7 mark.lam 2016-01-08 10:45:40 -0800 The patch has been rolled out in r194770: <http://trac.webkit.org/r194770>. 268548 2016-01-08 09:50:22 -0800 2016-01-08 10:02:37 -0800 proposed patch. bug-152897.patch text/plain 10847 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTk0NzY2KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQyIEBA CisyMDE2LTAxLTA4ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBS ZW5hbWUgU3RyaW5nRnJvbUNoYXJDb2RlIHRvIFN0cmluZ0Zyb21TaW5nbGVDaGFyQ29kZS4KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1Mjg5NworCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFN0cmluZ0Zyb21T aW5nbGVDaGFyQ29kZSBpcyBhIGJldHRlciBuYW1lIGJlY2F1c2UgdGhlIGludHJpbnNpYyBpdCBy ZXByZXNlbnRzCisgICAgICAgIG9ubHkgYXBwbGllcyB3aGVuIHdlIGFyZSBjb252ZXJ0aW5nIGZy b20gYSBzaW5nbGUgY2hhciBjb2RlLiAgVGhpcyBpcyBwdXJlbHkKKyAgICAgICAgYSByZWZhY3Rv cmluZyBwYXRjaC4gIFRoZXJlIGlzIG5vIHNlbWFudGljIGNoYW5nZS4KKworICAgICAgICAqIGRm Zy9ERkdBYnN0cmFjdEludGVycHJldGVySW5saW5lcy5oOgorICAgICAgICAoSlNDOjpERkc6OkFi c3RyYWN0SW50ZXJwcmV0ZXI8QWJzdHJhY3RTdGF0ZVR5cGU+OjpleGVjdXRlRWZmZWN0cyk6Cisg ICAgICAgICogZGZnL0RGR0J5dGVDb2RlUGFyc2VyLmNwcDoKKyAgICAgICAgKEpTQzo6REZHOjpC eXRlQ29kZVBhcnNlcjo6aGFuZGxlSW50cmluc2ljQ2FsbCk6CisgICAgICAgICogZGZnL0RGR0Ns b2JiZXJpemUuaDoKKyAgICAgICAgKEpTQzo6REZHOjpjbG9iYmVyaXplKToKKyAgICAgICAgKiBk ZmcvREZHRG9lc0dDLmNwcDoKKyAgICAgICAgKEpTQzo6REZHOjpkb2VzR0MpOgorICAgICAgICAq IGRmZy9ERkdGaXh1cFBoYXNlLmNwcDoKKyAgICAgICAgKEpTQzo6REZHOjpGaXh1cFBoYXNlOjpm aXh1cE5vZGUpOgorICAgICAgICAqIGRmZy9ERkdOb2RlVHlwZS5oOgorICAgICAgICAqIGRmZy9E RkdPcGVyYXRpb25zLmNwcDoKKyAgICAgICAgKiBkZmcvREZHT3BlcmF0aW9ucy5oOgorICAgICAg ICAqIGRmZy9ERkdQcmVkaWN0aW9uUHJvcGFnYXRpb25QaGFzZS5jcHA6CisgICAgICAgIChKU0M6 OkRGRzo6UHJlZGljdGlvblByb3BhZ2F0aW9uUGhhc2U6OnByb3BhZ2F0ZSk6CisgICAgICAgICog ZGZnL0RGR1NhZmVUb0V4ZWN1dGUuaDoKKyAgICAgICAgKEpTQzo6REZHOjpzYWZlVG9FeGVjdXRl KToKKyAgICAgICAgKiBkZmcvREZHU3BlY3VsYXRpdmVKSVQuY3BwOgorICAgICAgICAoSlNDOjpE Rkc6OlNwZWN1bGF0aXZlSklUOjpjb21waWxlRnJvbUNoYXJDb2RlKToKKyAgICAgICAgKiBkZmcv REZHU3BlY3VsYXRpdmVKSVQzMl82NC5jcHA6CisgICAgICAgIChKU0M6OkRGRzo6U3BlY3VsYXRp dmVKSVQ6OmNvbXBpbGUpOgorICAgICAgICAqIGRmZy9ERkdTcGVjdWxhdGl2ZUpJVDY0LmNwcDoK KyAgICAgICAgKEpTQzo6REZHOjpTcGVjdWxhdGl2ZUpJVDo6Y29tcGlsZSk6CisgICAgICAgICog cnVudGltZS9TdHJpbmdDb25zdHJ1Y3Rvci5jcHA6CisgICAgICAgIChKU0M6OnN0cmluZ0Zyb21D aGFyQ29kZSk6CisgICAgICAgIChKU0M6OnN0cmluZ0Zyb21TaW5nbGVDaGFyQ29kZSk6CisgICAg ICAgICogcnVudGltZS9TdHJpbmdDb25zdHJ1Y3Rvci5oOgorCiAyMDE2LTAxLTA4ICBLb25zdGFu dGluIFRva2FyZXYgIDxhbm51bGVuQHlhbmRleC5ydT4KIAogICAgICAgICBbbWlwc10gRml4ZWQg dW51c2VkIHBhcmFtZXRlciB3YXJuaW5ncwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2Rm Zy9ERkdBYnN0cmFjdEludGVycHJldGVySW5saW5lcy5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9kZmcvREZHQWJzdHJhY3RJbnRlcnByZXRlcklubGluZXMuaAkocmV2aXNp b24gMTk0NzY2KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdBYnN0cmFjdEludGVy cHJldGVySW5saW5lcy5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMzQxLDcgKzEzNDEsNyBAQCBib29s IEFic3RyYWN0SW50ZXJwcmV0ZXI8QWJzdHJhY3RTdGF0ZVR5CiAgICAgICAgIGZvck5vZGUobm9k ZSkuc2V0VHlwZShTcGVjSW50MzIpOwogICAgICAgICBicmVhazsKICAgICAgICAgCi0gICAgY2Fz ZSBTdHJpbmdGcm9tQ2hhckNvZGU6CisgICAgY2FzZSBTdHJpbmdGcm9tU2luZ2xlQ2hhckNvZGU6 CiAgICAgICAgIGZvck5vZGUobm9kZSkuc2V0VHlwZShtX2dyYXBoLCBTcGVjU3RyaW5nKTsKICAg ICAgICAgYnJlYWs7CiAKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQnl0ZUNv ZGVQYXJzZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZH Qnl0ZUNvZGVQYXJzZXIuY3BwCShyZXZpc2lvbiAxOTQ3NjYpCisrKyBTb3VyY2UvSmF2YVNjcmlw dENvcmUvZGZnL0RGR0J5dGVDb2RlUGFyc2VyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjE2MSw3 ICsyMTYxLDcgQEAgYm9vbCBCeXRlQ29kZVBhcnNlcjo6aGFuZGxlSW50cmluc2ljQ2FsbAogCiAg ICAgICAgIGluc2VydENoZWNrcygpOwogICAgICAgICBWaXJ0dWFsUmVnaXN0ZXIgaW5kZXhPcGVy YW5kID0gdmlydHVhbFJlZ2lzdGVyRm9yQXJndW1lbnQoMSwgcmVnaXN0ZXJPZmZzZXQpOwotICAg ICAgICBOb2RlKiBjaGFyQ29kZSA9IGFkZFRvR3JhcGgoU3RyaW5nRnJvbUNoYXJDb2RlLCBnZXQo aW5kZXhPcGVyYW5kKSk7CisgICAgICAgIE5vZGUqIGNoYXJDb2RlID0gYWRkVG9HcmFwaChTdHJp bmdGcm9tU2luZ2xlQ2hhckNvZGUsIGdldChpbmRleE9wZXJhbmQpKTsKIAogICAgICAgICBzZXQo VmlydHVhbFJlZ2lzdGVyKHJlc3VsdE9wZXJhbmQpLCBjaGFyQ29kZSk7CiAKSW5kZXg6IFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQ2xvYmJlcml6ZS5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQ2xvYmJlcml6ZS5oCShyZXZpc2lvbiAxOTQ3NjYpCisr KyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0Nsb2JiZXJpemUuaAkod29ya2luZyBjb3B5 KQpAQCAtMTM1LDcgKzEzNSw3IEBAIHZvaWQgY2xvYmJlcml6ZShHcmFwaCYgZ3JhcGgsIE5vZGUq IG5vZGUKICAgICBjYXNlIEdldFNjb3BlOgogICAgIGNhc2UgU2tpcFNjb3BlOgogICAgIGNhc2Ug U3RyaW5nQ2hhckNvZGVBdDoKLSAgICBjYXNlIFN0cmluZ0Zyb21DaGFyQ29kZToKKyAgICBjYXNl IFN0cmluZ0Zyb21TaW5nbGVDaGFyQ29kZToKICAgICBjYXNlIENvbXBhcmVTdHJpY3RFcToKICAg ICBjYXNlIElzVW5kZWZpbmVkOgogICAgIGNhc2UgSXNCb29sZWFuOgpJbmRleDogU291cmNlL0ph dmFTY3JpcHRDb3JlL2RmZy9ERkdEb2VzR0MuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9kZmcvREZHRG9lc0dDLmNwcAkocmV2aXNpb24gMTk0NzY2KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL2RmZy9ERkdEb2VzR0MuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNjgs NyArMTY4LDcgQEAgYm9vbCBkb2VzR0MoR3JhcGgmIGdyYXBoLCBOb2RlKiBub2RlKQogICAgIGNh c2UgQ291bnRFeGVjdXRpb246CiAgICAgY2FzZSBGb3JjZU9TUkV4aXQ6CiAgICAgY2FzZSBDaGVj a1dhdGNoZG9nVGltZXI6Ci0gICAgY2FzZSBTdHJpbmdGcm9tQ2hhckNvZGU6CisgICAgY2FzZSBT dHJpbmdGcm9tU2luZ2xlQ2hhckNvZGU6CiAgICAgY2FzZSBVbnJlYWNoYWJsZToKICAgICBjYXNl IEV4dHJhY3RPU1JFbnRyeUxvY2FsOgogICAgIGNhc2UgQ2hlY2tUaWVyVXBJbkxvb3A6CkluZGV4 OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0ZpeHVwUGhhc2UuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHRml4dXBQaGFzZS5jcHAJKHJldmlzaW9u IDE5NDc2NikKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHRml4dXBQaGFzZS5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTYwNCw3ICs2MDQsNyBAQCBwcml2YXRlOgogICAgICAgICAgICAg YnJlYWs7CiAgICAgICAgIH0KIAotICAgICAgICBjYXNlIFN0cmluZ0Zyb21DaGFyQ29kZToKKyAg ICAgICAgY2FzZSBTdHJpbmdGcm9tU2luZ2xlQ2hhckNvZGU6CiAgICAgICAgICAgICBmaXhFZGdl PEludDMyVXNlPihub2RlLT5jaGlsZDEoKSk7CiAgICAgICAgICAgICBicmVhazsKIApJbmRleDog U291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdOb2RlVHlwZS5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHTm9kZVR5cGUuaAkocmV2aXNpb24gMTk0NzY2KQor KysgU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdOb2RlVHlwZS5oCSh3b3JraW5nIGNvcHkp CkBAIC0yMzUsNyArMjM1LDcgQEAgbmFtZXNwYWNlIEpTQyB7IG5hbWVzcGFjZSBERkcgewogICAg IC8qIE9wdGltaXphdGlvbnMgZm9yIHN0cmluZyBhY2Nlc3MgKi8gXAogICAgIG1hY3JvKFN0cmlu Z0NoYXJDb2RlQXQsIE5vZGVSZXN1bHRJbnQzMikgXAogICAgIG1hY3JvKFN0cmluZ0NoYXJBdCwg Tm9kZVJlc3VsdEpTKSBcCi0gICAgbWFjcm8oU3RyaW5nRnJvbUNoYXJDb2RlLCBOb2RlUmVzdWx0 SlMpIFwKKyAgICBtYWNybyhTdHJpbmdGcm9tU2luZ2xlQ2hhckNvZGUsIE5vZGVSZXN1bHRKUykg XAogICAgIFwKICAgICAvKiBOb2RlcyBmb3IgY29tcGFyaXNvbiBvcGVyYXRpb25zLiAqL1wKICAg ICBtYWNybyhDb21wYXJlTGVzcywgTm9kZVJlc3VsdEJvb2xlYW4gfCBOb2RlTXVzdEdlbmVyYXRl KSBcCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR09wZXJhdGlvbnMuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHT3BlcmF0aW9ucy5jcHAJ KHJldmlzaW9uIDE5NDc2NikKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHT3BlcmF0 aW9ucy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEzMDYsMTEgKzEzMDYsMTEgQEAgZG91YmxlIEpJ VF9PUEVSQVRJT04gb3BlcmF0aW9uUmFuZG9tKEpTRwogfQogI2VuZGlmCiAKLUpTQ2VsbCogSklU X09QRVJBVElPTiBvcGVyYXRpb25TdHJpbmdGcm9tQ2hhckNvZGUoRXhlY1N0YXRlKiBleGVjLCBp bnQzMl90IG9wMSkKK0pTQ2VsbCogSklUX09QRVJBVElPTiBvcGVyYXRpb25TdHJpbmdGcm9tU2lu Z2xlQ2hhckNvZGUoRXhlY1N0YXRlKiBleGVjLCBpbnQzMl90IG9wMSkKIHsKICAgICBWTSogdm0g PSAmZXhlYy0+dm0oKTsKICAgICBOYXRpdmVDYWxsRnJhbWVUcmFjZXIgdHJhY2VyKHZtLCBleGVj KTsKLSAgICByZXR1cm4gSlNDOjpzdHJpbmdGcm9tQ2hhckNvZGUoZXhlYywgb3AxKTsKKyAgICBy ZXR1cm4gSlNDOjpzdHJpbmdGcm9tU2luZ2xlQ2hhckNvZGUoZXhlYywgb3AxKTsKIH0KIAogaW50 NjRfdCBKSVRfT1BFUkFUSU9OIG9wZXJhdGlvbkNvbnZlcnRCb3hlZERvdWJsZVRvSW50NTIoRW5j b2RlZEpTVmFsdWUgZW5jb2RlZFZhbHVlKQpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2Rm Zy9ERkdPcGVyYXRpb25zLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2Rm Zy9ERkdPcGVyYXRpb25zLmgJKHJldmlzaW9uIDE5NDc2NikKKysrIFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9kZmcvREZHT3BlcmF0aW9ucy5oCSh3b3JraW5nIGNvcHkpCkBAIC0zNyw3ICszNyw3IEBA IHN0cnVjdCBPU1JFeGl0QmFzZTsKIAogZXh0ZXJuICJDIiB7CiAKLUpTQ2VsbCogSklUX09QRVJB VElPTiBvcGVyYXRpb25TdHJpbmdGcm9tQ2hhckNvZGUoRXhlY1N0YXRlKiwgaW50MzJfdCkgIFdU Rl9JTlRFUk5BTDsgCitKU0NlbGwqIEpJVF9PUEVSQVRJT04gb3BlcmF0aW9uU3RyaW5nRnJvbVNp bmdsZUNoYXJDb2RlKEV4ZWNTdGF0ZSosIGludDMyX3QpICBXVEZfSU5URVJOQUw7CiAKIC8vIFRo ZXNlIHJvdXRpbmVzIGFyZSBwcm92aWRlIGNhbGxiYWNrcyBvdXQgdG8gQysrIGltcGxlbWVudGF0 aW9ucyBvZiBvcGVyYXRpb25zIHRvbyBjb21wbGV4IHRvIEpJVC4KIEpTQ2VsbCogSklUX09QRVJB VElPTiBvcGVyYXRpb25DcmVhdGVUaGlzKEV4ZWNTdGF0ZSosIEpTT2JqZWN0KiBjb25zdHJ1Y3Rv ciwgaW50MzJfdCBpbmxpbmVDYXBhY2l0eSkgV1RGX0lOVEVSTkFMOwpJbmRleDogU291cmNlL0ph dmFTY3JpcHRDb3JlL2RmZy9ERkdQcmVkaWN0aW9uUHJvcGFnYXRpb25QaGFzZS5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdQcmVkaWN0aW9uUHJvcGFnYXRp b25QaGFzZS5jcHAJKHJldmlzaW9uIDE5NDc2NikKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9k ZmcvREZHUHJlZGljdGlvblByb3BhZ2F0aW9uUGhhc2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01 MzAsNyArNTMwLDcgQEAgcHJpdmF0ZToKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9CiAg ICAgICAgIAotICAgICAgICBjYXNlIFN0cmluZ0Zyb21DaGFyQ29kZTogeworICAgICAgICBjYXNl IFN0cmluZ0Zyb21TaW5nbGVDaGFyQ29kZTogewogICAgICAgICAgICAgY2hhbmdlZCB8PSBzZXRQ cmVkaWN0aW9uKFNwZWNTdHJpbmcpOwogICAgICAgICAgICAgY2hhbmdlZCB8PSBub2RlLT5jaGls ZDEoKS0+bWVyZ2VGbGFncyhOb2RlQnl0ZWNvZGVVc2VzQXNOdW1iZXIgfCBOb2RlQnl0ZWNvZGVV c2VzQXNJbnQpOyAgICAgICAgICAgIAogICAgICAgICAgICAgYnJlYWs7CkluZGV4OiBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvZGZnL0RGR1NhZmVUb0V4ZWN1dGUuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NhZmVUb0V4ZWN1dGUuaAkocmV2aXNpb24gMTk0NzY2 KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTYWZlVG9FeGVjdXRlLmgJKHdvcmtp bmcgY29weSkKQEAgLTI4Myw3ICsyODMsNyBAQCBib29sIHNhZmVUb0V4ZWN1dGUoQWJzdHJhY3RT dGF0ZVR5cGUmIHN0CiAgICAgY2FzZSBDb3VudEV4ZWN1dGlvbjoKICAgICBjYXNlIEZvcmNlT1NS RXhpdDoKICAgICBjYXNlIENoZWNrV2F0Y2hkb2dUaW1lcjoKLSAgICBjYXNlIFN0cmluZ0Zyb21D aGFyQ29kZToKKyAgICBjYXNlIFN0cmluZ0Zyb21TaW5nbGVDaGFyQ29kZToKICAgICBjYXNlIE5l d1R5cGVkQXJyYXk6CiAgICAgY2FzZSBVbnJlYWNoYWJsZToKICAgICBjYXNlIEV4dHJhY3RPU1JF bnRyeUxvY2FsOgpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2 ZUpJVDMyXzY0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RG R1NwZWN1bGF0aXZlSklUMzJfNjQuY3BwCShyZXZpc2lvbiAxOTQ3NjYpCisrKyBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklUMzJfNjQuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC0yMzY4LDcgKzIzNjgsNyBAQCB2b2lkIFNwZWN1bGF0aXZlSklUOjpjb21waWxlKE5vZGUq IG5vZGUpCiAgICAgICAgIGJyZWFrOwogICAgIH0KIAotICAgIGNhc2UgU3RyaW5nRnJvbUNoYXJD b2RlOiB7CisgICAgY2FzZSBTdHJpbmdGcm9tU2luZ2xlQ2hhckNvZGU6IHsKICAgICAgICAgY29t cGlsZUZyb21DaGFyQ29kZShub2RlKTsKICAgICAgICAgYnJlYWs7CiAgICAgfQpJbmRleDogU291 cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVDY0LmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklUNjQuY3BwCShy ZXZpc2lvbiAxOTQ3NjYpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0 aXZlSklUNjQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNDkwLDcgKzI0OTAsNyBAQCB2b2lkIFNw ZWN1bGF0aXZlSklUOjpjb21waWxlKE5vZGUqIG5vZGUpCiAgICAgICAgIGJyZWFrOwogICAgIH0K IAotICAgIGNhc2UgU3RyaW5nRnJvbUNoYXJDb2RlOiB7CisgICAgY2FzZSBTdHJpbmdGcm9tU2lu Z2xlQ2hhckNvZGU6IHsKICAgICAgICAgY29tcGlsZUZyb21DaGFyQ29kZShub2RlKTsKICAgICAg ICAgYnJlYWs7CiAgICAgfQpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVj dWxhdGl2ZUpJVC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9E RkdTcGVjdWxhdGl2ZUpJVC5jcHAJKHJldmlzaW9uIDE5NDc2NikKKysrIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xODg1 LDcgKzE4ODUsNyBAQCB2b2lkIFNwZWN1bGF0aXZlSklUOjpjb21waWxlRnJvbUNoYXJDb2RlCiAg ICAgbV9qaXQubG9hZFB0cihNYWNyb0Fzc2VtYmxlcjo6QmFzZUluZGV4KHNtYWxsU3RyaW5nc1Jl ZywgcHJvcGVydHlSZWcsIE1hY3JvQXNzZW1ibGVyOjpTY2FsZVB0ciwgMCksIHNjcmF0Y2hSZWcp OwogCiAgICAgc2xvd0Nhc2VzLmFwcGVuZChtX2ppdC5icmFuY2hUZXN0MzIoTWFjcm9Bc3NlbWJs ZXI6Olplcm8sIHNjcmF0Y2hSZWcpKTsKLSAgICBhZGRTbG93UGF0aEdlbmVyYXRvcihzbG93UGF0 aENhbGwoc2xvd0Nhc2VzLCB0aGlzLCBvcGVyYXRpb25TdHJpbmdGcm9tQ2hhckNvZGUsIHNjcmF0 Y2hSZWcsIHByb3BlcnR5UmVnKSk7CisgICAgYWRkU2xvd1BhdGhHZW5lcmF0b3Ioc2xvd1BhdGhD YWxsKHNsb3dDYXNlcywgdGhpcywgb3BlcmF0aW9uU3RyaW5nRnJvbVNpbmdsZUNoYXJDb2RlLCBz Y3JhdGNoUmVnLCBwcm9wZXJ0eVJlZykpOwogICAgIGNlbGxSZXN1bHQoc2NyYXRjaFJlZywgbV9j dXJyZW50Tm9kZSk7CiB9CiAKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1N0 cmluZ0NvbnN0cnVjdG9yLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUv cnVudGltZS9TdHJpbmdDb25zdHJ1Y3Rvci5jcHAJKHJldmlzaW9uIDE5NDc2NikKKysrIFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1N0cmluZ0NvbnN0cnVjdG9yLmNwcAkod29ya2luZyBj b3B5KQpAQCAtODgsNyArODgsNyBAQCBzdGF0aWMgRW5jb2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FM TCBzdHJpCiAgICAgcmV0dXJuIEpTVmFsdWU6OmVuY29kZShzdHJpbmdGcm9tQ2hhckNvZGVTbG93 Q2FzZShleGVjKSk7CiB9CiAKLUpTQ2VsbCogSlNDX0hPU1RfQ0FMTCBzdHJpbmdGcm9tQ2hhckNv ZGUoRXhlY1N0YXRlKiBleGVjLCBpbnQzMl90IGFyZykKK0pTQ2VsbCogSlNDX0hPU1RfQ0FMTCBz dHJpbmdGcm9tU2luZ2xlQ2hhckNvZGUoRXhlY1N0YXRlKiBleGVjLCBpbnQzMl90IGFyZykKIHsK ICAgICByZXR1cm4ganNTaW5nbGVDaGFyYWN0ZXJTdHJpbmcoZXhlYywgYXJnKTsKIH0KSW5kZXg6 IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1N0cmluZ0NvbnN0cnVjdG9yLmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvU3RyaW5nQ29uc3RydWN0b3Iu aAkocmV2aXNpb24gMTk0NzY2KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvU3Ry aW5nQ29uc3RydWN0b3IuaAkod29ya2luZyBjb3B5KQpAQCAtNTUsNyArNTUsNyBAQCBwcml2YXRl OgogICAgIHN0YXRpYyBib29sIGdldE93blByb3BlcnR5U2xvdChKU09iamVjdCosIEV4ZWNTdGF0 ZSosIFByb3BlcnR5TmFtZSwgUHJvcGVydHlTbG90Jik7CiB9OwogCi1KU0NlbGwqIEpTQ19IT1NU X0NBTEwgc3RyaW5nRnJvbUNoYXJDb2RlKEV4ZWNTdGF0ZSosIGludDMyX3QpOworSlNDZWxsKiBK U0NfSE9TVF9DQUxMIHN0cmluZ0Zyb21TaW5nbGVDaGFyQ29kZShFeGVjU3RhdGUqLCBpbnQzMl90 KTsKIEpTQ2VsbCogc3RyaW5nQ29uc3RydWN0b3IoRXhlY1N0YXRlKiwgSlNWYWx1ZSk7CiAKIH0g Ly8gbmFtZXNwYWNlIEpTQwo=