125485 2013-12-09 23:00:51 -0800 CStack Branch: ctiNativeCallFallback and friends should renamed ...NativeTailCall 2014-01-13 18:46:00 -0800 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 msaboff msaboff mark.lam oldest_to_newest 958220 0 msaboff 2013-12-09 23:00:51 -0800 To better describe what is happening, ctiNativeCallFallback should be renamed ctiNativeTailCall and nativeCallFallbackGenerator should be renamed nativeTailCallGenerator. 958224 1 218838 msaboff 2013-12-09 23:17:10 -0800 Created attachment 218838 Patch Patch landed in change set r160268 <http://trac.webkit.org/changeset/160351>. 958383 2 218838 ggaren 2013-12-10 08:53:07 -0800 Comment on attachment 218838 Patch r=me 967611 3 mark.lam 2014-01-13 18:46:00 -0800 Review status updated in r161938: <http://trac.webkit.org/r161938>. 218838 2013-12-09 23:17:10 -0800 2013-12-10 08:53:07 -0800 Patch 125485.patch text/plain 9962 msaboff SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTYwMzUwKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMzIEBA CisyMDEzLTEyLTA5ICBNaWNoYWVsIFNhYm9mZiAgPG1zYWJvZmZAYXBwbGUuY29tPgorCisgICAg ICAgIENTdGFjayBCcmFuY2g6IGN0aU5hdGl2ZUNhbGxGYWxsYmFjayBhbmQgZnJpZW5kcyBzaG91 bGQgcmVuYW1lZCAuLi5OYXRpdmVUYWlsQ2FsbAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI1NDg1CisKKyAgICAgICAgTm90IHlldCByZXZpZXdlZC4K KworICAgICAgICBDaGFuZ2VkIGN0aU5hdGl2ZUNhbGxGYWxsYmFjayB0byBjdGlOYXRpdmVUYWls Q2FsbCBhbmQgbmF0aXZlQ2FsbEZhbGxiYWNrR2VuZXJhdG9yCisgICAgICAgIHRvIG5hdGl2ZVRh aWxDYWxsR2VuZXJhdG9yIHRvIGJlIG1vcmUgZGVzY3JpcHRpdmUgb2Ygd2hhdCBpcyBoYXBwZW5p bmcuCisKKyAgICAgICAgKiBqaXQvSklUVGh1bmtzLmNwcDoKKyAgICAgICAgKEpTQzo6SklUVGh1 bmtzOjpjdGlOYXRpdmVUYWlsQ2FsbCk6CisgICAgICAgICogaml0L0pJVFRodW5rcy5oOgorICAg ICAgICAqIGppdC9UaHVua0dlbmVyYXRvcnMuY3BwOgorICAgICAgICAoSlNDOjpuYXRpdmVUYWls Q2FsbEdlbmVyYXRvcik6CisgICAgICAgIChKU0M6OmNoYXJDb2RlQXRUaHVua0dlbmVyYXRvcik6 CisgICAgICAgIChKU0M6OmNoYXJBdFRodW5rR2VuZXJhdG9yKToKKyAgICAgICAgKEpTQzo6ZnJv bUNoYXJDb2RlVGh1bmtHZW5lcmF0b3IpOgorICAgICAgICAoSlNDOjpzcXJ0VGh1bmtHZW5lcmF0 b3IpOgorICAgICAgICAoSlNDOjpmbG9vclRodW5rR2VuZXJhdG9yKToKKyAgICAgICAgKEpTQzo6 Y2VpbFRodW5rR2VuZXJhdG9yKToKKyAgICAgICAgKEpTQzo6cm91bmRUaHVua0dlbmVyYXRvcik6 CisgICAgICAgIChKU0M6OmV4cFRodW5rR2VuZXJhdG9yKToKKyAgICAgICAgKEpTQzo6bG9nVGh1 bmtHZW5lcmF0b3IpOgorICAgICAgICAoSlNDOjphYnNUaHVua0dlbmVyYXRvcik6CisgICAgICAg IChKU0M6OnBvd1RodW5rR2VuZXJhdG9yKToKKyAgICAgICAgKEpTQzo6aW11bFRodW5rR2VuZXJh dG9yKToKKyAgICAgICAgKEpTQzo6YXJyYXlJdGVyYXRvck5leHRUaHVua0dlbmVyYXRvcik6Cisg ICAgICAgICogaml0L1RodW5rR2VuZXJhdG9ycy5oOgorCiAyMDEzLTEyLTA5ICBNaWNoYWVsIFNh Ym9mZiAgPG1zYWJvZmZAYXBwbGUuY29tPgogCiAgICAgICAgIENTdGFjayBCcmFuY2g6IENoYW5n ZSBuYXRpdmVGb3JHZW5lcmF0b3IgZmFsbEJhY2sgYm9vbCB0byBhbiBlbnVtCkluZGV4OiBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVFRodW5rcy5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L0phdmFTY3JpcHRDb3JlL2ppdC9KSVRUaHVua3MuY3BwCShyZXZpc2lvbiAxNjAzNDQpCisrKyBT b3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVFRodW5rcy5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTYyLDEwICs2MiwxMCBAQCBNYWNyb0Fzc2VtYmxlckNvZGVQdHIgSklUVGh1bmtzOjpjdGlOYXRp CiAgICAgcmV0dXJuIGN0aVN0dWIodm0sIG5hdGl2ZUNvbnN0cnVjdEdlbmVyYXRvcikuY29kZSgp OwogfQogCi1NYWNyb0Fzc2VtYmxlckNvZGVQdHIgSklUVGh1bmtzOjpjdGlOYXRpdmVDYWxsRmFs bGJhY2soVk0qIHZtKQorTWFjcm9Bc3NlbWJsZXJDb2RlUHRyIEpJVFRodW5rczo6Y3RpTmF0aXZl VGFpbENhbGwoVk0qIHZtKQogewogICAgIEFTU0VSVCh2bS0+Y2FuVXNlSklUKCkpOwotICAgIHJl dHVybiBjdGlTdHViKHZtLCBuYXRpdmVDYWxsRmFsbGJhY2tHZW5lcmF0b3IpLmNvZGUoKTsKKyAg ICByZXR1cm4gY3RpU3R1Yih2bSwgbmF0aXZlVGFpbENhbGxHZW5lcmF0b3IpLmNvZGUoKTsKIH0K IAogTWFjcm9Bc3NlbWJsZXJDb2RlUmVmIEpJVFRodW5rczo6Y3RpU3R1YihWTSogdm0sIFRodW5r R2VuZXJhdG9yIGdlbmVyYXRvcikKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklU VGh1bmtzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRUaHVu a3MuaAkocmV2aXNpb24gMTYwMzQ0KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRU aHVua3MuaAkod29ya2luZyBjb3B5KQpAQCAtNTQsNyArNTQsNyBAQCBwdWJsaWM6CiAKICAgICBN YWNyb0Fzc2VtYmxlckNvZGVQdHIgY3RpTmF0aXZlQ2FsbChWTSopOwogICAgIE1hY3JvQXNzZW1i bGVyQ29kZVB0ciBjdGlOYXRpdmVDb25zdHJ1Y3QoVk0qKTsKLSAgICBNYWNyb0Fzc2VtYmxlckNv ZGVQdHIgY3RpTmF0aXZlQ2FsbEZhbGxiYWNrKFZNKik7ICAgIAorICAgIE1hY3JvQXNzZW1ibGVy Q29kZVB0ciBjdGlOYXRpdmVUYWlsQ2FsbChWTSopOyAgICAKIAogICAgIE1hY3JvQXNzZW1ibGVy Q29kZVJlZiBjdGlTdHViKFZNKiwgVGh1bmtHZW5lcmF0b3IpOwogCkluZGV4OiBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvaml0L1RodW5rR2VuZXJhdG9ycy5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L0phdmFTY3JpcHRDb3JlL2ppdC9UaHVua0dlbmVyYXRvcnMuY3BwCShyZXZpc2lvbiAxNjAzNDQp CisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L1RodW5rR2VuZXJhdG9ycy5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTQxNiw3ICs0MTYsNyBAQCBNYWNyb0Fzc2VtYmxlckNvZGVSZWYgbmF0aXZl Q2FsbEdlbmVyYXRvCiAgICAgcmV0dXJuIG5hdGl2ZUZvckdlbmVyYXRvcih2bSwgQ29kZUZvckNh bGwpOwogfQogCi1NYWNyb0Fzc2VtYmxlckNvZGVSZWYgbmF0aXZlQ2FsbEZhbGxiYWNrR2VuZXJh dG9yKFZNKiB2bSkKK01hY3JvQXNzZW1ibGVyQ29kZVJlZiBuYXRpdmVUYWlsQ2FsbEdlbmVyYXRv cihWTSogdm0pCiB7CiAgICAgcmV0dXJuIG5hdGl2ZUZvckdlbmVyYXRvcih2bSwgQ29kZUZvckNh bGwsIEVudGVyVmlhSnVtcCk7CiB9CkBAIC01NTAsNyArNTUwLDcgQEAgTWFjcm9Bc3NlbWJsZXJD b2RlUmVmIGNoYXJDb2RlQXRUaHVua0dlbgogICAgIFNwZWNpYWxpemVkVGh1bmtKSVQgaml0KHZt LCAxKTsKICAgICBzdHJpbmdDaGFyTG9hZChqaXQsIHZtKTsKICAgICBqaXQucmV0dXJuSW50MzIo U3BlY2lhbGl6ZWRUaHVua0pJVDo6cmVnVDApOwotICAgIHJldHVybiBqaXQuZmluYWxpemUodm0t PmppdFN0dWJzLT5jdGlOYXRpdmVDYWxsRmFsbGJhY2sodm0pLCAiY2hhckNvZGVBdCIpOworICAg IHJldHVybiBqaXQuZmluYWxpemUodm0tPmppdFN0dWJzLT5jdGlOYXRpdmVUYWlsQ2FsbCh2bSks ICJjaGFyQ29kZUF0Iik7CiB9CiAKIE1hY3JvQXNzZW1ibGVyQ29kZVJlZiBjaGFyQXRUaHVua0dl bmVyYXRvcihWTSogdm0pCkBAIC01NTksNyArNTU5LDcgQEAgTWFjcm9Bc3NlbWJsZXJDb2RlUmVm IGNoYXJBdFRodW5rR2VuZXJhdAogICAgIHN0cmluZ0NoYXJMb2FkKGppdCwgdm0pOwogICAgIGNo YXJUb1N0cmluZyhqaXQsIHZtLCBTcGVjaWFsaXplZFRodW5rSklUOjpyZWdUMCwgU3BlY2lhbGl6 ZWRUaHVua0pJVDo6cmVnVDAsIFNwZWNpYWxpemVkVGh1bmtKSVQ6OnJlZ1QxKTsKICAgICBqaXQu cmV0dXJuSlNDZWxsKFNwZWNpYWxpemVkVGh1bmtKSVQ6OnJlZ1QwKTsKLSAgICByZXR1cm4gaml0 LmZpbmFsaXplKHZtLT5qaXRTdHVicy0+Y3RpTmF0aXZlQ2FsbEZhbGxiYWNrKHZtKSwgImNoYXJB dCIpOworICAgIHJldHVybiBqaXQuZmluYWxpemUodm0tPmppdFN0dWJzLT5jdGlOYXRpdmVUYWls Q2FsbCh2bSksICJjaGFyQXQiKTsKIH0KIAogTWFjcm9Bc3NlbWJsZXJDb2RlUmVmIGZyb21DaGFy Q29kZVRodW5rR2VuZXJhdG9yKFZNKiB2bSkKQEAgLTU2OSw3ICs1NjksNyBAQCBNYWNyb0Fzc2Vt YmxlckNvZGVSZWYgZnJvbUNoYXJDb2RlVGh1bmtHCiAgICAgaml0LmxvYWRJbnQzMkFyZ3VtZW50 KDAsIFNwZWNpYWxpemVkVGh1bmtKSVQ6OnJlZ1QwKTsKICAgICBjaGFyVG9TdHJpbmcoaml0LCB2 bSwgU3BlY2lhbGl6ZWRUaHVua0pJVDo6cmVnVDAsIFNwZWNpYWxpemVkVGh1bmtKSVQ6OnJlZ1Qw LCBTcGVjaWFsaXplZFRodW5rSklUOjpyZWdUMSk7CiAgICAgaml0LnJldHVybkpTQ2VsbChTcGVj aWFsaXplZFRodW5rSklUOjpyZWdUMCk7Ci0gICAgcmV0dXJuIGppdC5maW5hbGl6ZSh2bS0+aml0 U3R1YnMtPmN0aU5hdGl2ZUNhbGxGYWxsYmFjayh2bSksICJmcm9tQ2hhckNvZGUiKTsKKyAgICBy ZXR1cm4gaml0LmZpbmFsaXplKHZtLT5qaXRTdHVicy0+Y3RpTmF0aXZlVGFpbENhbGwodm0pLCAi ZnJvbUNoYXJDb2RlIik7CiB9CiAKIE1hY3JvQXNzZW1ibGVyQ29kZVJlZiBzcXJ0VGh1bmtHZW5l cmF0b3IoVk0qIHZtKQpAQCAtNTgxLDcgKzU4MSw3IEBAIE1hY3JvQXNzZW1ibGVyQ29kZVJlZiBz cXJ0VGh1bmtHZW5lcmF0b3IKICAgICBqaXQubG9hZERvdWJsZUFyZ3VtZW50KDAsIFNwZWNpYWxp emVkVGh1bmtKSVQ6OmZwUmVnVDAsIFNwZWNpYWxpemVkVGh1bmtKSVQ6OnJlZ1QwKTsKICAgICBq aXQuc3FydERvdWJsZShTcGVjaWFsaXplZFRodW5rSklUOjpmcFJlZ1QwLCBTcGVjaWFsaXplZFRo dW5rSklUOjpmcFJlZ1QwKTsKICAgICBqaXQucmV0dXJuRG91YmxlKFNwZWNpYWxpemVkVGh1bmtK SVQ6OmZwUmVnVDApOwotICAgIHJldHVybiBqaXQuZmluYWxpemUodm0tPmppdFN0dWJzLT5jdGlO YXRpdmVDYWxsRmFsbGJhY2sodm0pLCAic3FydCIpOworICAgIHJldHVybiBqaXQuZmluYWxpemUo dm0tPmppdFN0dWJzLT5jdGlOYXRpdmVUYWlsQ2FsbCh2bSksICJzcXJ0Iik7CiB9CiAKIApAQCAt NzI5LDcgKzcyOSw3IEBAIE1hY3JvQXNzZW1ibGVyQ29kZVJlZiBmbG9vclRodW5rR2VuZXJhdG8K ICAgICBkb3VibGVSZXN1bHQubGluaygmaml0KTsKICAgICBqaXQucmV0dXJuRG91YmxlKFNwZWNp YWxpemVkVGh1bmtKSVQ6OmZwUmVnVDApOwogI2VuZGlmIC8vIENQVShBUk02NCkKLSAgICByZXR1 cm4gaml0LmZpbmFsaXplKHZtLT5qaXRTdHVicy0+Y3RpTmF0aXZlQ2FsbEZhbGxiYWNrKHZtKSwg ImZsb29yIik7CisgICAgcmV0dXJuIGppdC5maW5hbGl6ZSh2bS0+aml0U3R1YnMtPmN0aU5hdGl2 ZVRhaWxDYWxsKHZtKSwgImZsb29yIik7CiB9CiAKIE1hY3JvQXNzZW1ibGVyQ29kZVJlZiBjZWls VGh1bmtHZW5lcmF0b3IoVk0qIHZtKQpAQCAtNzUyLDcgKzc1Miw3IEBAIE1hY3JvQXNzZW1ibGVy Q29kZVJlZiBjZWlsVGh1bmtHZW5lcmF0b3IKICAgICBqaXQucmV0dXJuSW50MzIoU3BlY2lhbGl6 ZWRUaHVua0pJVDo6cmVnVDApOwogICAgIGRvdWJsZVJlc3VsdC5saW5rKCZqaXQpOwogICAgIGpp dC5yZXR1cm5Eb3VibGUoU3BlY2lhbGl6ZWRUaHVua0pJVDo6ZnBSZWdUMCk7Ci0gICAgcmV0dXJu IGppdC5maW5hbGl6ZSh2bS0+aml0U3R1YnMtPmN0aU5hdGl2ZUNhbGxGYWxsYmFjayh2bSksICJj ZWlsIik7CisgICAgcmV0dXJuIGppdC5maW5hbGl6ZSh2bS0+aml0U3R1YnMtPmN0aU5hdGl2ZVRh aWxDYWxsKHZtKSwgImNlaWwiKTsKIH0KIAogTWFjcm9Bc3NlbWJsZXJDb2RlUmVmIHJvdW5kVGh1 bmtHZW5lcmF0b3IoVk0qIHZtKQpAQCAtNzg2LDcgKzc4Niw3IEBAIE1hY3JvQXNzZW1ibGVyQ29k ZVJlZiByb3VuZFRodW5rR2VuZXJhdG8KICAgICBqaXQucmV0dXJuSW50MzIoU3BlY2lhbGl6ZWRU aHVua0pJVDo6cmVnVDApOwogICAgIGRvdWJsZVJlc3VsdC5saW5rKCZqaXQpOwogICAgIGppdC5y ZXR1cm5Eb3VibGUoU3BlY2lhbGl6ZWRUaHVua0pJVDo6ZnBSZWdUMCk7Ci0gICAgcmV0dXJuIGpp dC5maW5hbGl6ZSh2bS0+aml0U3R1YnMtPmN0aU5hdGl2ZUNhbGxGYWxsYmFjayh2bSksICJyb3Vu ZCIpOworICAgIHJldHVybiBqaXQuZmluYWxpemUodm0tPmppdFN0dWJzLT5jdGlOYXRpdmVUYWls Q2FsbCh2bSksICJyb3VuZCIpOwogfQogCiBNYWNyb0Fzc2VtYmxlckNvZGVSZWYgZXhwVGh1bmtH ZW5lcmF0b3IoVk0qIHZtKQpAQCAtNzk5LDcgKzc5OSw3IEBAIE1hY3JvQXNzZW1ibGVyQ29kZVJl ZiBleHBUaHVua0dlbmVyYXRvcigKICAgICBqaXQubG9hZERvdWJsZUFyZ3VtZW50KDAsIFNwZWNp YWxpemVkVGh1bmtKSVQ6OmZwUmVnVDAsIFNwZWNpYWxpemVkVGh1bmtKSVQ6OnJlZ1QwKTsKICAg ICBqaXQuY2FsbERvdWJsZVRvRG91YmxlUHJlc2VydmluZ1JldHVybihVbmFyeURvdWJsZU9wV3Jh cHBlcihleHApKTsKICAgICBqaXQucmV0dXJuRG91YmxlKFNwZWNpYWxpemVkVGh1bmtKSVQ6OmZw UmVnVDApOwotICAgIHJldHVybiBqaXQuZmluYWxpemUodm0tPmppdFN0dWJzLT5jdGlOYXRpdmVD YWxsRmFsbGJhY2sodm0pLCAiZXhwIik7CisgICAgcmV0dXJuIGppdC5maW5hbGl6ZSh2bS0+aml0 U3R1YnMtPmN0aU5hdGl2ZVRhaWxDYWxsKHZtKSwgImV4cCIpOwogfQogCiBNYWNyb0Fzc2VtYmxl ckNvZGVSZWYgbG9nVGh1bmtHZW5lcmF0b3IoVk0qIHZtKQpAQCAtODEyLDcgKzgxMiw3IEBAIE1h Y3JvQXNzZW1ibGVyQ29kZVJlZiBsb2dUaHVua0dlbmVyYXRvcigKICAgICBqaXQubG9hZERvdWJs ZUFyZ3VtZW50KDAsIFNwZWNpYWxpemVkVGh1bmtKSVQ6OmZwUmVnVDAsIFNwZWNpYWxpemVkVGh1 bmtKSVQ6OnJlZ1QwKTsKICAgICBqaXQuY2FsbERvdWJsZVRvRG91YmxlUHJlc2VydmluZ1JldHVy bihVbmFyeURvdWJsZU9wV3JhcHBlcihsb2cpKTsKICAgICBqaXQucmV0dXJuRG91YmxlKFNwZWNp YWxpemVkVGh1bmtKSVQ6OmZwUmVnVDApOwotICAgIHJldHVybiBqaXQuZmluYWxpemUodm0tPmpp dFN0dWJzLT5jdGlOYXRpdmVDYWxsRmFsbGJhY2sodm0pLCAibG9nIik7CisgICAgcmV0dXJuIGpp dC5maW5hbGl6ZSh2bS0+aml0U3R1YnMtPmN0aU5hdGl2ZVRhaWxDYWxsKHZtKSwgImxvZyIpOwog fQogCiBNYWNyb0Fzc2VtYmxlckNvZGVSZWYgYWJzVGh1bmtHZW5lcmF0b3IoVk0qIHZtKQpAQCAt ODMyLDcgKzgzMiw3IEBAIE1hY3JvQXNzZW1ibGVyQ29kZVJlZiBhYnNUaHVua0dlbmVyYXRvcigK ICAgICBqaXQubG9hZERvdWJsZUFyZ3VtZW50KDAsIFNwZWNpYWxpemVkVGh1bmtKSVQ6OmZwUmVn VDAsIFNwZWNpYWxpemVkVGh1bmtKSVQ6OnJlZ1QwKTsKICAgICBqaXQuYWJzRG91YmxlKFNwZWNp YWxpemVkVGh1bmtKSVQ6OmZwUmVnVDAsIFNwZWNpYWxpemVkVGh1bmtKSVQ6OmZwUmVnVDEpOwog ICAgIGppdC5yZXR1cm5Eb3VibGUoU3BlY2lhbGl6ZWRUaHVua0pJVDo6ZnBSZWdUMSk7Ci0gICAg cmV0dXJuIGppdC5maW5hbGl6ZSh2bS0+aml0U3R1YnMtPmN0aU5hdGl2ZUNhbGxGYWxsYmFjayh2 bSksICJhYnMiKTsKKyAgICByZXR1cm4gaml0LmZpbmFsaXplKHZtLT5qaXRTdHVicy0+Y3RpTmF0 aXZlVGFpbENhbGwodm0pLCAiYWJzIik7CiB9CiAKIE1hY3JvQXNzZW1ibGVyQ29kZVJlZiBwb3dU aHVua0dlbmVyYXRvcihWTSogdm0pCkBAIC04ODQsNyArODg0LDcgQEAgTWFjcm9Bc3NlbWJsZXJD b2RlUmVmIHBvd1RodW5rR2VuZXJhdG9yKAogICAgIH0gZWxzZQogICAgICAgICBqaXQuYXBwZW5k RmFpbHVyZShub25JbnRFeHBvbmVudCk7CiAKLSAgICByZXR1cm4gaml0LmZpbmFsaXplKHZtLT5q aXRTdHVicy0+Y3RpTmF0aXZlQ2FsbEZhbGxiYWNrKHZtKSwgInBvdyIpOworICAgIHJldHVybiBq aXQuZmluYWxpemUodm0tPmppdFN0dWJzLT5jdGlOYXRpdmVUYWlsQ2FsbCh2bSksICJwb3ciKTsK IH0KIAogTWFjcm9Bc3NlbWJsZXJDb2RlUmVmIGltdWxUaHVua0dlbmVyYXRvcihWTSogdm0pCkBA IC05MTcsNyArOTE3LDcgQEAgTWFjcm9Bc3NlbWJsZXJDb2RlUmVmIGltdWxUaHVua0dlbmVyYXRv cgogICAgIH0gZWxzZQogICAgICAgICBqaXQuYXBwZW5kRmFpbHVyZShub25JbnRBcmcxSnVtcCk7 CiAKLSAgICByZXR1cm4gaml0LmZpbmFsaXplKHZtLT5qaXRTdHVicy0+Y3RpTmF0aXZlQ2FsbEZh bGxiYWNrKHZtKSwgImltdWwiKTsKKyAgICByZXR1cm4gaml0LmZpbmFsaXplKHZtLT5qaXRTdHVi cy0+Y3RpTmF0aXZlVGFpbENhbGwodm0pLCAiaW11bCIpOwogfQogCiBzdGF0aWMgTWFjcm9Bc3Nl bWJsZXJDb2RlUmVmIGFycmF5SXRlcmF0b3JOZXh0VGh1bmtHZW5lcmF0b3IoVk0qIHZtLCBBcnJh eUl0ZXJhdGlvbktpbmQga2luZCkKQEAgLTk1Nyw3ICs5NTcsNyBAQCBzdGF0aWMgTWFjcm9Bc3Nl bWJsZXJDb2RlUmVmIGFycmF5SXRlcmF0CiAgICAgaWYgKGtpbmQgPT0gQXJyYXlJdGVyYXRlS2V5 KSB7CiAgICAgICAgIGppdC5hZGQzMihUcnVzdGVkSW1tMzIoMSksIEFkZHJlc3MoU3BlY2lhbGl6 ZWRUaHVua0pJVDo6cmVnVDQsIEpTQXJyYXlJdGVyYXRvcjo6b2Zmc2V0T2ZOZXh0SW5kZXgoKSkp OwogICAgICAgICBqaXQucmV0dXJuSW50MzIoU3BlY2lhbGl6ZWRUaHVua0pJVDo6cmVnVDEpOwot ICAgICAgICByZXR1cm4gaml0LmZpbmFsaXplKHZtLT5qaXRTdHVicy0+Y3RpTmF0aXZlQ2FsbEZh bGxiYWNrKHZtKSwgImFycmF5LWl0ZXJhdG9yLW5leHQta2V5Iik7CisgICAgICAgIHJldHVybiBq aXQuZmluYWxpemUodm0tPmppdFN0dWJzLT5jdGlOYXRpdmVUYWlsQ2FsbCh2bSksICJhcnJheS1p dGVyYXRvci1uZXh0LWtleSIpOwogICAgICAgICAKICAgICB9CiAgICAgQVNTRVJUKGtpbmQgPT0g QXJyYXlJdGVyYXRlVmFsdWUpOwpAQCAtMTAwOCw3ICsxMDA4LDcgQEAgc3RhdGljIE1hY3JvQXNz ZW1ibGVyQ29kZVJlZiBhcnJheUl0ZXJhdAogICAgIGppdC5hZGQzMihUcnVzdGVkSW1tMzIoMSks IEFkZHJlc3MoU3BlY2lhbGl6ZWRUaHVua0pJVDo6cmVnVDQsIEpTQXJyYXlJdGVyYXRvcjo6b2Zm c2V0T2ZOZXh0SW5kZXgoKSkpOwogICAgIGppdC5yZXR1cm5Eb3VibGUoU3BlY2lhbGl6ZWRUaHVu a0pJVDo6ZnBSZWdUMCk7CiAgICAgCi0gICAgcmV0dXJuIGppdC5maW5hbGl6ZSh2bS0+aml0U3R1 YnMtPmN0aU5hdGl2ZUNhbGxGYWxsYmFjayh2bSksICJhcnJheS1pdGVyYXRvci1uZXh0LXZhbHVl Iik7CisgICAgcmV0dXJuIGppdC5maW5hbGl6ZSh2bS0+aml0U3R1YnMtPmN0aU5hdGl2ZVRhaWxD YWxsKHZtKSwgImFycmF5LWl0ZXJhdG9yLW5leHQtdmFsdWUiKTsKIH0KIAogTWFjcm9Bc3NlbWJs ZXJDb2RlUmVmIGFycmF5SXRlcmF0b3JOZXh0S2V5VGh1bmtHZW5lcmF0b3IoVk0qIHZtKQpJbmRl eDogU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9UaHVua0dlbmVyYXRvcnMuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L1RodW5rR2VuZXJhdG9ycy5oCShyZXZpc2lv biAxNjAzNDQpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L1RodW5rR2VuZXJhdG9ycy5o CSh3b3JraW5nIGNvcHkpCkBAIC00Myw3ICs0Myw3IEBAIE1hY3JvQXNzZW1ibGVyQ29kZVJlZiB2 aXJ0dWFsQ29uc3RydWN0VGgKIAogTWFjcm9Bc3NlbWJsZXJDb2RlUmVmIG5hdGl2ZUNhbGxHZW5l cmF0b3IoVk0qKTsKIE1hY3JvQXNzZW1ibGVyQ29kZVJlZiBuYXRpdmVDb25zdHJ1Y3RHZW5lcmF0 b3IoVk0qKTsKLU1hY3JvQXNzZW1ibGVyQ29kZVJlZiBuYXRpdmVDYWxsRmFsbGJhY2tHZW5lcmF0 b3IoVk0qKTsKK01hY3JvQXNzZW1ibGVyQ29kZVJlZiBuYXRpdmVUYWlsQ2FsbEdlbmVyYXRvcihW TSopOwogTWFjcm9Bc3NlbWJsZXJDb2RlUmVmIGFyaXR5Rml4dXAoVk0qKTsKIAogTWFjcm9Bc3Nl bWJsZXJDb2RlUmVmIGNoYXJDb2RlQXRUaHVua0dlbmVyYXRvcihWTSopOwo=