93223 2012-08-05 21:44:03 -0700 [V8] Replace throwError(ExceptionCode, Isolate*) with setDOMException(ExceptionCode, Isolate*) in CodeGeneratorV8.pm 2012-08-07 17:56:48 -0700 1 1 1 Unclassified WebKit WebCore JavaScript 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 93095 1 haraken haraken abarth japhet webkit.review.bot oldest_to_newest 687746 0 haraken 2012-08-05 21:44:03 -0700 Now throwError(ExceptionCode, Isolate*) is equivalent to setDOMException(ExceptionCode, Isolate*). We can replace the former with the latter. After this replacement, the rule becomes simple and sane: "Use throwError() for throwing JavaScript errors, use setDOMException() for throwing DOM exceptions". 687750 1 156592 haraken 2012-08-05 21:55:20 -0700 Created attachment 156592 Patch 687783 2 haraken 2012-08-05 23:18:25 -0700 I couldn't replace throwError(ExceptionCode) with setDOMException(ExceptionCode, Isolate*) in V8Utilities::extractTransferables(), because extractTransferables() does not know an Isolate. I will upload follow-up patches to pass an Isolate to Dictionary, and then to extractTransferables(). 687786 3 haraken 2012-08-05 23:19:47 -0700 (In reply to comment #2) > I couldn't replace throwError(ExceptionCode) with setDOMException(ExceptionCode, Isolate*) in V8Utilities::extractTransferables(), because extractTransferables() does not know an Isolate. I will upload follow-up patches to pass an Isolate to Dictionary, and then to extractTransferables(). Nit: the above comment should have been posted to bug 93226. 689625 4 156592 abarth 2012-08-07 17:03:00 -0700 Comment on attachment 156592 Patch ok 689678 5 156592 webkit.review.bot 2012-08-07 17:56:45 -0700 Comment on attachment 156592 Patch Clearing flags on attachment: 156592 Committed r124955: <http://trac.webkit.org/changeset/124955> 689679 6 webkit.review.bot 2012-08-07 17:56:48 -0700 All reviewed patches have been landed. Closing bug. 156592 2012-08-05 21:55:20 -0700 2012-08-07 17:56:44 -0700 Patch bug-93223-20120806135457.patch text/plain 9363 haraken U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0NzIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWRkNWZhMDE4ODQ5NDhl MjgyM2NiMjhlMjQxYjZhNDVhODM0NDY4OS4uNmYzNTkxMmViYmM2YzhmNDIzODE0MGVkMDdhNGMx NDNiZTY5MWJjYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDEyLTA4LTA1ICBLZW50 YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KKworICAgICAgICBbVjhdIFJlcGxhY2Ug dGhyb3dFcnJvcihFeGNlcHRpb25Db2RlLCBJc29sYXRlKikgd2l0aAorICAgICAgICBzZXRET01F eGNlcHRpb24oRXhjZXB0aW9uQ29kZSwgSXNvbGF0ZSopIGluIENvZGVHZW5lcmF0b3JWOC5wbQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTMyMjMKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBOb3cgdGhyb3dF cnJvcihFeGNlcHRpb25Db2RlLCBJc29sYXRlKikgaXMgZXF1aXZhbGVudCB0bworICAgICAgICBz ZXRET01FeGNlcHRpb24oRXhjZXB0aW9uQ29kZSwgSXNvbGF0ZSopLiBXZSBjYW4gcmVwbGFjZSB0 aGUgZm9ybWVyCisgICAgICAgIHdpdGggdGhlIGxhdHRlci4gQWZ0ZXIgdGhpcyByZXBsYWNlbWVu dCwgdGhlIHJ1bGUgYmVjb21lcyBzaW1wbGUKKyAgICAgICAgYW5kIHNhbmU6ICJVc2UgdGhyb3dF cnJvcigpIGZvciB0aHJvd2luZyBKYXZhU2NyaXB0IGVycm9ycywgdXNlCisgICAgICAgIHNldERP TUV4Y2VwdGlvbigpIGZvciB0aHJvd2luZyBET00gZXhjZXB0aW9ucyIuCisKKyAgICAgICAgVGVz dDogYmluZGluZ3Mvc2NyaXB0cy90ZXN0L1Rlc3RPYmouaWRsCisKKyAgICAgICAgKiBiaW5kaW5n cy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JWOC5wbToKKyAgICAgICAgKEdlbmVyYXRlUGFyYW1ldGVy c0NoZWNrKToKKyAgICAgICAgKEdlbmVyYXRlQ29uc3RydWN0b3JDYWxsYmFjayk6CisgICAgICAg IChHZW5lcmF0ZU5hbWVkQ29uc3RydWN0b3JDYWxsYmFjayk6CisgICAgICAgICogYmluZGluZ3Mv c2NyaXB0cy90ZXN0L1Y4L1Y4VGVzdEludGVyZmFjZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpW OFRlc3RJbnRlcmZhY2U6OmNvbnN0cnVjdG9yQ2FsbGJhY2spOgorICAgICAgICAqIGJpbmRpbmdz L3NjcmlwdHMvdGVzdC9WOC9WOFRlc3ROYW1lZENvbnN0cnVjdG9yLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlY4VGVzdE5hbWVkQ29uc3RydWN0b3JDb25zdHJ1Y3RvckNhbGxiYWNrKToKKyAgICAg ICAgKiBiaW5kaW5ncy9zY3JpcHRzL3Rlc3QvVjgvVjhUZXN0T2JqLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlRlc3RPYmpWOEludGVybmFsOjptZXRob2RXaXRoQ2FsbGJhY2tBcmdDYWxsYmFjayk6 CisgICAgICAgIChXZWJDb3JlOjpUZXN0T2JqVjhJbnRlcm5hbDo6bWV0aG9kV2l0aE5vbkNhbGxi YWNrQXJnQW5kQ2FsbGJhY2tBcmdDYWxsYmFjayk6CisgICAgICAgIChXZWJDb3JlOjpUZXN0T2Jq VjhJbnRlcm5hbDo6bWV0aG9kV2l0aENhbGxiYWNrQW5kT3B0aW9uYWxBcmdDYWxsYmFjayk6Cisg ICAgICAgIChXZWJDb3JlOjpUZXN0T2JqVjhJbnRlcm5hbDo6b3ZlcmxvYWRlZE1ldGhvZDVDYWxs YmFjayk6CisgICAgICAgIChXZWJDb3JlOjpWOFRlc3RPYmo6OmNvbnN0cnVjdG9yQ2FsbGJhY2sp OgorCiAyMDEyLTA4LTA1ICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KIAogICAg ICAgICBEb24ndCByZXVzZSBjYWNoZWQgc3R5bGVzaGVldCB3aXRoIGZhaWxlZCBvciBjYW5jZWxl ZCByZXNvdXJjZSBsb2FkcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2Ny aXB0cy9Db2RlR2VuZXJhdG9yVjgucG0gYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRz L0NvZGVHZW5lcmF0b3JWOC5wbQppbmRleCA2ZjE2ZmVjOGY1MzgwNjRiMmJlOTYxNWQ5NTJlMDE5 ZjUyMDlhYjg0Li5hYmJiNTZkMmIxNjU2ODBjNDYwMTZlMTEzY2YwODdjMzc1ZTQzNzcwIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JWOC5w bQorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JWOC5w bQpAQCAtMTY3MiwxMiArMTY3MiwxMiBAQCBzdWIgR2VuZXJhdGVQYXJhbWV0ZXJzQ2hlY2sKICAg ICAgICAgICAgICAgICAkcGFyYW1ldGVyQ2hlY2tTdHJpbmcgLj0gIiAgICBSZWZQdHI8IiAuICRw YXJhbWV0ZXItPnR5cGUgLiAiPiAkcGFyYW1ldGVyTmFtZTtcbiI7CiAgICAgICAgICAgICAgICAg JHBhcmFtZXRlckNoZWNrU3RyaW5nIC49ICIgICAgaWYgKGFyZ3MuTGVuZ3RoKCkgPiAkcGFyYW1J bmRleCAmJiAhYXJnc1skcGFyYW1JbmRleF0tPklzTnVsbCgpICYmICFhcmdzWyRwYXJhbUluZGV4 XS0+SXNVbmRlZmluZWQoKSkge1xuIjsKICAgICAgICAgICAgICAgICAkcGFyYW1ldGVyQ2hlY2tT dHJpbmcgLj0gIiAgICAgICAgaWYgKCFhcmdzWyRwYXJhbUluZGV4XS0+SXNGdW5jdGlvbigpKVxu IjsKLSAgICAgICAgICAgICAgICAkcGFyYW1ldGVyQ2hlY2tTdHJpbmcgLj0gIiAgICAgICAgICAg IHJldHVybiB0aHJvd0Vycm9yKFRZUEVfTUlTTUFUQ0hfRVJSLCBhcmdzLkdldElzb2xhdGUoKSk7 XG4iOworICAgICAgICAgICAgICAgICRwYXJhbWV0ZXJDaGVja1N0cmluZyAuPSAiICAgICAgICAg ICAgcmV0dXJuIFY4UHJveHk6OnNldERPTUV4Y2VwdGlvbihUWVBFX01JU01BVENIX0VSUiwgYXJn cy5HZXRJc29sYXRlKCkpO1xuIjsKICAgICAgICAgICAgICAgICAkcGFyYW1ldGVyQ2hlY2tTdHJp bmcgLj0gIiAgICAgICAgJHBhcmFtZXRlck5hbWUgPSAke2NsYXNzTmFtZX06OmNyZWF0ZShhcmdz WyRwYXJhbUluZGV4XSwgZ2V0U2NyaXB0RXhlY3V0aW9uQ29udGV4dCgpKTtcbiI7CiAgICAgICAg ICAgICAgICAgJHBhcmFtZXRlckNoZWNrU3RyaW5nIC49ICIgICAgfVxuIjsKICAgICAgICAgICAg IH0gZWxzZSB7CiAgICAgICAgICAgICAgICAgJHBhcmFtZXRlckNoZWNrU3RyaW5nIC49ICIgICAg aWYgKGFyZ3MuTGVuZ3RoKCkgPD0gJHBhcmFtSW5kZXggfHwgIWFyZ3NbJHBhcmFtSW5kZXhdLT5J c0Z1bmN0aW9uKCkpXG4iOwotICAgICAgICAgICAgICAgICRwYXJhbWV0ZXJDaGVja1N0cmluZyAu PSAiICAgICAgICByZXR1cm4gdGhyb3dFcnJvcihUWVBFX01JU01BVENIX0VSUiwgYXJncy5HZXRJ c29sYXRlKCkpO1xuIjsKKyAgICAgICAgICAgICAgICAkcGFyYW1ldGVyQ2hlY2tTdHJpbmcgLj0g IiAgICAgICAgcmV0dXJuIFY4UHJveHk6OnNldERPTUV4Y2VwdGlvbihUWVBFX01JU01BVENIX0VS UiwgYXJncy5HZXRJc29sYXRlKCkpO1xuIjsKICAgICAgICAgICAgICAgICAkcGFyYW1ldGVyQ2hl Y2tTdHJpbmcgLj0gIiAgICBSZWZQdHI8IiAuICRwYXJhbWV0ZXItPnR5cGUgLiAiPiAkcGFyYW1l dGVyTmFtZSA9ICR7Y2xhc3NOYW1lfTo6Y3JlYXRlKGFyZ3NbJHBhcmFtSW5kZXhdLCBnZXRTY3Jp cHRFeGVjdXRpb25Db250ZXh0KCkpO1xuIjsKICAgICAgICAgICAgIH0KICAgICAgICAgfSBlbHNp ZiAoJHBhcmFtZXRlci0+ZXh0ZW5kZWRBdHRyaWJ1dGVzLT57IkNsYW1wIn0pIHsKQEAgLTE4NjEs NyArMTg2MSw3IEBAIEVORAogCiAgICAgaWYgKCRyYWlzZXNFeGNlcHRpb25zKSB7CiAgICAgICAg IHB1c2goQGltcGxDb250ZW50LCAiICBmYWlsOlxuIik7Ci0gICAgICAgIHB1c2goQGltcGxDb250 ZW50LCAiICAgIHJldHVybiB0aHJvd0Vycm9yKGVjLCBhcmdzLkdldElzb2xhdGUoKSk7XG4iKTsK KyAgICAgICAgcHVzaChAaW1wbENvbnRlbnQsICIgICAgcmV0dXJuIFY4UHJveHk6OnNldERPTUV4 Y2VwdGlvbihlYywgYXJncy5HZXRJc29sYXRlKCkpO1xuIik7CiAgICAgfQogCiAgICAgcHVzaChA aW1wbENvbnRlbnQsICJ9XG4iKTsKQEAgLTIwMzYsNyArMjAzNiw3IEBAIEVORAogCiAgICAgaWYg KCRyYWlzZXNFeGNlcHRpb25zKSB7CiAgICAgICAgIHB1c2goQGltcGxDb250ZW50LCAiICBmYWls OlxuIik7Ci0gICAgICAgIHB1c2goQGltcGxDb250ZW50LCAiICAgIHJldHVybiB0aHJvd0Vycm9y KGVjLCBhcmdzLkdldElzb2xhdGUoKSk7XG4iKTsKKyAgICAgICAgcHVzaChAaW1wbENvbnRlbnQs ICIgICAgcmV0dXJuIFY4UHJveHk6OnNldERPTUV4Y2VwdGlvbihlYywgYXJncy5HZXRJc29sYXRl KCkpO1xuIik7CiAgICAgfQogCiAgICAgcHVzaChAaW1wbENvbnRlbnQsICJ9XG4iKTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9WOC9WOFRlc3RJbnRl cmZhY2UuY3BwIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L1Y4L1Y4VGVz dEludGVyZmFjZS5jcHAKaW5kZXggMzhhMDlhNzg2NmQ2ZmFmNjFiMzYxZGJkYTM5N2M1ODAzZGMz YTQxYy4uMTVkMTI2OTdjNjI4YmFkMTk1ZGE0MjY2ZDAzZjZlYTlmMDBjY2VhMyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L1Y4L1Y4VGVzdEludGVyZmFj ZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L1Y4L1Y4VGVz dEludGVyZmFjZS5jcHAKQEAgLTI3Miw3ICsyNzIsNyBAQCB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4g VjhUZXN0SW50ZXJmYWNlOjpjb25zdHJ1Y3RvckNhbGxiYWNrKGNvbnN0IHY4OjpBcmd1bWVudHMm CiAgICAgVjhET01XcmFwcGVyOjpzZXRKU1dyYXBwZXJGb3JBY3RpdmVET01PYmplY3QoaW1wbC5y ZWxlYXNlKCksIHY4OjpQZXJzaXN0ZW50PHY4OjpPYmplY3Q+OjpOZXcod3JhcHBlciksIGFyZ3Mu R2V0SXNvbGF0ZSgpKTsKICAgICByZXR1cm4gYXJncy5Ib2xkZXIoKTsKICAgZmFpbDoKLSAgICBy ZXR1cm4gdGhyb3dFcnJvcihlYywgYXJncy5HZXRJc29sYXRlKCkpOworICAgIHJldHVybiBWOFBy b3h5OjpzZXRET01FeGNlcHRpb24oZWMsIGFyZ3MuR2V0SXNvbGF0ZSgpKTsKIH0KIAogc3RhdGlj IHY4OjpQZXJzaXN0ZW50PHY4OjpGdW5jdGlvblRlbXBsYXRlPiBDb25maWd1cmVWOFRlc3RJbnRl cmZhY2VUZW1wbGF0ZSh2ODo6UGVyc2lzdGVudDx2ODo6RnVuY3Rpb25UZW1wbGF0ZT4gZGVzYykK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9WOC9WOFRl c3ROYW1lZENvbnN0cnVjdG9yLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMv dGVzdC9WOC9WOFRlc3ROYW1lZENvbnN0cnVjdG9yLmNwcAppbmRleCBiNGFmZDFmMmU4YTg5ZmZh YzQzYjE2MTBkYzBhNzUyNjgyNjU2ODhmLi5kZTY1NWQwNTgxZTM0N2Y2NzE1Yzc0NjIwZTZjZWIz Y2FmZjRiZmNkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rl c3QvVjgvVjhUZXN0TmFtZWRDb25zdHJ1Y3Rvci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmlu ZGluZ3Mvc2NyaXB0cy90ZXN0L1Y4L1Y4VGVzdE5hbWVkQ29uc3RydWN0b3IuY3BwCkBAIC04MSw3 ICs4MSw3IEBAIHN0YXRpYyB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gVjhUZXN0TmFtZWRDb25zdHJ1 Y3RvckNvbnN0cnVjdG9yQ2FsbGJhY2soY29uc3Qgdjg6CiAgICAgVjhET01XcmFwcGVyOjpzZXRK U1dyYXBwZXJGb3JBY3RpdmVET01PYmplY3QoaW1wbC5yZWxlYXNlKCksIHY4OjpQZXJzaXN0ZW50 PHY4OjpPYmplY3Q+OjpOZXcod3JhcHBlciksIGFyZ3MuR2V0SXNvbGF0ZSgpKTsKICAgICByZXR1 cm4gYXJncy5Ib2xkZXIoKTsKICAgZmFpbDoKLSAgICByZXR1cm4gdGhyb3dFcnJvcihlYywgYXJn cy5HZXRJc29sYXRlKCkpOworICAgIHJldHVybiBWOFByb3h5OjpzZXRET01FeGNlcHRpb24oZWMs IGFyZ3MuR2V0SXNvbGF0ZSgpKTsKIH0KIAogdjg6OlBlcnNpc3RlbnQ8djg6OkZ1bmN0aW9uVGVt cGxhdGU+IFY4VGVzdE5hbWVkQ29uc3RydWN0b3JDb25zdHJ1Y3Rvcjo6R2V0VGVtcGxhdGUoKQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L1Y4L1Y4VGVz dE9iai5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvVjgvVjhUZXN0 T2JqLmNwcAppbmRleCA2MDhhNDhmZGNmODc5OTg1YmJjOTgwNGNjNTcxMWQ5NjcxNWI0ZDcwLi5m MDg0ZmYxYjdkZTc5ZGI3OTUyODY2ZjU0MmRjODcxNWE1ZmRiMWU3IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvVjgvVjhUZXN0T2JqLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvVjgvVjhUZXN0T2JqLmNwcApAQCAt MTQ1MCw3ICsxNDUwLDcgQEAgc3RhdGljIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBtZXRob2RXaXRo Q2FsbGJhY2tBcmdDYWxsYmFjayhjb25zdCB2ODo6QXJndW1lbnRzJgogICAgICAgICByZXR1cm4g VjhQcm94eTo6dGhyb3dOb3RFbm91Z2hBcmd1bWVudHNFcnJvcihhcmdzLkdldElzb2xhdGUoKSk7 CiAgICAgVGVzdE9iaiogaW1wID0gVjhUZXN0T2JqOjp0b05hdGl2ZShhcmdzLkhvbGRlcigpKTsK ICAgICBpZiAoYXJncy5MZW5ndGgoKSA8PSAwIHx8ICFhcmdzWzBdLT5Jc0Z1bmN0aW9uKCkpCi0g ICAgICAgIHJldHVybiB0aHJvd0Vycm9yKFRZUEVfTUlTTUFUQ0hfRVJSLCBhcmdzLkdldElzb2xh dGUoKSk7CisgICAgICAgIHJldHVybiBWOFByb3h5OjpzZXRET01FeGNlcHRpb24oVFlQRV9NSVNN QVRDSF9FUlIsIGFyZ3MuR2V0SXNvbGF0ZSgpKTsKICAgICBSZWZQdHI8VGVzdENhbGxiYWNrPiBj YWxsYmFjayA9IFY4VGVzdENhbGxiYWNrOjpjcmVhdGUoYXJnc1swXSwgZ2V0U2NyaXB0RXhlY3V0 aW9uQ29udGV4dCgpKTsKICAgICBpbXAtPm1ldGhvZFdpdGhDYWxsYmFja0FyZyhjYWxsYmFjayk7 CiAgICAgcmV0dXJuIHY4VW5kZWZpbmVkKCk7CkBAIC0xNDY0LDcgKzE0NjQsNyBAQCBzdGF0aWMg djg6OkhhbmRsZTx2ODo6VmFsdWU+IG1ldGhvZFdpdGhOb25DYWxsYmFja0FyZ0FuZENhbGxiYWNr QXJnQ2FsbGJhY2soY29ucwogICAgIFRlc3RPYmoqIGltcCA9IFY4VGVzdE9iajo6dG9OYXRpdmUo YXJncy5Ib2xkZXIoKSk7CiAgICAgRVhDRVBUSU9OX0JMT0NLKGludCwgbm9uQ2FsbGJhY2ssIHRv SW50MzIoTUFZQkVfTUlTU0lOR19QQVJBTUVURVIoYXJncywgMCwgRGVmYXVsdElzVW5kZWZpbmVk KSkpOwogICAgIGlmIChhcmdzLkxlbmd0aCgpIDw9IDEgfHwgIWFyZ3NbMV0tPklzRnVuY3Rpb24o KSkKLSAgICAgICAgcmV0dXJuIHRocm93RXJyb3IoVFlQRV9NSVNNQVRDSF9FUlIsIGFyZ3MuR2V0 SXNvbGF0ZSgpKTsKKyAgICAgICAgcmV0dXJuIFY4UHJveHk6OnNldERPTUV4Y2VwdGlvbihUWVBF X01JU01BVENIX0VSUiwgYXJncy5HZXRJc29sYXRlKCkpOwogICAgIFJlZlB0cjxUZXN0Q2FsbGJh Y2s+IGNhbGxiYWNrID0gVjhUZXN0Q2FsbGJhY2s6OmNyZWF0ZShhcmdzWzFdLCBnZXRTY3JpcHRF eGVjdXRpb25Db250ZXh0KCkpOwogICAgIGltcC0+bWV0aG9kV2l0aE5vbkNhbGxiYWNrQXJnQW5k Q2FsbGJhY2tBcmcobm9uQ2FsbGJhY2ssIGNhbGxiYWNrKTsKICAgICByZXR1cm4gdjhVbmRlZmlu ZWQoKTsKQEAgLTE0NzcsNyArMTQ3Nyw3IEBAIHN0YXRpYyB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4g bWV0aG9kV2l0aENhbGxiYWNrQW5kT3B0aW9uYWxBcmdDYWxsYmFjayhjb25zdCB2ODo6CiAgICAg UmVmUHRyPFRlc3RDYWxsYmFjaz4gY2FsbGJhY2s7CiAgICAgaWYgKGFyZ3MuTGVuZ3RoKCkgPiAw ICYmICFhcmdzWzBdLT5Jc051bGwoKSAmJiAhYXJnc1swXS0+SXNVbmRlZmluZWQoKSkgewogICAg ICAgICBpZiAoIWFyZ3NbMF0tPklzRnVuY3Rpb24oKSkKLSAgICAgICAgICAgIHJldHVybiB0aHJv d0Vycm9yKFRZUEVfTUlTTUFUQ0hfRVJSLCBhcmdzLkdldElzb2xhdGUoKSk7CisgICAgICAgICAg ICByZXR1cm4gVjhQcm94eTo6c2V0RE9NRXhjZXB0aW9uKFRZUEVfTUlTTUFUQ0hfRVJSLCBhcmdz LkdldElzb2xhdGUoKSk7CiAgICAgICAgIGNhbGxiYWNrID0gVjhUZXN0Q2FsbGJhY2s6OmNyZWF0 ZShhcmdzWzBdLCBnZXRTY3JpcHRFeGVjdXRpb25Db250ZXh0KCkpOwogICAgIH0KICAgICBpbXAt Pm1ldGhvZFdpdGhDYWxsYmFja0FuZE9wdGlvbmFsQXJnKGNhbGxiYWNrKTsKQEAgLTE1NzYsNyAr MTU3Niw3IEBAIHN0YXRpYyB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gb3ZlcmxvYWRlZE1ldGhvZDVD YWxsYmFjayhjb25zdCB2ODo6QXJndW1lbnRzJiBhcmdzCiAgICAgICAgIHJldHVybiBWOFByb3h5 Ojp0aHJvd05vdEVub3VnaEFyZ3VtZW50c0Vycm9yKGFyZ3MuR2V0SXNvbGF0ZSgpKTsKICAgICBU ZXN0T2JqKiBpbXAgPSBWOFRlc3RPYmo6OnRvTmF0aXZlKGFyZ3MuSG9sZGVyKCkpOwogICAgIGlm IChhcmdzLkxlbmd0aCgpIDw9IDAgfHwgIWFyZ3NbMF0tPklzRnVuY3Rpb24oKSkKLSAgICAgICAg cmV0dXJuIHRocm93RXJyb3IoVFlQRV9NSVNNQVRDSF9FUlIsIGFyZ3MuR2V0SXNvbGF0ZSgpKTsK KyAgICAgICAgcmV0dXJuIFY4UHJveHk6OnNldERPTUV4Y2VwdGlvbihUWVBFX01JU01BVENIX0VS UiwgYXJncy5HZXRJc29sYXRlKCkpOwogICAgIFJlZlB0cjxUZXN0Q2FsbGJhY2s+IGNhbGxiYWNr ID0gVjhUZXN0Q2FsbGJhY2s6OmNyZWF0ZShhcmdzWzBdLCBnZXRTY3JpcHRFeGVjdXRpb25Db250 ZXh0KCkpOwogICAgIGltcC0+b3ZlcmxvYWRlZE1ldGhvZChjYWxsYmFjayk7CiAgICAgcmV0dXJu IHY4VW5kZWZpbmVkKCk7CkBAIC0yMTQyLDcgKzIxNDIsNyBAQCB2ODo6SGFuZGxlPHY4OjpWYWx1 ZT4gVjhUZXN0T2JqOjpjb25zdHJ1Y3RvckNhbGxiYWNrKGNvbnN0IHY4OjpBcmd1bWVudHMmIGFy Z3MpCiAgICAgaWYgKGFyZ3MuTGVuZ3RoKCkgPCAxKQogICAgICAgICByZXR1cm4gVjhQcm94eTo6 dGhyb3dOb3RFbm91Z2hBcmd1bWVudHNFcnJvcihhcmdzLkdldElzb2xhdGUoKSk7CiAgICAgaWYg KGFyZ3MuTGVuZ3RoKCkgPD0gMCB8fCAhYXJnc1swXS0+SXNGdW5jdGlvbigpKQotICAgICAgICBy ZXR1cm4gdGhyb3dFcnJvcihUWVBFX01JU01BVENIX0VSUiwgYXJncy5HZXRJc29sYXRlKCkpOwor ICAgICAgICByZXR1cm4gVjhQcm94eTo6c2V0RE9NRXhjZXB0aW9uKFRZUEVfTUlTTUFUQ0hfRVJS LCBhcmdzLkdldElzb2xhdGUoKSk7CiAgICAgUmVmUHRyPFRlc3RDYWxsYmFjaz4gdGVzdENhbGxi YWNrID0gVjhUZXN0Q2FsbGJhY2s6OmNyZWF0ZShhcmdzWzBdLCBnZXRTY3JpcHRFeGVjdXRpb25D b250ZXh0KCkpOwogCiAgICAgUmVmUHRyPFRlc3RPYmo+IGltcGwgPSBUZXN0T2JqOjpjcmVhdGUo dGVzdENhbGxiYWNrKTsK