195428 2019-03-07 13:26:49 -0800 Follow up refactoring in try-finally code after r242591. 2019-03-07 15:10:35 -0800 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 mark.lam mark.lam ews-watchlist keith_miller msaboff saam webkit-bug-importer ysuzuki oldest_to_newest 1513665 0 mark.lam 2019-03-07 13:26:49 -0800 Patch coming. 1513676 1 363920 mark.lam 2019-03-07 13:43:22 -0800 Created attachment 363920 proposed patch. 1513682 2 ews-watchlist 2019-03-07 13:46:04 -0800 Attachment 363920 did not pass style-queue: ERROR: Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp:4783: Should have only a single space after a punctuation in a comment. [whitespace/comments] [5] ERROR: Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp:4784: Should have only a single space after a punctuation in a comment. [whitespace/comments] [5] ERROR: Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp:4785: Should have only a single space after a punctuation in a comment. [whitespace/comments] [5] ERROR: Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp:4815: Should have only a single space after a punctuation in a comment. [whitespace/comments] [5] ERROR: Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp:4816: Should have only a single space after a punctuation in a comment. [whitespace/comments] [5] ERROR: Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp:4848: Should have only a single space after a punctuation in a comment. [whitespace/comments] [5] ERROR: Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp:4849: Should have only a single space after a punctuation in a comment. [whitespace/comments] [5] ERROR: Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp:4850: Should have only a single space after a punctuation in a comment. [whitespace/comments] [5] ERROR: Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp:4886: Should have only a single space after a punctuation in a comment. [whitespace/comments] [5] Total errors found: 9 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 1513684 3 363920 saam 2019-03-07 13:46:29 -0800 Comment on attachment 363920 proposed patch. View in context: https://bugs.webkit.org/attachment.cgi?id=363920&action=review > Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp:4790 > + // 10: try { > + // 11: for (... stuff ...) { > + // 12: try { > + // 13: continue; // Sets completionType to jumpID of top of the for loop. > + // 14: } finally { > + // 15: } // Jump to top of the for loop on completion. > + // 16: } > + // 15: } finally { > + // 16: } remove line numbers > Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp:4820 > + // 10: try { > + // 11: try { > + // 12: return result; // Sets completionType to Return, and completionValue to result. > + // 13: } finally { > + // 14: } // Jump to outer finally on completion. > + // 15: } finally { > + // 16: } remove line numbers > Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp:4888 > + // 10: try { > + // 11: return result; // Sets completionType to Return, and completionValue to result. > + // 12: } finally { > + // 13: } // Executes the return of the completionValue. remove line numbers. 1513707 4 363920 saam 2019-03-07 14:12:04 -0800 Comment on attachment 363920 proposed patch. View in context: https://bugs.webkit.org/attachment.cgi?id=363920&action=review > Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp:4795 > + // So, we'll set the completionType to Normal (oon behalf of the target) before we jump. oon => on 1513739 5 mark.lam 2019-03-07 15:02:15 -0800 Thanks for the review. I'm applied the fixes locally. Landed in r242614: <http://trac.webkit.org/r242614>. 1513745 6 webkit-bug-importer 2019-03-07 15:10:35 -0800 <rdar://problem/48692113> 363920 2019-03-07 13:43:22 -0800 2019-03-07 13:46:29 -0800 proposed patch. bug-195428.patch text/plain 13769 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjQyNjA2KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBA CisyMDE5LTAzLTA3ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBG b2xsb3cgdXAgcmVmYWN0b3JpbmcgaW4gdHJ5LWZpbmFsbHkgY29kZSBhZnRlciByMjQyNTkxLgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk1NDI4CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgMS4gQWRkZWQg c29tZSBjb21tZW50cyBpbiBlbWl0RmluYWxseUNvbXBsZXRpb24oKSB0byBkZXNjcmliZSBlYWNo IGNvbXBsZXRpb24gY2FzZS4KKyAgICAgICAgMi4gQ29udmVydGVkIENhdGNoRW50cnkgaW50byBh IHN0cnVjdC4KKyAgICAgICAgMy4gUmVuYW1lZCB2YXJpYWJsZSBoYXNCcmVha3NPckNvbnRpbnVl c05vdENvdmVyZWRCeUp1bXBzIHRvIGhhc0JyZWFrc09yQ29udGludWVzVGhhdEVzY2FwZUN1cnJl bnRGaW5hbGx5CisgICAgICAgICAgIHRvIGJlIG1vcmUgY2xlYXIgYWJvdXQgaXRzIHB1cnBvc2Uu CisKKyAgICAgICAgKiBieXRlY29tcGlsZXIvQnl0ZWNvZGVHZW5lcmF0b3IuY3BwOgorICAgICAg ICAoSlNDOjpCeXRlY29kZUdlbmVyYXRvcjo6Z2VuZXJhdGUpOgorICAgICAgICAoSlNDOjpCeXRl Y29kZUdlbmVyYXRvcjo6ZW1pdE91dE9mTGluZUV4Y2VwdGlvbkhhbmRsZXIpOgorICAgICAgICAo SlNDOjpCeXRlY29kZUdlbmVyYXRvcjo6ZW1pdEZpbmFsbHlDb21wbGV0aW9uKToKKyAgICAgICAg KiBieXRlY29tcGlsZXIvQnl0ZWNvZGVHZW5lcmF0b3IuaDoKKwogMjAxOS0wMy0wNyAgVGFkZXUg WmFnYWxsbyAgPHR6YWdhbGxvQGFwcGxlLmNvbT4KIAogICAgICAgICBMYXppbHkgZGVjb2RlIGNh Y2hlZCBieXRlY29kZQpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb21waWxlci9C eXRlY29kZUdlbmVyYXRvci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3Jl L2J5dGVjb21waWxlci9CeXRlY29kZUdlbmVyYXRvci5jcHAJKHJldmlzaW9uIDI0MjYwMSkKKysr IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29tcGlsZXIvQnl0ZWNvZGVHZW5lcmF0b3IuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC0yNTYsMTQgKzI1NiwxNCBAQCBQYXJzZXJFcnJvciBCeXRlY29k ZUdlbmVyYXRvcjo6Z2VuZXJhdGUoCiAgICAgICAgIGVtaXRVbnJlYWNoYWJsZSgpOwogICAgIH0K IAotICAgIGZvciAoYXV0byYgdHVwbGUgOiBtX2V4Y2VwdGlvbkhhbmRsZXJzVG9FbWl0KSB7Cisg ICAgZm9yIChhdXRvJiBoYW5kbGVyIDogbV9leGNlcHRpb25IYW5kbGVyc1RvRW1pdCkgewogICAg ICAgICBSZWY8TGFiZWw+IHJlYWxDYXRjaFRhcmdldCA9IG5ld0xhYmVsKCk7Ci0gICAgICAgIFRy eURhdGEqIHRyeURhdGEgPSBzdGQ6OmdldDwwPih0dXBsZSk7CisgICAgICAgIFRyeURhdGEqIHRy eURhdGEgPSBoYW5kbGVyLnRyeURhdGE7CiAKLSAgICAgICAgT3BDYXRjaDo6ZW1pdCh0aGlzLCBz dGQ6OmdldDwxPih0dXBsZSksIHN0ZDo6Z2V0PDI+KHR1cGxlKSk7CisgICAgICAgIE9wQ2F0Y2g6 OmVtaXQodGhpcywgaGFuZGxlci5leGNlcHRpb25SZWdpc3RlciwgaGFuZGxlci50aHJvd25WYWx1 ZVJlZ2lzdGVyKTsKICAgICAgICAgcmVhbENhdGNoVGFyZ2V0LT5zZXRMb2NhdGlvbigqdGhpcywg bV9sYXN0SW5zdHJ1Y3Rpb24ub2Zmc2V0KCkpOwotICAgICAgICBpZiAoc3RkOjpnZXQ8Mz4odHVw bGUpLmlzVmFsaWQoKSkgewotICAgICAgICAgICAgUmVnaXN0ZXJJRCBjb21wbGV0aW9uVHlwZVJl Z2lzdGVyIHsgc3RkOjpnZXQ8Mz4odHVwbGUpIH07CisgICAgICAgIGlmIChoYW5kbGVyLmNvbXBs ZXRpb25UeXBlUmVnaXN0ZXIuaXNWYWxpZCgpKSB7CisgICAgICAgICAgICBSZWdpc3RlcklEIGNv bXBsZXRpb25UeXBlUmVnaXN0ZXIgeyBoYW5kbGVyLmNvbXBsZXRpb25UeXBlUmVnaXN0ZXIgfTsK ICAgICAgICAgICAgIENvbXBsZXRpb25UeXBlIGNvbXBsZXRpb25UeXBlID0KICAgICAgICAgICAg ICAgICB0cnlEYXRhLT5oYW5kbGVyVHlwZSA9PSBIYW5kbGVyVHlwZTo6RmluYWxseSB8fCB0cnlE YXRhLT5oYW5kbGVyVHlwZSA9PSBIYW5kbGVyVHlwZTo6U3ludGhlc2l6ZWRGaW5hbGx5CiAgICAg ICAgICAgICAgICAgPyBDb21wbGV0aW9uVHlwZTo6VGhyb3cKQEAgLTM2NzYsNyArMzY3Niw3IEBA IHZvaWQgQnl0ZWNvZGVHZW5lcmF0b3I6OmVtaXRPdXRPZkxpbmVGaW4KIHZvaWQgQnl0ZWNvZGVH ZW5lcmF0b3I6OmVtaXRPdXRPZkxpbmVFeGNlcHRpb25IYW5kbGVyKFJlZ2lzdGVySUQqIGV4Y2Vw dGlvblJlZ2lzdGVyLCBSZWdpc3RlcklEKiB0aHJvd25WYWx1ZVJlZ2lzdGVyLCBSZWdpc3RlcklE KiBjb21wbGV0aW9uVHlwZVJlZ2lzdGVyLCBUcnlEYXRhKiBkYXRhKQogewogICAgIFZpcnR1YWxS ZWdpc3RlciBjb21wbGV0aW9uVHlwZVZpcnR1YWxSZWdpc3RlciA9IGNvbXBsZXRpb25UeXBlUmVn aXN0ZXIgPyBjb21wbGV0aW9uVHlwZVJlZ2lzdGVyIDogVmlydHVhbFJlZ2lzdGVyKCk7Ci0gICAg bV9leGNlcHRpb25IYW5kbGVyc1RvRW1pdC5hcHBlbmQoQ2F0Y2hFbnRyeSB7IGRhdGEsIGV4Y2Vw dGlvblJlZ2lzdGVyLCB0aHJvd25WYWx1ZVJlZ2lzdGVyLCBjb21wbGV0aW9uVHlwZVZpcnR1YWxS ZWdpc3RlciB9KTsKKyAgICBtX2V4Y2VwdGlvbkhhbmRsZXJzVG9FbWl0LmFwcGVuZCh7IGRhdGEs IGV4Y2VwdGlvblJlZ2lzdGVyLCB0aHJvd25WYWx1ZVJlZ2lzdGVyLCBjb21wbGV0aW9uVHlwZVZp cnR1YWxSZWdpc3RlciB9KTsKIH0KIAogdm9pZCBCeXRlY29kZUdlbmVyYXRvcjo6cmVzdG9yZVNj b3BlUmVnaXN0ZXIoaW50IGxleGljYWxTY29wZUluZGV4KQpAQCAtNDc3NiwxMCArNDc3NiwyNiBA QCB2b2lkIEJ5dGVjb2RlR2VuZXJhdG9yOjplbWl0RmluYWxseUNvbXBsCiAgICAgICAgICAgICBh dXRvJiBqdW1wID0gY29udGV4dC5qdW1wcyhpKTsKICAgICAgICAgICAgIGVtaXRKdW1wSWY8T3BO c3RyaWN0ZXE+KGNvbnRleHQuY29tcGxldGlvblR5cGVSZWdpc3RlcigpLCBqdW1wLmp1bXBJRCwg bmV4dExhYmVsLmdldCgpKTsKIAotICAgICAgICAgICAgLy8gQWZ0ZXIgYSBCcmVhayBvciBDb250 aW51ZSwgd2UgcmVzdW1lIGV4ZWN1dGlvbiBhbmQgbWF5IGV2ZW50dWFsbHkgY29tcGxldGUgd2l0 aAotICAgICAgICAgICAgLy8gTm9ybWFsIGNvbXBsZXRpb24gKHVubGVzcyBhYnJ1cHRseSBjb21w bGV0ZWQgYWdhaW4pLiBTbywgcHJlLWVtcHRpdmVseSBzZXQgdGhlCi0gICAgICAgICAgICAvLyBj b21wbGV0aW9uIHR5cGUgdG8gTm9ybWFsLiBXZSBjYW4gYWxzbyBzZXQgdGhlIGNvbXBsZXRpb24g dmFsdWUgdG8gdW5kZWZpbmVkLAotICAgICAgICAgICAgLy8gYnV0IGl0IHdpbGwgbmV2ZXIgYmUg dXNlZCBmb3Igbm9ybWFsIGNvbXBsZXRpb24gYW55d2F5LiBTbywgd2UnbGwgc2tpcCBzZXR0aW5n IGl0LgorICAgICAgICAgICAgLy8gVGhpcyBjYXNlIGlzIGZvciBCcmVhayAvIENvbnRpbnVlIGNv bXBsZXRpb25zIGZyb20gYW4gaW5uZXIgZmluYWxseSBjb250ZXh0CisgICAgICAgICAgICAvLyB3 aXRoIGEganVtcCB0YXJnZXQgdGhhdCBpcyBub3QgYmV5b25kIHRoZSBuZXh0IG91dGVyIGZpbmFs bHkgY29udGV4dDoKKyAgICAgICAgICAgIC8vCisgICAgICAgICAgICAvLyAxMDogdHJ5IHsKKyAg ICAgICAgICAgIC8vIDExOiAgICAgZm9yICguLi4gc3R1ZmYgLi4uKSB7CisgICAgICAgICAgICAv LyAxMjogICAgICAgICB0cnkgeworICAgICAgICAgICAgLy8gMTM6ICAgICAgICAgICAgIGNvbnRp bnVlOyAvLyBTZXRzIGNvbXBsZXRpb25UeXBlIHRvIGp1bXBJRCBvZiB0b3Agb2YgdGhlIGZvciBs b29wLgorICAgICAgICAgICAgLy8gMTQ6ICAgICAgICAgfSBmaW5hbGx5IHsKKyAgICAgICAgICAg IC8vIDE1OiAgICAgICAgIH0gLy8gSnVtcCB0byB0b3Agb2YgdGhlIGZvciBsb29wIG9uIGNvbXBs ZXRpb24uCisgICAgICAgICAgICAvLyAxNjogICAgIH0KKyAgICAgICAgICAgIC8vIDE1OiB9IGZp bmFsbHkgeworICAgICAgICAgICAgLy8gMTY6IH0KKyAgICAgICAgICAgIC8vCisgICAgICAgICAg ICAvLyBTaW5jZSB0aGUganVtcElEIGlzIHRhcmdldHRpbmcgYSBsYWJlbCB0aGF0IGlzIGluc2lk ZSB0aGUgb3V0ZXIgZmluYWxseSBjb250ZXh0LAorICAgICAgICAgICAgLy8gd2UgY2FuIGp1bXAg dG8gaXQgZGlyZWN0bHkgb24gY29tcGxldGlvbiBvZiB0aGlzIGZpbmFsbHkgY29udGV4dDogdGhl cmUgaXMgbm8gaW50ZXJtZWRpYXRlCisgICAgICAgICAgICAvLyBmaW5hbGx5IGJsb2NrcyB0byBy dW4uIEFmdGVyIHRoZSBCcmVhayAvIENvbnRpbnVlLCB3ZSB3aWxsIGNvbnRudWUgZXhlY3V0aW9u IGFzIG5vcm1hbC4KKyAgICAgICAgICAgIC8vIFNvLCB3ZSdsbCBzZXQgdGhlIGNvbXBsZXRpb25U eXBlIHRvIE5vcm1hbCAob29uIGJlaGFsZiBvZiB0aGUgdGFyZ2V0KSBiZWZvcmUgd2UganVtcC4K KyAgICAgICAgICAgIC8vIFdlIGNhbiBhbHNvIHNldCB0aGUgY29tcGxldGlvbiB2YWx1ZSB0byB1 bmRlZmluZWQsIGJ1dCBpdCB3aWxsIG5ldmVyIGJlIHVzZWQgZm9yIG5vcm1hbAorICAgICAgICAg ICAgLy8gY29tcGxldGlvbiBhbnl3YXkuIFNvLCB3ZSdsbCBza2lwIHNldHRpbmcgaXQuCisKICAg ICAgICAgICAgIHJlc3RvcmVTY29wZVJlZ2lzdGVyKGp1bXAudGFyZ2V0TGV4aWNhbFNjb3BlSW5k ZXgpOwogICAgICAgICAgICAgZW1pdExvYWQoY29udGV4dC5jb21wbGV0aW9uVHlwZVJlZ2lzdGVy KCksIENvbXBsZXRpb25UeXBlOjpOb3JtYWwpOwogICAgICAgICAgICAgZW1pdEp1bXAoanVtcC50 YXJnZXRMYWJlbC5nZXQoKSk7CkBAIC00NzkzLDkgKzQ4MDksMjIgQEAgdm9pZCBCeXRlY29kZUdl bmVyYXRvcjo6ZW1pdEZpbmFsbHlDb21wbAogICAgICAgICAgICAgICAgIFJlZjxMYWJlbD4gaXNO b3RSZXR1cm5MYWJlbCA9IG5ld0xhYmVsKCk7CiAgICAgICAgICAgICAgICAgZW1pdEp1bXBJZjxP cE5zdHJpY3RlcT4oY29udGV4dC5jb21wbGV0aW9uVHlwZVJlZ2lzdGVyKCksIENvbXBsZXRpb25U eXBlOjpSZXR1cm4sIGlzTm90UmV0dXJuTGFiZWwuZ2V0KCkpOwogCi0gICAgICAgICAgICAgICAg Ly8gRm9yIFJldHVybiBjb21wbGV0aW9uLCB3ZSBuZWVkIHRvIHBhc3MgdGhlIGNvbXBsZXRpb24g dHlwZSBhbmQgdmFsdWUgdG8KLSAgICAgICAgICAgICAgICAvLyB0aGUgb3V0ZXIgZmluYWxseSBz byB0aGF0IGl0IGNhbiByZXR1cm4gd2hlbiBpdCdzIGRvbmUgKHVubGVzcyBpbnRlcnJ1cHRlZAot ICAgICAgICAgICAgICAgIC8vIGJ5IGFub3RoZXIgYWJydXB0IGNvbXBsZXRpb24pLgorICAgICAg ICAgICAgICAgIC8vIFRoaXMgY2FzZSBpcyBmb3IgUmV0dXJuIGNvbXBsZXRpb24gZnJvbSBhbiBp bm5lciBmaW5hbGx5IGNvbnRleHQ6CisgICAgICAgICAgICAgICAgLy8KKyAgICAgICAgICAgICAg ICAvLyAxMDogdHJ5IHsKKyAgICAgICAgICAgICAgICAvLyAxMTogICAgIHRyeSB7CisgICAgICAg ICAgICAgICAgLy8gMTI6ICAgICAgICAgcmV0dXJuIHJlc3VsdDsgLy8gU2V0cyBjb21wbGV0aW9u VHlwZSB0byBSZXR1cm4sIGFuZCBjb21wbGV0aW9uVmFsdWUgdG8gcmVzdWx0LgorICAgICAgICAg ICAgICAgIC8vIDEzOiAgICAgfSBmaW5hbGx5IHsKKyAgICAgICAgICAgICAgICAvLyAxNDogICAg IH0gLy8gSnVtcCB0byBvdXRlciBmaW5hbGx5IG9uIGNvbXBsZXRpb24uCisgICAgICAgICAgICAg ICAgLy8gMTU6IH0gZmluYWxseSB7CisgICAgICAgICAgICAgICAgLy8gMTY6IH0KKyAgICAgICAg ICAgICAgICAvLworICAgICAgICAgICAgICAgIC8vIFNpbmNlIHdlIGtub3cgdGhlcmUncyBhdCBs ZWFzdCBvbmUgb3V0ZXIgZmluYWxseSBjb250ZXh0IChiZXlvbmQgdGhlIGN1cnJlbnQgY29udGV4 dCksCisgICAgICAgICAgICAgICAgLy8gd2UgY2Fubm90IGFjdHVhbGx5IHJldHVybiBmcm9tIGhl cmUuIEluc3RlYWQsIHdlIHBhc3MgdGhlIGNvbXBsZXRpb25UeXBlIGFuZCBjb21wbGV0aW9uVmFs dWUKKyAgICAgICAgICAgICAgICAvLyBvbiB0byB0aGUgbmV4dCBvdXRlciBmaW5hbGx5LCBhbmQg bGV0IGl0IGRlY2lkZSB3aGF0IHRvIGRvIG5leHQgb24gaXRzIGNvbXBsZXRpb24uIFRoZQorICAg ICAgICAgICAgICAgIC8vIG91dGVyIGZpbmFsbHkgbWF5IG9yIG1heSBub3QgYWN0dWFsIHJldHVy biBkZXBlbmRpbmcgb24gd2hldGhlciBpdCBlbmNvdW50ZXJzIGFuIGFicnVwdAorICAgICAgICAg ICAgICAgIC8vIGNvbXBsZXRpb24gaW4gaXRzIGJvZHkgdGhhdCBvdmVycnJpZGVzIHRoaXMgUmV0 dXJuIGNvbXBsZXRpb24uCisKICAgICAgICAgICAgICAgICBtb3ZlKG91dGVyQ29udGV4dC0+Y29t cGxldGlvblR5cGVSZWdpc3RlcigpLCBjb250ZXh0LmNvbXBsZXRpb25UeXBlUmVnaXN0ZXIoKSk7 CiAgICAgICAgICAgICAgICAgbW92ZShvdXRlckNvbnRleHQtPmNvbXBsZXRpb25WYWx1ZVJlZ2lz dGVyKCksIGNvbnRleHQuY29tcGxldGlvblZhbHVlUmVnaXN0ZXIoKSk7CiAgICAgICAgICAgICAg ICAgZW1pdEp1bXAoKm91dGVyQ29udGV4dC0+ZmluYWxseUxhYmVsKCkpOwpAQCAtNDgwMywxOCAr NDgzMiw0MiBAQCB2b2lkIEJ5dGVjb2RlR2VuZXJhdG9yOjplbWl0RmluYWxseUNvbXBsCiAgICAg ICAgICAgICAgICAgZW1pdExhYmVsKGlzTm90UmV0dXJuTGFiZWwuZ2V0KCkpOwogICAgICAgICAg ICAgfQogCi0gICAgICAgICAgICBib29sIGhhc0JyZWFrc09yQ29udGludWVzTm90Q292ZXJlZEJ5 SnVtcHMgPSBjb250ZXh0Lm51bWJlck9mQnJlYWtzT3JDb250aW51ZXMoKSA+IG51bWJlck9mSnVt cHM7Ci0gICAgICAgICAgICBpZiAoaGFzQnJlYWtzT3JDb250aW51ZXNOb3RDb3ZlcmVkQnlKdW1w cykgeworICAgICAgICAgICAgYm9vbCBoYXNCcmVha3NPckNvbnRpbnVlc1RoYXRFc2NhcGVDdXJy ZW50RmluYWxseSA9IGNvbnRleHQubnVtYmVyT2ZCcmVha3NPckNvbnRpbnVlcygpID4gbnVtYmVy T2ZKdW1wczsKKyAgICAgICAgICAgIGlmIChoYXNCcmVha3NPckNvbnRpbnVlc1RoYXRFc2NhcGVD dXJyZW50RmluYWxseSkgewogICAgICAgICAgICAgICAgIFJlZjxMYWJlbD4gaXNUaHJvd09yTm9y bWFsTGFiZWwgPSBuZXdMYWJlbCgpOwogICAgICAgICAgICAgICAgIGVtaXRKdW1wSWY8T3BCZWxv d2VxPihjb250ZXh0LmNvbXBsZXRpb25UeXBlUmVnaXN0ZXIoKSwgQ29tcGxldGlvblR5cGU6OlRo cm93LCBpc1Rocm93T3JOb3JtYWxMYWJlbC5nZXQoKSk7CisKKyAgICAgICAgICAgICAgICAvLyBB IGNvbXBsZXRpb25UeXBlIGFib3ZlIFRocm93IG1lYW5zIHdlIGhhdmUgYSBCcmVhayBvciBDb250 aW51ZSBlbmNvZGVkIGFzIGEganVtcElELgorICAgICAgICAgICAgICAgIC8vIFdlIGFscmVhZHkg cnVsZWQgb3V0IFJldHVybiBhYm92ZS4KICAgICAgICAgICAgICAgICBzdGF0aWNfYXNzZXJ0KENv bXBsZXRpb25UeXBlOjpUaHJvdyA8IENvbXBsZXRpb25UeXBlOjpSZXR1cm4gJiYgQ29tcGxldGlv blR5cGU6OlRocm93IDwgQ29tcGxldGlvblR5cGU6OlJldHVybiwgImp1bXBJRHMgYXJlIGFib3Zl IENvbXBsZXRpb25UeXBlOjpSZXR1cm4iKTsKIAotICAgICAgICAgICAgICAgIC8vIE5vdCBUaHJv dyBtZWFucyB3ZSBoYXZlIGEgQnJlYWsgb3IgQ29udGludWUgdGhhdCBzaG91bGQgYmUgaGFuZGxl ZCBieSB0aGUgb3V0ZXIgY29udGV4dC4KLSAgICAgICAgICAgICAgICAvLyBUaGVzZSBhcmUgZm9y IEJyZWFrIG9yIENvbnRpbnVlIGNvbXBsZXRpb25zIHRoYXQgaGF2ZSBub3QgcmVhY2hlZCB0aGVp ciBqdW1wIHRhcmdldHMKLSAgICAgICAgICAgICAgICAvLyB5ZXQuIFRoZSBvdXRlciBjb250ZXh0 IG5lZWRzIHRvIHJ1biBpdHMgZmluYWxseSwgYW5kIHJlc3VtZSB0aGUganVtcCBvdXR3YXJkcyAo dW5sZXNzCi0gICAgICAgICAgICAgICAgLy8gaW50ZXJydXB0ZWQgYnkgYW5vdGhlciBhYnJ1cHQg Y29tcGxldGlvbikuIFNvLCB3ZSBuZWVkIHRvIHBhc3MgdGhlIGNvbXBsZXRpb24gdHlwZSB0bwot ICAgICAgICAgICAgICAgIC8vIHRoZSBvdXRlciBmaW5hbGx5LiBBZ2Fpbiwgd2UgY2FuIHNraXAg dGhlIGNvbXBsZXRpb24gdmFsdWUgYmVjYXVzZSBpdCdzIG5vdCB1c2VkIGZvcgotICAgICAgICAg ICAgICAgIC8vIEJyZWFrIG5vciBDb250aW51ZS4KKyAgICAgICAgICAgICAgICAvLyBUaGlzIGNh c2UgaXMgZm9yIEJyZWFrIC8gQ29udGludWUgY29tcGxldGlvbnMgaW4gYW4gaW5uZXIgZmluYWxs eSBjb250ZXh0OgorICAgICAgICAgICAgICAgIC8vCisgICAgICAgICAgICAgICAgLy8gMTA6IGxh YmVsOgorICAgICAgICAgICAgICAgIC8vIDExOiB0cnkgeworICAgICAgICAgICAgICAgIC8vIDEy OiAgICAgdHJ5IHsKKyAgICAgICAgICAgICAgICAvLyAxMzogICAgICAgICBmb3IgKC4uLiBzdHVm ZiAuLi4pCisgICAgICAgICAgICAgICAgLy8gMTQ6ICAgICAgICAgICAgIGJyZWFrIGxhYmVsOyAv LyBTZXRzIGNvbXBsZXRpb25UeXBlIHRvIGp1bXBJRCBvZiBsYWJlbC4KKyAgICAgICAgICAgICAg ICAvLyAxNTogICAgIH0gZmluYWxseSB7CisgICAgICAgICAgICAgICAgLy8gMTY6ICAgICB9IC8v IEp1bXBzIHRvIG91dGVyIGZpbmFsbHkgb24gY29tcGxldGlvbi4KKyAgICAgICAgICAgICAgICAv LyAxNzogIH0gZmluYWxseSB7CisgICAgICAgICAgICAgICAgLy8gMTg6ICB9CisgICAgICAgICAg ICAgICAgLy8KKyAgICAgICAgICAgICAgICAvLyBUaGUgYnJlYWsgKGxpbmUgMTQpIHNheXMgdG8g Y29udGludWUgZXhlY3V0aW9uIGF0IHRoZSBsYWJlbCBhdCBsaW5lIDEwLiBCZWZvcmUgd2UgY2Fu CisgICAgICAgICAgICAgICAgLy8gZ290byBsaW5lIDEwLCB0aGUgaW5uZXIgY29udGV4dCdzIGZp bmFsbHkgKGxpbmUgMTUpIG5lZWRzIHRvIGJlIHJ1biwgZm9sbG93ZWQgYnkgdGhlCisgICAgICAg ICAgICAgICAgLy8gb3V0ZXIgY29udGV4dCdzIGZpbmFsbHkgKGxpbmUgMTcpLiAnb3V0ZXJDb250 ZXh0JyBiZWluZyBub24tbnVsbCBhYm92ZSB0ZWxscyB1cyB0aGF0CisgICAgICAgICAgICAgICAg Ly8gdGhlcmUgaXMgYXQgbGVhc3Qgb25lIG91dGVyIGZpbmFsbHkgY29udGV4dCB0aGF0IHdlIG5l ZWQgdG8gcnVuIGFmdGVyIHdlIGNvbXBsZXRlIHRoZQorICAgICAgICAgICAgICAgIC8vIGN1cnJl bnQgZmluYWxseS4gTm90ZSB0aGF0IHVubGVzcyB0aGUgYm9keSBvZiB0aGUgb3V0ZXIgZmluYWxs eSBhYnJ1cHRseSBjb21wbGV0ZXMgaW4gYQorICAgICAgICAgICAgICAgIC8vIGRpZmZlcmVudCB3 YXksIHRoYXQgb3V0ZXIgZmluYWxseSBhbHNvIG5lZWRzIHRvIGNvbXBsZXRlIHdpdGggYSBCcmVh ayAvIENvbnRpbnVlIHRvCisgICAgICAgICAgICAgICAgLy8gdGhlIHNhbWUgdGFyZ2V0IGxhYmVs LiBIZW5jZSwgd2UgbmVlZCB0byBwYXNzIHRoZSBqdW1wSUQgaW4gdGhpcyBmaW5hbGx5J3MgY29t cGxldGlvblR5cGVSZWdpc3RlcgorICAgICAgICAgICAgICAgIC8vIHRvIHRoZSBvdXRlciBmaW5h bGx5LiBUaGUgY29tcGxldGlvbiB2YWx1ZSBmb3IgQnJlYWsgYW5kIENvbnRpbnVlIGFjY29yZGlu ZyB0byB0aGUgc3BlYworICAgICAgICAgICAgICAgIC8vIGlzIHVuZGVmaW5lZCwgYnV0IGl0IHdv bid0IGV2ZXIgYmUgdXNlZC4gU28sIHdlJ2xsIHNraXAgc2V0dGluZyBpdC4KKyAgICAgICAgICAg ICAgICAvLworICAgICAgICAgICAgICAgIC8vIE5vdGUgdGhhdCBhbGwgd2UncmUgZG9pbmcgaGVy ZSBpcyBwYXNzaW5nIHRoZSBCcmVhayAvIENvbnRpbnVlIGNvbXBsZXRpb24gdG8gdGhlIG5leHQK KyAgICAgICAgICAgICAgICAvLyBvdXRlciBmaW5hbGx5IGNvbnRleHQuIFdlIGRvbid0IHdvcnJ5 IGFib3V0IGZpbmFsbHkgY29udGV4dHMgYmV5b25kIHRoYXQuIEl0IGlzIHRoZQorICAgICAgICAg ICAgICAgIC8vIHJlc3BvbnNpYmlsaXR5IG9mIHRoZSBuZXh0IG91dGVyIGZpbmFsbHkgdG8gZGV0 ZXJtaW5lIHdoYXQgdG8gZG8gbmV4dCBhdCBpdHMgY29tcGxldGlvbiwKKyAgICAgICAgICAgICAg ICAvLyBhbmQgcGFzcyBvbiB0byB0aGUgbmV4dCBvdXRlciBjb250ZXh0IGlmIHByZXNlbnQgYW5k IG5lZWRlZC4KKwogICAgICAgICAgICAgICAgIG1vdmUob3V0ZXJDb250ZXh0LT5jb21wbGV0aW9u VHlwZVJlZ2lzdGVyKCksIGNvbnRleHQuY29tcGxldGlvblR5cGVSZWdpc3RlcigpKTsKICAgICAg ICAgICAgICAgICBlbWl0SnVtcCgqb3V0ZXJDb250ZXh0LT5maW5hbGx5TGFiZWwoKSk7CiAKQEAg LTQ4MjcsNiArNDg4MCwxNyBAQCB2b2lkIEJ5dGVjb2RlR2VuZXJhdG9yOjplbWl0RmluYWxseUNv bXBsCiAgICAgICAgICAgICAgICAgUmVmPExhYmVsPiBub3RSZXR1cm5MYWJlbCA9IG5ld0xhYmVs KCk7CiAgICAgICAgICAgICAgICAgZW1pdEp1bXBJZjxPcE5zdHJpY3RlcT4oY29udGV4dC5jb21w bGV0aW9uVHlwZVJlZ2lzdGVyKCksIENvbXBsZXRpb25UeXBlOjpSZXR1cm4sIG5vdFJldHVybkxh YmVsLmdldCgpKTsKIAorICAgICAgICAgICAgICAgIC8vIFRoaXMgY2FzZSBpcyBmb3IgUmV0dXJu IGNvbXBsZXRpb24gZnJvbSB0aGUgb3V0ZXJtb3N0IGZpbmFsbHkgY29udGV4dDoKKyAgICAgICAg ICAgICAgICAvLworICAgICAgICAgICAgICAgIC8vIDEwOiB0cnkgeworICAgICAgICAgICAgICAg IC8vIDExOiAgICAgcmV0dXJuIHJlc3VsdDsgLy8gU2V0cyBjb21wbGV0aW9uVHlwZSB0byBSZXR1 cm4sIGFuZCBjb21wbGV0aW9uVmFsdWUgdG8gcmVzdWx0LgorICAgICAgICAgICAgICAgIC8vIDEy OiB9IGZpbmFsbHkgeworICAgICAgICAgICAgICAgIC8vIDEzOiB9IC8vIEV4ZWN1dGVzIHRoZSBy ZXR1cm4gb2YgdGhlIGNvbXBsZXRpb25WYWx1ZS4KKyAgICAgICAgICAgICAgICAvLworICAgICAg ICAgICAgICAgIC8vIFNpbmNlIHdlIGtub3cgdGhlcmUncyBubyBvdXRlciBmaW5hbGx5IGNvbnRl eHQgKGJleW9uZCB0aGUgY3VycmVudCBjb250ZXh0KSB0byBydW4sCisgICAgICAgICAgICAgICAg Ly8gd2UgY2FuIGFjdHVhbGx5IGV4ZWN1dGUgYSByZXR1cm4gZm9yIHRoaXMgUmV0dXJuIGNvbXBs ZXRpb24uIFRoZSB2YWx1ZSB0byByZXR1cm4KKyAgICAgICAgICAgICAgICAvLyBpcyB3aGF0ZXZl ciBpcyBpbiB0aGUgY29tcGxldGlvblZhbHVlUmVnaXN0ZXIuCisKICAgICAgICAgICAgICAgICBl bWl0V2lsbExlYXZlQ2FsbEZyYW1lRGVidWdIb29rKCk7CiAgICAgICAgICAgICAgICAgZW1pdFJl dHVybihjb250ZXh0LmNvbXBsZXRpb25WYWx1ZVJlZ2lzdGVyKCksIFJldHVybkZyb206OkZpbmFs bHkpOwogCkBAIC00ODM1LDEzICs0ODk5LDIxIEBAIHZvaWQgQnl0ZWNvZGVHZW5lcmF0b3I6OmVt aXRGaW5hbGx5Q29tcGwKICAgICAgICAgfQogICAgIH0KIAotICAgIC8vIEhhbmRsZSBUaHJvdyBv ciBOb3JtYWwgY29tcGxldGlvbnMuCisgICAgLy8gQnkgbm93LCB3ZSd2ZSBydWxlIG91dCBhbGwg QnJlYWsgLyBDb250aW51ZSAvIFJldHVybiBjb21wbGV0aW9ucyBhYm92ZS4gVGhlIG9ubHkgcmVt YWluaW5nCisgICAgLy8gcG9zc2liaWxpdGllcyBhcmUgTm9ybWFsIG9yIFRocm93LgorCiAgICAg ZW1pdEp1bXBJZjxPcE5zdHJpY3RlcT4oY29udGV4dC5jb21wbGV0aW9uVHlwZVJlZ2lzdGVyKCks IENvbXBsZXRpb25UeXBlOjpUaHJvdywgbm9ybWFsQ29tcGxldGlvbkxhYmVsKTsKIAotICAgIC8v IEZvciBUaHJvdywgd2UganVzdCByZS10aHJvdyB0aGUgcHJldmlvdXNseSBjYXVnaHQgZXhjZXB0 aW9uIGNhcHR1cmVkIGluIHRoZSBjb21wbGV0aW9uIHZhbHVlLgotICAgIC8vIFRoZSBleGNlcHRp b24gaGFuZGxlciB3aWxsIHNldCB0aGUgY29tcGxldGlvbiB0eXBlIHRvIFRocm93LCBhbmQgcmUt Y2FwdHVyZSB0aGUgY29tcGxldGlvbgotICAgIC8vIHZhbHVlIGlmIG5lZWRlZCAoaS5lLiBpZiB0 aGUgZXhjZXB0aW9uIGhhbmRsZXIgaXMgZm9yIGEgZmluYWxseSkuIEhlbmNlLCBubyBuZWVkIHRv IHNldCB0aGUKLSAgICAvLyBjb21wbGV0aW9uIHR5cGUgYW5kIHZhbHVlIGhlcmUuCisgICAgLy8g V2UgZ2V0IGhlcmUgYmVjYXVzZSB3ZSBlbnRlcmVkIHRoaXMgZmluYWxseSBjb250ZXh0IHdpdGgg VGhyb3cgY29tcGxldGlvblR5cGUgKGkuZS4gd2UgaGF2ZQorICAgIC8vIGFuIGV4Y2VwdGlvbiB0 aGF0IHdlIG5lZWQgdG8gcmV0aHJvdyksIGFuZCB3ZSBkaWRuJ3QgZW5jb3VudGVyIGEgZGlmZmVy ZW50IGFicnVwdCBjb21wbGV0aW9uCisgICAgLy8gdGhhdCBvdmVycmlkZXMgdGhhdCBpbmNvbWlu ZyBjb21wbGV0aW9uVHlwZS4gQWxsIHdlIGhhdmUgdG8gZG8gaGVyZSBpcyByZS10aHJvdyB0aGUg ZXhjZXB0aW9uCisgICAgLy8gY2FwdHVyZWQgaW4gdGhlIGNvbXBsZXRpb25WYWx1ZS4KKyAgICAv LworICAgIC8vIE5vdGUgdGhhdCB1bmxpa2UgZm9yIEJyZWFrIC8gQ29udGludWUgLyBSZXR1cm4s IHdlIGRvbid0IG5lZWQgdG8gd29ycnkgYWJvdXQgb3V0ZXIgZmluYWxseQorICAgIC8vIGNvbnRl eHRzLiBUaGlzIGlzIGJlY2F1c2UgYW55IG91dGVyIGZpbmFsbHkgY29udGV4dCAoaWYgcHJlc2Vu dCkgd2lsbCBoYXZlIGl0cyBvd24gZXhjZXB0aW9uCisgICAgLy8gaGFuZGxlciwgd2hpY2ggd2ls bCB0YWtlIGNhcmUgb2YgcmVjZWl2aW5nIHRoZSBUaHJvdyBjb21wbGV0aW9uLCBhbmQgcmUtY2Fw dHVyaW5nIHRoZSBleGNlcHRpb24KKyAgICAvLyBpbiBpdHMgY29tcGxldGlvblZhbHVlLgorCiAg ICAgZW1pdFRocm93KGNvbnRleHQuY29tcGxldGlvblZhbHVlUmVnaXN0ZXIoKSk7CiB9CiAKSW5k ZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29tcGlsZXIvQnl0ZWNvZGVHZW5lcmF0b3Iu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvbXBpbGVyL0J5dGVj b2RlR2VuZXJhdG9yLmgJKHJldmlzaW9uIDI0MjYwMSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9ieXRlY29tcGlsZXIvQnl0ZWNvZGVHZW5lcmF0b3IuaAkod29ya2luZyBjb3B5KQpAQCAtMTI3 OCw3ICsxMjc4LDEyIEBAIG5hbWVzcGFjZSBKU0MgewogCiAgICAgICAgIENvbXBhY3RWYXJpYWJs ZU1hcDo6SGFuZGxlIG1fY2FjaGVkVmFyaWFibGVzVW5kZXJURFo7CiAKLSAgICAgICAgdXNpbmcg Q2F0Y2hFbnRyeSA9IHN0ZDo6dHVwbGU8VHJ5RGF0YSosIFZpcnR1YWxSZWdpc3RlciwgVmlydHVh bFJlZ2lzdGVyLCBWaXJ0dWFsUmVnaXN0ZXI+OworICAgICAgICBzdHJ1Y3QgQ2F0Y2hFbnRyeSB7 CisgICAgICAgICAgICBUcnlEYXRhKiB0cnlEYXRhOworICAgICAgICAgICAgVmlydHVhbFJlZ2lz dGVyIGV4Y2VwdGlvblJlZ2lzdGVyOworICAgICAgICAgICAgVmlydHVhbFJlZ2lzdGVyIHRocm93 blZhbHVlUmVnaXN0ZXI7CisgICAgICAgICAgICBWaXJ0dWFsUmVnaXN0ZXIgY29tcGxldGlvblR5 cGVSZWdpc3RlcjsKKyAgICAgICAgfTsKICAgICAgICAgVmVjdG9yPENhdGNoRW50cnk+IG1fZXhj ZXB0aW9uSGFuZGxlcnNUb0VtaXQ7CiAgICAgfTsKIAo=