224473 2021-04-12 22:40:17 -0700 [JSC] Remove CodeBlock::m_constantsSourceCodeRepresentation 2021-04-13 03:13:35 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 ysuzuki ysuzuki ews-watchlist keith_miller mark.lam msaboff saam tzagallo webkit-bug-importer oldest_to_newest 1749537 0 ysuzuki 2021-04-12 22:40:17 -0700 [JSC] Remove CodeBlock::m_constantsSourceCodeRepresentation 1749539 1 425837 ysuzuki 2021-04-12 22:47:30 -0700 Created attachment 425837 Patch 1749559 2 425837 mark.lam 2021-04-12 23:40:05 -0700 Comment on attachment 425837 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=425837&action=review r=me > Source/JavaScriptCore/ChangeLog:13 > + And it array is effectively accessed only when compiling DFG code. So we should remove copy of that in CodeBlock, and /it array/the array/ 1749565 3 425837 ysuzuki 2021-04-13 00:02:16 -0700 Comment on attachment 425837 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=425837&action=review Thanks! >> Source/JavaScriptCore/ChangeLog:13 >> + And it array is effectively accessed only when compiling DFG code. So we should remove copy of that in CodeBlock, and > > /it array/the array/ Fixed. 1749566 4 ysuzuki 2021-04-13 00:08:04 -0700 inspector/canvas/shaderProgram-add-remove-webgpu.html is flaky (it was failing with the same kind of error). 1749571 5 ysuzuki 2021-04-13 00:35:47 -0700 Committed r275866 (236431@main): <https://commits.webkit.org/236431@main> 1749572 6 webkit-bug-importer 2021-04-13 00:36:14 -0700 <rdar://problem/76578949> 1749588 7 ysuzuki 2021-04-13 01:34:56 -0700 Committed r275870 (236435@main): <https://commits.webkit.org/236435@main> 425837 2021-04-12 22:47:30 -0700 2021-04-13 03:13:35 -0700 Patch bug-224473-20210412224729.patch text/plain 11184 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjc1ODYxCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA2 MDI2MjAxZTgwMmY2ZTQxNWEyMTU4MGYzOGZkMDE0Y2NiNzI0ZGEwLi41Y2RhNTJmNjk0M2NkNmJi NGRjYjExNWU2ODU4ZWZjNTQyYWU2ZmVhIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzOCBAQAorMjAyMS0wNC0xMiAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUuY29t PgorCisgICAgICAgIFtKU0NdIFJlbW92ZSBDb2RlQmxvY2s6Om1fY29uc3RhbnRzU291cmNlQ29k ZVJlcHJlc2VudGF0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMjQ0NzMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBDb2RlQmxvY2s6Om1fY29uc3RhbnRzU291cmNlQ29kZVJlcHJlc2VudGF0aW9uIGlz IGlkZW50aWNhbCB0byBVbmxpbmtlZENvZGVCbG9jazo6bV9jb25zdGFudHNTb3VyY2VDb2RlUmVw cmVzZW50YXRpb24uCisKKyAgICAgICAgMS4gRm9yIGFsbCBjb25zdGFudHMgZXhpc3RpbmcgYXQg Ynl0ZWNvZGUgY29tcGlsZSB0aW1lLCBlbGVtZW50cyBvZiB0aGUgYWJvdmUgdmVjdG9ycyBhcmUg aWRlbnRpY2FsLgorICAgICAgICAyLiBGb3IgbGF6aWx5IGFkZGVkIGNvbnN0YW50cyBmcm9tIERG RywgaXQgaXMgYWx3YXlzIFNvdXJjZUNvZGVSZXByZXNlbnRhdGlvbjo6T3RoZXIuCisKKyAgICAg ICAgQW5kIGl0IGFycmF5IGlzIGVmZmVjdGl2ZWx5IGFjY2Vzc2VkIG9ubHkgd2hlbiBjb21waWxp bmcgREZHIGNvZGUuIFNvIHdlIHNob3VsZCByZW1vdmUgY29weSBvZiB0aGF0IGluIENvZGVCbG9j aywgYW5kCisgICAgICAgIGdldCBTb3VyY2VDb2RlUmVwcmVzZW50YXRpb24gZnJvbSBVbmxpbmtl ZENvZGVCbG9jay4KKworICAgICAgICAqIGJ5dGVjb2RlL0J5dGVjb2RlRHVtcGVyLmNwcDoKKyAg ICAgICAgKEpTQzo6Q29kZUJsb2NrQnl0ZWNvZGVEdW1wZXI8QmxvY2s+OjpkdW1wQ29uc3RhbnRz KToKKyAgICAgICAgKiBieXRlY29kZS9Db2RlQmxvY2suY3BwOgorICAgICAgICAoSlNDOjpDb2Rl QmxvY2s6OkNvZGVCbG9jayk6CisgICAgICAgIChKU0M6OkNvZGVCbG9jazo6c2V0Q29uc3RhbnRS ZWdpc3RlcnMpOgorICAgICAgICAoSlNDOjpDb2RlQmxvY2s6OnNocmlua1RvRml0KToKKyAgICAg ICAgKiBieXRlY29kZS9Db2RlQmxvY2suaDoKKyAgICAgICAgKEpTQzo6Q29kZUJsb2NrOjpjb25z dGFudHMpOgorICAgICAgICAoSlNDOjpDb2RlQmxvY2s6OmFkZENvbnN0YW50KToKKyAgICAgICAg KEpTQzo6Q29kZUJsb2NrOjphZGRDb25zdGFudExhemlseSk6CisgICAgICAgIChKU0M6OkNvZGVC bG9jazo6Y29uc3RhbnRTb3VyY2VDb2RlUmVwcmVzZW50YXRpb24gY29uc3QpOgorICAgICAgICAo SlNDOjpDb2RlQmxvY2s6OmNvbnN0YW50c1NvdXJjZUNvZGVSZXByZXNlbnRhdGlvbik6IERlbGV0 ZWQuCisgICAgICAgICogYnl0ZWNvZGUvVW5saW5rZWRDb2RlQmxvY2suaDoKKyAgICAgICAgKEpT Qzo6VW5saW5rZWRDb2RlQmxvY2s6OmNvbnN0YW50U291cmNlQ29kZVJlcHJlc2VudGF0aW9uIGNv bnN0KToKKyAgICAgICAgKiBieXRlY29kZS9VbmxpbmtlZENvZGVCbG9ja0dlbmVyYXRvci5oOgor ICAgICAgICAoSlNDOjpVbmxpbmtlZENvZGVCbG9ja0dlbmVyYXRvcjo6Y29uc3RhbnRTb3VyY2VD b2RlUmVwcmVzZW50YXRpb24gY29uc3QpOgorICAgICAgICAoSlNDOjpVbmxpbmtlZENvZGVCbG9j a0dlbmVyYXRvcjo6Y29uc3RhbnRzU291cmNlQ29kZVJlcHJlc2VudGF0aW9uKTogRGVsZXRlZC4K KyAgICAgICAgKiBkZmcvREZHR3JhcGguY3BwOgorICAgICAgICAoSlNDOjpERkc6OkdyYXBoOjpy ZWdpc3RlckZyb3plblZhbHVlcyk6CisKIDIwMjEtMDQtMTIgIE1hcmsgTGFtICA8bWFyay5sYW1A YXBwbGUuY29tPgogCiAgICAgICAgIEludGVycHJldGVyOjpleGVjdXRlUHJvZ3JhbSgpIHNob3Vs ZCBpbnN0YWxsIGl0cyBWTUVudHJ5U2NvcGUgYXQgdGhlIHRvcC4KZGlmZiAtLWdpdCBhL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9CeXRlY29kZUR1bXBlci5jcHAgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvYnl0ZWNvZGUvQnl0ZWNvZGVEdW1wZXIuY3BwCmluZGV4IDJlMjVlMDdkZjgx NzU3MGQ0NTYyOTUzMjExNWVkZjQyMDZlMThiNjguLjAwZjllYzk3Y2U3MmU5NmFmN2ExM2IzYjRk NmY5ZTczYmNlNTIyM2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29k ZS9CeXRlY29kZUR1bXBlci5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2Rl L0J5dGVjb2RlRHVtcGVyLmNwcApAQCAtMTM3LDcgKzEzNyw3IEBAIHZvaWQgQ29kZUJsb2NrQnl0 ZWNvZGVEdW1wZXI8QmxvY2s+OjpkdW1wQ29uc3RhbnRzKCkKICAgICAgICAgc2l6ZV90IGkgPSAw OwogICAgICAgICBmb3IgKGNvbnN0IGF1dG8mIGNvbnN0YW50IDogdGhpcy0+YmxvY2soKS0+Y29u c3RhbnRSZWdpc3RlcnMoKSkgewogICAgICAgICAgICAgY29uc3QgY2hhciogc291cmNlQ29kZVJl cHJlc2VudGF0aW9uRGVzY3JpcHRpb24gPSBudWxscHRyOwotICAgICAgICAgICAgc3dpdGNoICh0 aGlzLT5ibG9jaygpLT5jb25zdGFudHNTb3VyY2VDb2RlUmVwcmVzZW50YXRpb24oKVtpXSkgewor ICAgICAgICAgICAgc3dpdGNoICh0aGlzLT5ibG9jaygpLT5jb25zdGFudFNvdXJjZUNvZGVSZXBy ZXNlbnRhdGlvbihpKSkgewogICAgICAgICAgICAgY2FzZSBTb3VyY2VDb2RlUmVwcmVzZW50YXRp b246OkRvdWJsZToKICAgICAgICAgICAgICAgICBzb3VyY2VDb2RlUmVwcmVzZW50YXRpb25EZXNj cmlwdGlvbiA9ICI6IGluIHNvdXJjZSBhcyBkb3VibGUiOwogICAgICAgICAgICAgICAgIGJyZWFr OwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0NvZGVCbG9jay5j cHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvQ29kZUJsb2NrLmNwcAppbmRleCA5 Mzg3ZmZjNzlkZmFkZmY3NmI2MTdlMzlkNzAyZTE5YjVhNDM1ZDc2Li5kYjgyODZhODc0NzgzMGIz N2Y3MDE3ZmFjOTkyNzYyZDIxMzBiMDgzIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvYnl0ZWNvZGUvQ29kZUJsb2NrLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0 ZWNvZGUvQ29kZUJsb2NrLmNwcApAQCAtMjk2LDcgKzI5Niw2IEBAIENvZGVCbG9jazo6Q29kZUJs b2NrKFZNJiB2bSwgU3RydWN0dXJlKiBzdHJ1Y3R1cmUsIENvcHlQYXJzZWRCbG9ja1RhZywgQ29k ZUJsb2NrCiAgICAgLCBtX3ZtKG90aGVyLm1fdm0pCiAgICAgLCBtX2luc3RydWN0aW9uc1Jhd1Bv aW50ZXIob3RoZXIubV9pbnN0cnVjdGlvbnNSYXdQb2ludGVyKQogICAgICwgbV9jb25zdGFudFJl Z2lzdGVycyhvdGhlci5tX2NvbnN0YW50UmVnaXN0ZXJzKQotICAgICwgbV9jb25zdGFudHNTb3Vy Y2VDb2RlUmVwcmVzZW50YXRpb24ob3RoZXIubV9jb25zdGFudHNTb3VyY2VDb2RlUmVwcmVzZW50 YXRpb24pCiAgICAgLCBtX2Z1bmN0aW9uRGVjbHMob3RoZXIubV9mdW5jdGlvbkRlY2xzKQogICAg ICwgbV9mdW5jdGlvbkV4cHJzKG90aGVyLm1fZnVuY3Rpb25FeHBycykKICAgICAsIG1fb3NyRXhp dENvdW50ZXIoMCkKQEAgLTg4MywxMiArODgyLDEwIEBAIHZvaWQgQ29kZUJsb2NrOjpzZXRDb25z dGFudFJlZ2lzdGVycyhjb25zdCBGaXhlZFZlY3RvcjxXcml0ZUJhcnJpZXI8VW5rbm93bj4+JiBj CiAgICAgewogICAgICAgICBDb25jdXJyZW50SlNMb2NrZXIgbG9ja2VyKG1fbG9jayk7CiAgICAg ICAgIG1fY29uc3RhbnRSZWdpc3RlcnMucmVzaXplVG9GaXQoY291bnQpOwotICAgICAgICBtX2Nv bnN0YW50c1NvdXJjZUNvZGVSZXByZXNlbnRhdGlvbi5yZXNpemVUb0ZpdChjb3VudCk7CiAgICAg fQogICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgY291bnQ7IGkrKykgewogICAgICAgICBKU1Zh bHVlIGNvbnN0YW50ID0gY29uc3RhbnRzW2ldLmdldCgpOwogICAgICAgICBTb3VyY2VDb2RlUmVw cmVzZW50YXRpb24gcmVwcmVzZW50YXRpb24gPSBjb25zdGFudHNTb3VyY2VDb2RlUmVwcmVzZW50 YXRpb25baV07Ci0gICAgICAgIG1fY29uc3RhbnRzU291cmNlQ29kZVJlcHJlc2VudGF0aW9uW2ld ID0gcmVwcmVzZW50YXRpb247CiAgICAgICAgIHN3aXRjaCAocmVwcmVzZW50YXRpb24pIHsKICAg ICAgICAgY2FzZSBTb3VyY2VDb2RlUmVwcmVzZW50YXRpb246OkxpbmtUaW1lQ29uc3RhbnQ6CiAg ICAgICAgICAgICBjb25zdGFudCA9IGdsb2JhbE9iamVjdC0+bGlua1RpbWVDb25zdGFudChzdGF0 aWNfY2FzdDxMaW5rVGltZUNvbnN0YW50Pihjb25zdGFudC5hc0ludDMyQXNBbnlJbnQoKSkpOwpA QCAtMjEyNCw3ICsyMTIxLDYgQEAgdm9pZCBDb2RlQmxvY2s6OnNocmlua1RvRml0KGNvbnN0IENv bmN1cnJlbnRKU0xvY2tlciYsIFNocmlua01vZGUgc2hyaW5rTW9kZSkKICNlbHNlCiAgICAgbV9j b25zdGFudFJlZ2lzdGVycy5zaHJpbmtUb0ZpdCgpOwogI2VuZGlmCi0gICAgbV9jb25zdGFudHNT b3VyY2VDb2RlUmVwcmVzZW50YXRpb24uc2hyaW5rVG9GaXQoKTsKIAogICAgIGlmIChzaHJpbmtN b2RlID09IFNocmlua01vZGU6OkVhcmx5U2hyaW5rKSB7CiAgICAgICAgIGlmIChtX3JhcmVEYXRh KQpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0NvZGVCbG9jay5o IGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0NvZGVCbG9jay5oCmluZGV4IDI5Mjc3 YTJmODk0ODdlYTQ0MGYwNTAyZDc5ZTJmN2VjMzNlNWQwNTUuLjZmODAwNDk0OTUyYTkyMDcwN2Y2 NGMwOWZmMGYzMzJmYzA4MDk4MDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9i eXRlY29kZS9Db2RlQmxvY2suaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUv Q29kZUJsb2NrLmgKQEAgLTU3MiwxMyArNTcyLDExIEBAIGNsYXNzIENvZGVCbG9jayA6IHB1Ymxp YyBKU0NlbGwgewogI2VuZGlmCiAKICAgICBWZWN0b3I8V3JpdGVCYXJyaWVyPFVua25vd24+PiYg Y29uc3RhbnRzKCkgeyByZXR1cm4gbV9jb25zdGFudFJlZ2lzdGVyczsgfQotICAgIFZlY3RvcjxT b3VyY2VDb2RlUmVwcmVzZW50YXRpb24+JiBjb25zdGFudHNTb3VyY2VDb2RlUmVwcmVzZW50YXRp b24oKSB7IHJldHVybiBtX2NvbnN0YW50c1NvdXJjZUNvZGVSZXByZXNlbnRhdGlvbjsgfQogICAg IHVuc2lnbmVkIGFkZENvbnN0YW50KGNvbnN0IENvbmN1cnJlbnRKU0xvY2tlciYsIEpTVmFsdWUg dikKICAgICB7CiAgICAgICAgIHVuc2lnbmVkIHJlc3VsdCA9IG1fY29uc3RhbnRSZWdpc3RlcnMu c2l6ZSgpOwogICAgICAgICBtX2NvbnN0YW50UmVnaXN0ZXJzLmFwcGVuZChXcml0ZUJhcnJpZXI8 VW5rbm93bj4oKSk7CiAgICAgICAgIG1fY29uc3RhbnRSZWdpc3RlcnMubGFzdCgpLnNldCgqbV92 bSwgdGhpcywgdik7Ci0gICAgICAgIG1fY29uc3RhbnRzU291cmNlQ29kZVJlcHJlc2VudGF0aW9u LmFwcGVuZChTb3VyY2VDb2RlUmVwcmVzZW50YXRpb246Ok90aGVyKTsKICAgICAgICAgcmV0dXJu IHJlc3VsdDsKICAgICB9CiAKQEAgLTU4NiwxNCArNTg0LDE0IEBAIGNsYXNzIENvZGVCbG9jayA6 IHB1YmxpYyBKU0NlbGwgewogICAgIHsKICAgICAgICAgdW5zaWduZWQgcmVzdWx0ID0gbV9jb25z dGFudFJlZ2lzdGVycy5zaXplKCk7CiAgICAgICAgIG1fY29uc3RhbnRSZWdpc3RlcnMuYXBwZW5k KFdyaXRlQmFycmllcjxVbmtub3duPigpKTsKLSAgICAgICAgbV9jb25zdGFudHNTb3VyY2VDb2Rl UmVwcmVzZW50YXRpb24uYXBwZW5kKFNvdXJjZUNvZGVSZXByZXNlbnRhdGlvbjo6T3RoZXIpOwog ICAgICAgICByZXR1cm4gcmVzdWx0OwogICAgIH0KIAogICAgIGNvbnN0IFZlY3RvcjxXcml0ZUJh cnJpZXI8VW5rbm93bj4+JiBjb25zdGFudFJlZ2lzdGVycygpIHsgcmV0dXJuIG1fY29uc3RhbnRS ZWdpc3RlcnM7IH0KICAgICBXcml0ZUJhcnJpZXI8VW5rbm93bj4mIGNvbnN0YW50UmVnaXN0ZXIo VmlydHVhbFJlZ2lzdGVyIHJlZykgeyByZXR1cm4gbV9jb25zdGFudFJlZ2lzdGVyc1tyZWcudG9D b25zdGFudEluZGV4KCldOyB9CiAgICAgQUxXQVlTX0lOTElORSBKU1ZhbHVlIGdldENvbnN0YW50 KFZpcnR1YWxSZWdpc3RlciByZWcpIGNvbnN0IHsgcmV0dXJuIG1fY29uc3RhbnRSZWdpc3RlcnNb cmVnLnRvQ29uc3RhbnRJbmRleCgpXS5nZXQoKTsgfQotICAgIEFMV0FZU19JTkxJTkUgU291cmNl Q29kZVJlcHJlc2VudGF0aW9uIGNvbnN0YW50U291cmNlQ29kZVJlcHJlc2VudGF0aW9uKFZpcnR1 YWxSZWdpc3RlciByZWcpIGNvbnN0IHsgcmV0dXJuIG1fY29uc3RhbnRzU291cmNlQ29kZVJlcHJl c2VudGF0aW9uW3JlZy50b0NvbnN0YW50SW5kZXgoKV07IH0KKyAgICBBTFdBWVNfSU5MSU5FIFNv dXJjZUNvZGVSZXByZXNlbnRhdGlvbiBjb25zdGFudFNvdXJjZUNvZGVSZXByZXNlbnRhdGlvbihW aXJ0dWFsUmVnaXN0ZXIgcmVnKSBjb25zdCB7IHJldHVybiBtX3VubGlua2VkQ29kZS0+Y29uc3Rh bnRTb3VyY2VDb2RlUmVwcmVzZW50YXRpb24ocmVnKTsgfQorICAgIEFMV0FZU19JTkxJTkUgU291 cmNlQ29kZVJlcHJlc2VudGF0aW9uIGNvbnN0YW50U291cmNlQ29kZVJlcHJlc2VudGF0aW9uKHVu c2lnbmVkIGluZGV4KSBjb25zdCB7IHJldHVybiBtX3VubGlua2VkQ29kZS0+Y29uc3RhbnRTb3Vy Y2VDb2RlUmVwcmVzZW50YXRpb24oaW5kZXgpOyB9CiAKICAgICBGdW5jdGlvbkV4ZWN1dGFibGUq IGZ1bmN0aW9uRGVjbChpbnQgaW5kZXgpIHsgcmV0dXJuIG1fZnVuY3Rpb25EZWNsc1tpbmRleF0u Z2V0KCk7IH0KICAgICBpbnQgbnVtYmVyT2ZGdW5jdGlvbkRlY2xzKCkgeyByZXR1cm4gbV9mdW5j dGlvbkRlY2xzLnNpemUoKTsgfQpAQCAtMTA0Niw3ICsxMDQ0LDYgQEAgY2xhc3MgQ29kZUJsb2Nr IDogcHVibGljIEpTQ2VsbCB7CiAgICAgLy8gVE9ETzogVGhpcyBjb3VsZCBqdXN0IGJlIGEgcG9p bnRlciB0byBtX3VubGlua2VkQ29kZUJsb2NrJ3MgZGF0YSwgYnV0IHRoZSBERkcgbXV0YXRlcwog ICAgIC8vIGl0LCBzbyB3ZSdyZSBzdHVjayB3aXRoIGl0IGZvciBub3cuCiAgICAgVmVjdG9yPFdy aXRlQmFycmllcjxVbmtub3duPj4gbV9jb25zdGFudFJlZ2lzdGVyczsKLSAgICBWZWN0b3I8U291 cmNlQ29kZVJlcHJlc2VudGF0aW9uPiBtX2NvbnN0YW50c1NvdXJjZUNvZGVSZXByZXNlbnRhdGlv bjsKICAgICBGaXhlZFZlY3RvcjxXcml0ZUJhcnJpZXI8RnVuY3Rpb25FeGVjdXRhYmxlPj4gbV9m dW5jdGlvbkRlY2xzOwogICAgIEZpeGVkVmVjdG9yPFdyaXRlQmFycmllcjxGdW5jdGlvbkV4ZWN1 dGFibGU+PiBtX2Z1bmN0aW9uRXhwcnM7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9ieXRlY29kZS9VbmxpbmtlZENvZGVCbG9jay5oIGIvU291cmNlL0phdmFTY3JpcHRDb3Jl L2J5dGVjb2RlL1VubGlua2VkQ29kZUJsb2NrLmgKaW5kZXggNDY5ZjFjOWM0ODdlMGI0NjcxODNh MzQwYjZlMmJhOWJiM2Q2NzYxYS4uYWQ1NzE3MzA4NDQzNDdmMzVhOThmZTZiMDljODMwMzg1MzY3 ZGYxMCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL1VubGlua2Vk Q29kZUJsb2NrLmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL1VubGlua2Vk Q29kZUJsb2NrLmgKQEAgLTE2MSw2ICsxNjEsMTcgQEAgY2xhc3MgVW5saW5rZWRDb2RlQmxvY2sg OiBwdWJsaWMgSlNDZWxsIHsKICAgICBBTFdBWVNfSU5MSU5FIEpTVmFsdWUgZ2V0Q29uc3RhbnQo VmlydHVhbFJlZ2lzdGVyIHJlZykgY29uc3QgeyByZXR1cm4gbV9jb25zdGFudFJlZ2lzdGVyc1ty ZWcudG9Db25zdGFudEluZGV4KCldLmdldCgpOyB9CiAgICAgY29uc3QgRml4ZWRWZWN0b3I8U291 cmNlQ29kZVJlcHJlc2VudGF0aW9uPiYgY29uc3RhbnRzU291cmNlQ29kZVJlcHJlc2VudGF0aW9u KCkgeyByZXR1cm4gbV9jb25zdGFudHNTb3VyY2VDb2RlUmVwcmVzZW50YXRpb247IH0KIAorICAg IFNvdXJjZUNvZGVSZXByZXNlbnRhdGlvbiBjb25zdGFudFNvdXJjZUNvZGVSZXByZXNlbnRhdGlv bihWaXJ0dWFsUmVnaXN0ZXIgcmVnKSBjb25zdAorICAgIHsKKyAgICAgICAgcmV0dXJuIGNvbnN0 YW50U291cmNlQ29kZVJlcHJlc2VudGF0aW9uKHJlZy50b0NvbnN0YW50SW5kZXgoKSk7CisgICAg fQorICAgIFNvdXJjZUNvZGVSZXByZXNlbnRhdGlvbiBjb25zdGFudFNvdXJjZUNvZGVSZXByZXNl bnRhdGlvbih1bnNpZ25lZCBpbmRleCkgY29uc3QKKyAgICB7CisgICAgICAgIGlmIChpbmRleCA8 IG1fY29uc3RhbnRzU291cmNlQ29kZVJlcHJlc2VudGF0aW9uLnNpemUoKSkKKyAgICAgICAgICAg IHJldHVybiBtX2NvbnN0YW50c1NvdXJjZUNvZGVSZXByZXNlbnRhdGlvbltpbmRleF07CisgICAg ICAgIHJldHVybiBTb3VyY2VDb2RlUmVwcmVzZW50YXRpb246Ok90aGVyOworICAgIH0KKwogICAg IHVuc2lnbmVkIG51bWJlck9mQ29uc3RhbnRJZGVudGlmaWVyU2V0cygpIGNvbnN0IHsgcmV0dXJu IG1fcmFyZURhdGEgPyBtX3JhcmVEYXRhLT5tX2NvbnN0YW50SWRlbnRpZmllclNldHMuc2l6ZSgp IDogMDsgfQogICAgIGNvbnN0IEZpeGVkVmVjdG9yPElkZW50aWZpZXJTZXQ+JiBjb25zdGFudElk ZW50aWZpZXJTZXRzKCkgeyBBU1NFUlQobV9yYXJlRGF0YSk7IHJldHVybiBtX3JhcmVEYXRhLT5t X2NvbnN0YW50SWRlbnRpZmllclNldHM7IH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3Jp cHRDb3JlL2J5dGVjb2RlL1VubGlua2VkQ29kZUJsb2NrR2VuZXJhdG9yLmggYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvYnl0ZWNvZGUvVW5saW5rZWRDb2RlQmxvY2tHZW5lcmF0b3IuaAppbmRleCAx MTE0OTA0YzJmN2FiZGFiNjUwZmNhYjE3ZDlhNDdmMDc3NGQ4ZjE0Li40OTMwYTU2OTFkZjdiY2U5 ZjQ1OTRhMzhjZGEwN2EyNzRmN2U3NjMxIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvYnl0ZWNvZGUvVW5saW5rZWRDb2RlQmxvY2tHZW5lcmF0b3IuaAorKysgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvYnl0ZWNvZGUvVW5saW5rZWRDb2RlQmxvY2tHZW5lcmF0b3IuaApAQCAtMTI0 LDcgKzEyNCwxNyBAQCBjbGFzcyBVbmxpbmtlZENvZGVCbG9ja0dlbmVyYXRvciB7CiAgICAgY29u c3QgV3JpdGVCYXJyaWVyPFVua25vd24+JiBjb25zdGFudFJlZ2lzdGVyKFZpcnR1YWxSZWdpc3Rl ciByZWcpIGNvbnN0IHsgcmV0dXJuIG1fY29uc3RhbnRSZWdpc3RlcnNbcmVnLnRvQ29uc3RhbnRJ bmRleCgpXTsgfQogICAgIGNvbnN0IFZlY3RvcjxXcml0ZUJhcnJpZXI8VW5rbm93bj4+JiBjb25z dGFudFJlZ2lzdGVycygpIHsgcmV0dXJuIG1fY29uc3RhbnRSZWdpc3RlcnM7IH0KICAgICBBTFdB WVNfSU5MSU5FIEpTVmFsdWUgZ2V0Q29uc3RhbnQoVmlydHVhbFJlZ2lzdGVyIHJlZykgY29uc3Qg eyByZXR1cm4gbV9jb25zdGFudFJlZ2lzdGVyc1tyZWcudG9Db25zdGFudEluZGV4KCldLmdldCgp OyB9Ci0gICAgY29uc3QgVmVjdG9yPFNvdXJjZUNvZGVSZXByZXNlbnRhdGlvbj4mIGNvbnN0YW50 c1NvdXJjZUNvZGVSZXByZXNlbnRhdGlvbigpIHsgcmV0dXJuIG1fY29uc3RhbnRzU291cmNlQ29k ZVJlcHJlc2VudGF0aW9uOyB9CisKKyAgICBTb3VyY2VDb2RlUmVwcmVzZW50YXRpb24gY29uc3Rh bnRTb3VyY2VDb2RlUmVwcmVzZW50YXRpb24oVmlydHVhbFJlZ2lzdGVyIHJlZykgY29uc3QKKyAg ICB7CisgICAgICAgIHJldHVybiBjb25zdGFudFNvdXJjZUNvZGVSZXByZXNlbnRhdGlvbihyZWcu dG9Db25zdGFudEluZGV4KCkpOworICAgIH0KKyAgICBTb3VyY2VDb2RlUmVwcmVzZW50YXRpb24g Y29uc3RhbnRTb3VyY2VDb2RlUmVwcmVzZW50YXRpb24odW5zaWduZWQgaW5kZXgpIGNvbnN0Cisg ICAgeworICAgICAgICBpZiAoaW5kZXggPCBtX2NvbnN0YW50c1NvdXJjZUNvZGVSZXByZXNlbnRh dGlvbi5zaXplKCkpCisgICAgICAgICAgICByZXR1cm4gbV9jb25zdGFudHNTb3VyY2VDb2RlUmVw cmVzZW50YXRpb25baW5kZXhdOworICAgICAgICByZXR1cm4gU291cmNlQ29kZVJlcHJlc2VudGF0 aW9uOjpPdGhlcjsKKyAgICB9CiAKICAgICB1bnNpZ25lZCBhZGRDb25zdGFudChKU1ZhbHVlIHYs IFNvdXJjZUNvZGVSZXByZXNlbnRhdGlvbiBzb3VyY2VDb2RlUmVwcmVzZW50YXRpb24gPSBTb3Vy Y2VDb2RlUmVwcmVzZW50YXRpb246Ok90aGVyKQogICAgIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9kZmcvREZHR3JhcGguY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2Rm Zy9ERkdHcmFwaC5jcHAKaW5kZXggYTM0OGJmZjQ0MDdjMzEwZmFkNDQ5ODBlZGFlOTFiMmNjYWVk ODkyNS4uMzY4MDZmOTdkZGVmODEzNDE1ZWEzNmI1N2IwMzYzODJhYzdmZGMwMiAxMDA2NDQKLS0t IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdHcmFwaC5jcHAKKysrIGIvU291cmNlL0ph dmFTY3JpcHRDb3JlL2RmZy9ERkdHcmFwaC5jcHAKQEAgLTE0MjQsNyArMTQyNCw2IEBAIHZvaWQg R3JhcGg6OnJlZ2lzdGVyRnJvemVuVmFsdWVzKCkKIHsKICAgICBDb25jdXJyZW50SlNMb2NrZXIg bG9ja2VyKG1fY29kZUJsb2NrLT5tX2xvY2spOwogICAgIG1fY29kZUJsb2NrLT5jb25zdGFudHMo KS5zaHJpbmsoMCk7Ci0gICAgbV9jb2RlQmxvY2stPmNvbnN0YW50c1NvdXJjZUNvZGVSZXByZXNl bnRhdGlvbigpLnJlc2l6ZSgwKTsKICAgICBmb3IgKEZyb3plblZhbHVlKiB2YWx1ZSA6IG1fZnJv emVuVmFsdWVzKSB7CiAgICAgICAgIGlmICghdmFsdWUtPnBvaW50c1RvSGVhcCgpKQogICAgICAg ICAgICAgY29udGludWU7CkBAIC0xNDQ1LDcgKzE0NDQsNiBAQCB2b2lkIEdyYXBoOjpyZWdpc3Rl ckZyb3plblZhbHVlcygpCiAgICAgICAgIH0gfQogICAgIH0KICAgICBtX2NvZGVCbG9jay0+Y29u c3RhbnRzKCkuc2hyaW5rVG9GaXQoKTsKLSAgICBtX2NvZGVCbG9jay0+Y29uc3RhbnRzU291cmNl Q29kZVJlcHJlc2VudGF0aW9uKCkuc2hyaW5rVG9GaXQoKTsKIH0KIAogdGVtcGxhdGU8dHlwZW5h bWUgVmlzaXRvcj4K