86977 2012-05-20 18:30:43 -0700 [V8] Pass Isolate to throwError()s in bindings/v8/*.{h,cpp} 2012-05-20 22:41:47 -0700 1 1 1 Unclassified WebKit WebCore JavaScript 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 84074 1 haraken haraken abarth japhet webkit.review.bot oldest_to_newest 628699 0 haraken 2012-05-20 18:30:43 -0700 The objective is to pass Isolate around in V8 bindings. In this bug we pass Isolate to throwError()s in bindings/v8/*.{h,cpp} except for a couple of non-trivial cases. I'll upload a follow-up patch for the non-trivial cases. 628702 1 142932 haraken 2012-05-20 18:34:37 -0700 Created attachment 142932 Patch 628784 2 142932 webkit.review.bot 2012-05-20 22:41:43 -0700 Comment on attachment 142932 Patch Clearing flags on attachment: 142932 Committed r117728: <http://trac.webkit.org/changeset/117728> 628785 3 webkit.review.bot 2012-05-20 22:41:47 -0700 All reviewed patches have been landed. Closing bug. 142932 2012-05-20 18:34:37 -0700 2012-05-20 22:41:43 -0700 Patch bug-86977-20120521103436.patch text/plain 8607 haraken U3VidmVyc2lvbiBSZXZpc2lvbjogMTE3NzE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGUwMjA2OGU1MThhMDNk MDg4ZjQ1MDlkOWY5OGUwNWQxYzA3Y2RjZi4uNGU0Mzc2NDU0MmY5MjU5YzkwMzk5NTUzZDE5MmVh OGYzMTc1MTdkOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMxIEBACiAyMDEyLTA1LTIwICBLZW50 YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KIAorICAgICAgICBbVjhdIFBhc3MgSXNv bGF0ZSB0byB0aHJvd0Vycm9yKClzIGluIGJpbmRpbmdzL3Y4Lyoue2gsY3BwfQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODY5NzcKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgb2JqZWN0aXZlIGlzIHRv IHBhc3MgSXNvbGF0ZSBhcm91bmQgaW4gVjggYmluZGluZ3MuCisgICAgICAgIFRoaXMgcGF0Y2gg cGFzc2VzIElzb2xhdGUgdG8gdGhyb3dFcnJvcigpcyBpbiBiaW5kaW5ncy92OC8qLntoLGNwcH0K KyAgICAgICAgZXhjZXB0IGZvciBhIGNvdXBsZSBvZiBub24tdHJpdmlhbCBjYXNlcy4gSSdsbCB1 cGxvYWQgYSBmb2xsb3ctdXAgcGF0Y2gKKyAgICAgICAgZm9yIHRoZSBub24tdHJpdmlhbCBjYXNl cy4KKworICAgICAgICBObyB0ZXN0cy4gTm8gY2hhbmdlIGluIGJlaGF2aW9yLgorCisgICAgICAg ICogYmluZGluZ3MvdjgvRGF0ZUV4dGVuc2lvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEYXRl RXh0ZW5zaW9uOjpPblNsZWVwRGV0ZWN0ZWQpOgorICAgICAgICAqIGJpbmRpbmdzL3Y4L1Nlcmlh bGl6ZWRTY3JpcHRWYWx1ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTZXJpYWxpemVkU2NyaXB0 VmFsdWU6OnRyYW5zZmVyQXJyYXlCdWZmZXJzKToKKyAgICAgICAgKFdlYkNvcmU6OlNlcmlhbGl6 ZWRTY3JpcHRWYWx1ZTo6U2VyaWFsaXplZFNjcmlwdFZhbHVlKToKKyAgICAgICAgKiBiaW5kaW5n cy92OC9TZXJpYWxpemVkU2NyaXB0VmFsdWUuaDoKKyAgICAgICAgKiBiaW5kaW5ncy92OC9WOE5Q T2JqZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Om5wT2JqZWN0SW52b2tlSW1wbCk6CisgICAg ICAgIChXZWJDb3JlOjpucE9iamVjdFByb3BlcnR5RW51bWVyYXRvcik6CisgICAgICAgICogYmlu ZGluZ3MvdjgvVjhQcm94eS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpWOFByb3h5OjpjaGVja05l d0xlZ2FsKToKKworMjAxMi0wNS0yMCAgS2VudGFybyBIYXJhICA8aGFyYWtlbkBjaHJvbWl1bS5v cmc+CisKICAgICAgICAgW1Y4XSBQYXNzIElzb2xhdGUgdG8gdGhyb3dFcnJvcigpcyBpbiBDb2Rl R2VuZXJhdG9yVjgucG0KICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTg2OTc2CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L0Rh dGVFeHRlbnNpb24uY3BwIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvRGF0ZUV4dGVuc2lv bi5jcHAKaW5kZXggY2EzNjNjMmVmZjFkODM5ZTI4ZjZhNjY4ZTgxMDIzODdjMTM2NDI4My4uODgz ZGZkM2EyN2VjYjU4MGI3YmY2NmYyNDM5ODAwMDhmMTgzMmRlZSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvYmluZGluZ3MvdjgvRGF0ZUV4dGVuc2lvbi5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvYmluZGluZ3MvdjgvRGF0ZUV4dGVuc2lvbi5jcHAKQEAgLTExNiw5ICsxMTYsOSBAQCB2ODo6 SGFuZGxlPHY4OjpWYWx1ZT4gRGF0ZUV4dGVuc2lvbjo6U2V0dXAoY29uc3Qgdjg6OkFyZ3VtZW50 cyYgYXJncykKICAgICByZXR1cm4gdjg6OlVuZGVmaW5lZCgpOwogfQogCi12ODo6SGFuZGxlPHY4 OjpWYWx1ZT4gRGF0ZUV4dGVuc2lvbjo6T25TbGVlcERldGVjdGVkKGNvbnN0IHY4OjpBcmd1bWVu dHMmKQordjg6OkhhbmRsZTx2ODo6VmFsdWU+IERhdGVFeHRlbnNpb246Ok9uU2xlZXBEZXRlY3Rl ZChjb25zdCB2ODo6QXJndW1lbnRzJiBhcmdzKQogewotICAgIFY4UHJveHk6OnRocm93RXJyb3Io VjhQcm94eTo6R2VuZXJhbEVycm9yLCAiVG9vIG11Y2ggdGltZSBzcGVudCBpbiB1bmxvYWQgaGFu ZGxlci4iKTsKKyAgICBWOFByb3h5Ojp0aHJvd0Vycm9yKFY4UHJveHk6OkdlbmVyYWxFcnJvciwg IlRvbyBtdWNoIHRpbWUgc3BlbnQgaW4gdW5sb2FkIGhhbmRsZXIuIiwgYXJncy5HZXRJc29sYXRl KCkpOwogICAgIHJldHVybiB2ODo6VW5kZWZpbmVkKCk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1NlcmlhbGl6ZWRTY3JpcHRWYWx1ZS5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9iaW5kaW5ncy92OC9TZXJpYWxpemVkU2NyaXB0VmFsdWUuY3BwCmluZGV4IGUyYzFm N2NkMzU1Njc1OGMxNmQxNzU3MmM2MGY5YmVkNmIwMzQ0MWMuLjdiNzk5NjI0OGI1ZjdlZTk5ZmFk YmZiNjBhYmJkMmE3NzgxMTE3MGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdz L3Y4L1NlcmlhbGl6ZWRTY3JpcHRWYWx1ZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGlu Z3MvdjgvU2VyaWFsaXplZFNjcmlwdFZhbHVlLmNwcApAQCAtMjE1NCwxMSArMjE1NCwxMSBAQCBz dGF0aWMgdm9pZCBuZXV0ZXJCaW5kaW5nKHZvaWQqIGRvbU9iamVjdCkKICAgICB9CiB9CiAKLVBh c3NPd25QdHI8U2VyaWFsaXplZFNjcmlwdFZhbHVlOjpBcnJheUJ1ZmZlckNvbnRlbnRzQXJyYXk+ IFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZTo6dHJhbnNmZXJBcnJheUJ1ZmZlcnMoQXJyYXlCdWZmZXJB cnJheSYgYXJyYXlCdWZmZXJzLCBib29sJiBkaWRUaHJvdykgCitQYXNzT3duUHRyPFNlcmlhbGl6 ZWRTY3JpcHRWYWx1ZTo6QXJyYXlCdWZmZXJDb250ZW50c0FycmF5PiBTZXJpYWxpemVkU2NyaXB0 VmFsdWU6OnRyYW5zZmVyQXJyYXlCdWZmZXJzKEFycmF5QnVmZmVyQXJyYXkmIGFycmF5QnVmZmVy cywgYm9vbCYgZGlkVGhyb3csIHY4OjpJc29sYXRlKiBpc29sYXRlKQogewogICAgIGZvciAoc2l6 ZV90IGkgPSAwOyBpIDwgYXJyYXlCdWZmZXJzLnNpemUoKTsgaSsrKSB7CiAgICAgICAgIGlmIChh cnJheUJ1ZmZlcnNbaV0tPmlzTmV1dGVyZWQoKSkgewotICAgICAgICAgICAgdGhyb3dFcnJvcihJ TlZBTElEX1NUQVRFX0VSUik7CisgICAgICAgICAgICB0aHJvd0Vycm9yKElOVkFMSURfU1RBVEVf RVJSLCBpc29sYXRlKTsKICAgICAgICAgICAgIGRpZFRocm93ID0gdHJ1ZTsKICAgICAgICAgICAg IHJldHVybiBudWxscHRyOwogICAgICAgICB9CkBAIC0yMTc2LDcgKzIxNzYsNyBAQCBQYXNzT3du UHRyPFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZTo6QXJyYXlCdWZmZXJDb250ZW50c0FycmF5PiBTZXJp YWxpemVkU2NyaXB0VmFsdQogCiAgICAgICAgIGJvb2wgcmVzdWx0ID0gYXJyYXlCdWZmZXJzW2ld LT50cmFuc2Zlcihjb250ZW50cy0+YXQoaSksIG5ldXRlcmVkVmlld3MpOwogICAgICAgICBpZiAo IXJlc3VsdCkgewotICAgICAgICAgICAgdGhyb3dFcnJvcihJTlZBTElEX1NUQVRFX0VSUik7Cisg ICAgICAgICAgICB0aHJvd0Vycm9yKElOVkFMSURfU1RBVEVfRVJSLCBpc29sYXRlKTsKICAgICAg ICAgICAgIGRpZFRocm93ID0gdHJ1ZTsKICAgICAgICAgICAgIHJldHVybiBudWxscHRyOwogICAg ICAgICB9CkBAIC0yMjEzLDExICsyMjEzLDExIEBAIFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZTo6U2Vy aWFsaXplZFNjcmlwdFZhbHVlKHY4OjpIYW5kbGU8djg6OlZhbHVlPiB2YWx1ZSwKICAgICAgICAg Ly8gSWYgdGhlcmUgd2FzIGFuIGlucHV0IGVycm9yLCB0aHJvdyBhIG5ldyBleGNlcHRpb24gb3V0 c2lkZQogICAgICAgICAvLyBvZiB0aGUgVHJ5Q2F0Y2ggc2NvcGUuCiAgICAgICAgIGRpZFRocm93 ID0gdHJ1ZTsKLSAgICAgICAgdGhyb3dFcnJvcihEQVRBX0NMT05FX0VSUik7CisgICAgICAgIHRo cm93RXJyb3IoREFUQV9DTE9ORV9FUlIsIGlzb2xhdGUpOwogICAgICAgICByZXR1cm47CiAgICAg Y2FzZSBTZXJpYWxpemVyOjpJbnZhbGlkU3RhdGVFcnJvcjoKICAgICAgICAgZGlkVGhyb3cgPSB0 cnVlOwotICAgICAgICB0aHJvd0Vycm9yKElOVkFMSURfU1RBVEVfRVJSKTsKKyAgICAgICAgdGhy b3dFcnJvcihJTlZBTElEX1NUQVRFX0VSUiwgaXNvbGF0ZSk7CiAgICAgICAgIHJldHVybjsKICAg ICBjYXNlIFNlcmlhbGl6ZXI6OkpTRmFpbHVyZToKICAgICAgICAgLy8gSWYgdGhlcmUgd2FzIGEg SlMgZmFpbHVyZSAoYnV0IG5vIGV4Y2VwdGlvbiksIHRoZXJlJ3Mgbm90CkBAIC0yMjI4LDcgKzIy MjgsNyBAQCBTZXJpYWxpemVkU2NyaXB0VmFsdWU6OlNlcmlhbGl6ZWRTY3JpcHRWYWx1ZSh2ODo6 SGFuZGxlPHY4OjpWYWx1ZT4gdmFsdWUsCiAgICAgY2FzZSBTZXJpYWxpemVyOjpTdWNjZXNzOgog ICAgICAgICBtX2RhdGEgPSBTdHJpbmcoU3RyaW5nSW1wbDo6YWRvcHQod3JpdGVyLmRhdGEoKSkp Lmlzb2xhdGVkQ29weSgpOwogICAgICAgICBpZiAoYXJyYXlCdWZmZXJzKQotICAgICAgICAgICAg bV9hcnJheUJ1ZmZlckNvbnRlbnRzQXJyYXkgPSB0cmFuc2ZlckFycmF5QnVmZmVycygqYXJyYXlC dWZmZXJzLCBkaWRUaHJvdyk7CisgICAgICAgICAgICBtX2FycmF5QnVmZmVyQ29udGVudHNBcnJh eSA9IHRyYW5zZmVyQXJyYXlCdWZmZXJzKCphcnJheUJ1ZmZlcnMsIGRpZFRocm93LCBpc29sYXRl KTsKICAgICAgICAgcmV0dXJuOwogICAgIGNhc2UgU2VyaWFsaXplcjo6SlNFeGNlcHRpb246CiAg ICAgICAgIC8vIFdlIHNob3VsZCBuZXZlciBnZXQgaGVyZSBiZWNhdXNlIHRoaXMgY2FzZSB3YXMg aGFuZGxlZCBhYm92ZS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Nl cmlhbGl6ZWRTY3JpcHRWYWx1ZS5oIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvU2VyaWFs aXplZFNjcmlwdFZhbHVlLmgKaW5kZXggMTVlZjJjMjNlZjU3NmUwZmJhMTdkNjBlMzk1ZTcwYWYz M2RjNjVhOC4uODRkMTIyNDg5Y2FiMGY5OTVmYmZhNDllZDU0NzcwODA5YzEyY2I2ZCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvU2VyaWFsaXplZFNjcmlwdFZhbHVlLmgK KysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvU2VyaWFsaXplZFNjcmlwdFZhbHVlLmgK QEAgLTg4LDcgKzg4LDcgQEAgcHJpdmF0ZToKICAgICBTZXJpYWxpemVkU2NyaXB0VmFsdWUodjg6 OkhhbmRsZTx2ODo6VmFsdWU+LCBNZXNzYWdlUG9ydEFycmF5KiwgQXJyYXlCdWZmZXJBcnJheSos IGJvb2wmIGRpZFRocm93LCB2ODo6SXNvbGF0ZSopOwogICAgIGV4cGxpY2l0IFNlcmlhbGl6ZWRT Y3JpcHRWYWx1ZShjb25zdCBTdHJpbmcmIHdpcmVEYXRhKTsKIAotICAgIHN0YXRpYyBQYXNzT3du UHRyPEFycmF5QnVmZmVyQ29udGVudHNBcnJheT4gdHJhbnNmZXJBcnJheUJ1ZmZlcnMoQXJyYXlC dWZmZXJBcnJheSYsIGJvb2wmIGRpZFRocm93KTsKKyAgICBzdGF0aWMgUGFzc093blB0cjxBcnJh eUJ1ZmZlckNvbnRlbnRzQXJyYXk+IHRyYW5zZmVyQXJyYXlCdWZmZXJzKEFycmF5QnVmZmVyQXJy YXkmLCBib29sJiBkaWRUaHJvdywgdjg6Oklzb2xhdGUqKTsKIAogICAgIFN0cmluZyBtX2RhdGE7 CiAgICAgT3duUHRyPEFycmF5QnVmZmVyQ29udGVudHNBcnJheT4gbV9hcnJheUJ1ZmZlckNvbnRl bnRzQXJyYXk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9WOE5QT2Jq ZWN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4TlBPYmplY3QuY3BwCmluZGV4 IDVhNThkODI3MjI2YTkyNzZmYTg3YmQ4NzQxOTliYTE5YzM1OGVlYTMuLmZiZGUzYjhjODliZDNh ZGRlOWMzNjZlODU5MDE1ZjMyMWVjNDFiNmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Jp bmRpbmdzL3Y4L1Y4TlBPYmplY3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4 L1Y4TlBPYmplY3QuY3BwCkBAIC05MiwxNCArOTIsMTQgQEAgc3RhdGljIHY4OjpIYW5kbGU8djg6 OlZhbHVlPiBucE9iamVjdEludm9rZUltcGwoY29uc3Qgdjg6OkFyZ3VtZW50cyYgYXJncywgSW52 b2sKICAgICAgICAgLy8gVGhlIGhvbGRlciBvYmplY3QgaXMgbm90IGEgc3VidHlwZSBvZiBIVE1M UGx1Z0luRWxlbWVudCwgaXQgbXVzdCBiZSBhbiBOUE9iamVjdCB3aGljaCBoYXMgdGhyZWUKICAg ICAgICAgLy8gaW50ZXJuYWwgZmllbGRzLgogICAgICAgICBpZiAoYXJncy5Ib2xkZXIoKS0+SW50 ZXJuYWxGaWVsZENvdW50KCkgIT0gbnBPYmplY3RJbnRlcm5hbEZpZWxkQ291bnQpCi0gICAgICAg ICAgICByZXR1cm4gVjhQcm94eTo6dGhyb3dFcnJvcihWOFByb3h5OjpSZWZlcmVuY2VFcnJvciwg Ik5QTWV0aG9kIGNhbGxlZCBvbiBub24tTlBPYmplY3QiKTsKKyAgICAgICAgICAgIHJldHVybiBW OFByb3h5Ojp0aHJvd0Vycm9yKFY4UHJveHk6OlJlZmVyZW5jZUVycm9yLCAiTlBNZXRob2QgY2Fs bGVkIG9uIG5vbi1OUE9iamVjdCIsIGFyZ3MuR2V0SXNvbGF0ZSgpKTsKIAogICAgICAgICBucE9i amVjdCA9IHY4T2JqZWN0VG9OUE9iamVjdChhcmdzLkhvbGRlcigpKTsKICAgICB9CiAKICAgICAv LyBWZXJpZnkgdGhhdCBvdXIgd3JhcHBlciB3YXNuJ3QgdXNpbmcgYSBOUE9iamVjdCB3aGljaCBo YXMgYWxyZWFkeSBiZWVuIGRlbGV0ZWQuCiAgICAgaWYgKCFucE9iamVjdCB8fCAhX05QTl9Jc0Fs aXZlKG5wT2JqZWN0KSkKLSAgICAgICAgcmV0dXJuIFY4UHJveHk6OnRocm93RXJyb3IoVjhQcm94 eTo6UmVmZXJlbmNlRXJyb3IsICJOUE9iamVjdCBkZWxldGVkIik7CisgICAgICAgIHJldHVybiBW OFByb3h5Ojp0aHJvd0Vycm9yKFY4UHJveHk6OlJlZmVyZW5jZUVycm9yLCAiTlBPYmplY3QgZGVs ZXRlZCIsIGFyZ3MuR2V0SXNvbGF0ZSgpKTsKIAogICAgIC8vIFdyYXAgdXAgcGFyYW1ldGVycy4K ICAgICBpbnQgbnVtQXJncyA9IGFyZ3MuTGVuZ3RoKCk7CkBAIC0xMzMsNyArMTMzLDcgQEAgc3Rh dGljIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBucE9iamVjdEludm9rZUltcGwoY29uc3Qgdjg6OkFy Z3VtZW50cyYgYXJncywgSW52b2sKICAgICB9CiAKICAgICBpZiAoIXJldHZhbCkKLSAgICAgICAg VjhQcm94eTo6dGhyb3dFcnJvcihWOFByb3h5OjpHZW5lcmFsRXJyb3IsICJFcnJvciBjYWxsaW5n IG1ldGhvZCBvbiBOUE9iamVjdC4iKTsKKyAgICAgICAgVjhQcm94eTo6dGhyb3dFcnJvcihWOFBy b3h5OjpHZW5lcmFsRXJyb3IsICJFcnJvciBjYWxsaW5nIG1ldGhvZCBvbiBOUE9iamVjdC4iLCBh cmdzLkdldElzb2xhdGUoKSk7CiAKICAgICBmb3IgKGludCBpID0gMDsgaSA8IG51bUFyZ3M7IGkr KykKICAgICAgICAgX05QTl9SZWxlYXNlVmFyaWFudFZhbHVlKCZucEFyZ3NbaV0pOwpAQCAtMzI1 LDcgKzMyNSw3IEBAIHY4OjpIYW5kbGU8djg6OkFycmF5PiBucE9iamVjdFByb3BlcnR5RW51bWVy YXRvcihjb25zdCB2ODo6QWNjZXNzb3JJbmZvJiBpbmZvLCBiCiAgICAgLy8gVmVyaWZ5IHRoYXQg b3VyIHdyYXBwZXIgd2Fzbid0IHVzaW5nIGEgTlBPYmplY3Qgd2hpY2gKICAgICAvLyBoYXMgYWxy ZWFkeSBiZWVuIGRlbGV0ZWQuCiAgICAgaWYgKCFucE9iamVjdCB8fCAhX05QTl9Jc0FsaXZlKG5w T2JqZWN0KSkKLSAgICAgICAgVjhQcm94eTo6dGhyb3dFcnJvcihWOFByb3h5OjpSZWZlcmVuY2VF cnJvciwgIk5QT2JqZWN0IGRlbGV0ZWQiKTsKKyAgICAgICAgVjhQcm94eTo6dGhyb3dFcnJvcihW OFByb3h5OjpSZWZlcmVuY2VFcnJvciwgIk5QT2JqZWN0IGRlbGV0ZWQiLCBpbmZvLkdldElzb2xh dGUoKSk7CiAKICAgICBpZiAoTlBfQ0xBU1NfU1RSVUNUX1ZFUlNJT05fSEFTX0VOVU0obnBPYmpl Y3QtPl9jbGFzcykgJiYgbnBPYmplY3QtPl9jbGFzcy0+ZW51bWVyYXRlKSB7CiAgICAgICAgIHVp bnQzMl90IGNvdW50OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhQ cm94eS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9WOFByb3h5LmNwcAppbmRleCBi ZDJjMDc4YzE0NmZiNjczOWJkNzFiYjdmOTUwZGE1YTY4NDI4YmI3Li45Y2IyZjY0MzhhNmM2Nzll NTRlZWMwZTI5OTllYzdhNDFiZGI1NDlkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5k aW5ncy92OC9WOFByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9WOFBy b3h5LmNwcApAQCAtNzEyLDcgKzcxMiw3IEBAIHY4OjpMb2NhbDx2ODo6Q29udGV4dD4gVjhQcm94 eTo6Y3VycmVudENvbnRleHQoKQogdjg6OkhhbmRsZTx2ODo6VmFsdWU+IFY4UHJveHk6OmNoZWNr TmV3TGVnYWwoY29uc3Qgdjg6OkFyZ3VtZW50cyYgYXJncykKIHsKICAgICBpZiAoQ29uc3RydWN0 b3JNb2RlOjpjdXJyZW50KCkgPT0gQ29uc3RydWN0b3JNb2RlOjpDcmVhdGVOZXdPYmplY3QpCi0g ICAgICAgIHJldHVybiB0aHJvd0Vycm9yKFR5cGVFcnJvciwgIklsbGVnYWwgY29uc3RydWN0b3Ii KTsKKyAgICAgICAgcmV0dXJuIHRocm93RXJyb3IoVHlwZUVycm9yLCAiSWxsZWdhbCBjb25zdHJ1 Y3RvciIsIGFyZ3MuR2V0SXNvbGF0ZSgpKTsKIAogICAgIHJldHVybiBhcmdzLlRoaXMoKTsKIH0K