150958 2015-11-05 15:06:51 -0800 B3::reduceStrength should canonicalize integer comparisons 2018-03-12 17:24:21 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 150721 154319 183543 1 fpizlo ysuzuki commit-queue ews-watchlist fpizlo keith_miller lforschler mark.lam msaboff saam webkit-bug-importer ysuzuki oldest_to_newest 1139791 0 fpizlo 2015-11-05 15:06:51 -0800 Integer comparisons are not necessarily commutative, but you can swap the operands if you also flip the comparison - for example you can turn LessThan(const, var) into GreaterThan(var, const). We should use this property to "sort" the operands the same way we do for commutative operations. This will let us get rid of a lot of cases in the B3::lowerToAir() pattern matching. 1405490 1 335517 ysuzuki 2018-03-10 12:10:17 -0800 Created attachment 335517 Patch 1405491 2 335518 ysuzuki 2018-03-10 12:11:34 -0800 Created attachment 335518 Patch 1405539 3 335518 ysuzuki 2018-03-10 22:50:29 -0800 Comment on attachment 335518 Patch Thanks! 1405541 4 335518 commit-queue 2018-03-10 23:16:20 -0800 Comment on attachment 335518 Patch Clearing flags on attachment: 335518 Committed r229513: <https://trac.webkit.org/changeset/229513> 1405542 5 commit-queue 2018-03-10 23:16:21 -0800 All reviewed patches have been landed. Closing bug. 1405558 6 ysuzuki 2018-03-11 09:51:04 -0700 Oops, this patch may create an orphan value which is not allowed by B3Validate. It is also fixed in bug 183543. 1405996 7 webkit-bug-importer 2018-03-12 17:24:21 -0700 <rdar://problem/38397856> 335517 2018-03-10 12:10:17 -0800 2018-03-10 12:11:32 -0800 Patch bug-150958-20180311051016.patch text/plain 11137 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjI5NTAzCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBj Yjc3YWExZjAxNzkwM2QzNDZjYjM0ODJhNjMyMjAxZWMyZjM1ZWM0Li42YThjMzIyYWUyMTY1YmZj ZTUzYjViYTFhNzdmODRiNTI3YjljMDRhIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNSBAQAorMjAxOC0wMy0xMCAgWXVzdWtlIFN1enVraSAgPHV0YXRhbmUudGVhQGdtYWls LmNvbT4KKworICAgICAgICBCMzo6cmVkdWNlU3RyZW5ndGggc2hvdWxkIGNhbm9uaWNhbGl6ZSBp bnRlZ2VyIGNvbXBhcmlzb25zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xNTA5NTgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBUaGlzIHBhdGNoIHNvcnRzIG9wZXJhbmRzIG9mIGNvbXBhcmlzb25zIGJ5IGZs aXBwaW5nIG9wY29kZS4gRm9yIGV4YW1wbGUsIGBBYm92ZSgwLCBAMilgIGlzCisgICAgICAgIGNv bnZlcnRlZCB0byBgQmVsb3coQDIsIDApYC4gVGhpcyBzb3J0aW5nIGlzIHRoZSBzYW1lIHRvIGhh bmRsZUNvbW11dGF0aXZpdHkgcnVsZS4gU2luY2Ugd2UKKyAgICAgICAgY2Fub25pY2FsaXplIGNv bXBhcmlzb25zIHRvIGhhdmUgY29uc3RhbnQgdmFsdWUgYXQgbGVhc3Qgb24gdGhlIHJpZ2h0IGhh bmQgc2lkZSwgd2UgY2FuCisgICAgICAgIHJlbW92ZSBwYXR0ZXJuIG1hdGNoaW5ncyBjaGVja2lu ZyBsZWZ0SW1tIGluIEIzTG93ZXJUb0Fpci4KKworICAgICAgICBTaW5jZSB0aGlzIGZsaXBwaW5n IGNoYW5nZXMgdGhlIG9wY29kZSBvZiB0aGUgdmFsdWUsIHRvIGFjaGlldmUgc2FmZWx5LCB3ZSBq dXN0IGNyZWF0ZSBhCisgICAgICAgIG5ldyB2YWx1ZSB3aGljaCBoYXMgZmxpcHBlZCBvcGNvZGUg YW5kIHN3YXBwZWQgb3BlcmFuZHMuIElmIHdlIGNhbiBmb2xkIGl0IHRvIGEgY29uc3RhbnQsCisg ICAgICAgIHdlIHJlcGxhY2UgbV92YWx1ZSB3aXRoIHRoaXMgY29uc3RhbnQuIElmIHdlIGZhaWwg dG8gZm9sZCBpdCB0byBjb25zdGFudCwgd2UgcmVwbGFjZQorICAgICAgICBtX3ZhbHVlIHdpdGgg dGhlIGZsaXBwZWQgb25lLgorCisgICAgICAgIFRoZXNlIGNvbXBhcmlzb25zIGFyZSBhbHJlYWR5 IGhhbmRsZWQgaW4gdGVzdGIzLgorCisgICAgICAgICogYjMvQjNMb3dlclRvQWlyLmNwcDoKKyAg ICAgICAgKiBiMy9CM1JlZHVjZVN0cmVuZ3RoLmNwcDoKKwogMjAxOC0wMy0wOSAgQnJpYW4gQnVy ZyAgPGJidXJnQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiB0aGVyZSBzaG91 bGQgb25seSBiZSBvbmUgd2F5IGZvciBhc3luYyBiYWNrZW5kIGNvbW1hbmRzIHRvIHNlbmQgZmFp bHVyZQpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2IzL0IzTG93ZXJUb0Fpci5j cHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYjMvQjNMb3dlclRvQWlyLmNwcAppbmRleCBhMDhl MWI0OTgwYTYyNThjZjNjZjhiYmViY2NkNTNkNDBlNjkwMTY0Li5jMjU0YWE4NmVhZWEwNjVlN2Ix ZTk5Y2JiNTE0YzZlMzUwMGMwOTE0IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv YjMvQjNMb3dlclRvQWlyLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYjMvQjNMb3dl clRvQWlyLmNwcApAQCAtMTQ2MiwxMSArMTQ2Miw2IEBAIGNsYXNzIExvd2VyVG9BaXIgewogICAg ICAgICAgICAgVmFsdWUqIHJpZ2h0ID0gdmFsdWUtPmNoaWxkKDEpOwogCiAgICAgICAgICAgICBp ZiAoaXNJbnQodmFsdWUtPmNoaWxkKDApLT50eXBlKCkpKSB7Ci0gICAgICAgICAgICAgICAgLy8g RklYTUU6IFdlIHdvdWxkbid0IGhhdmUgdG8gd29ycnkgYWJvdXQgbGVmdEltbSBpZiB3ZSBjYW5v bmljYWxpemVkIGludGVnZXIKLSAgICAgICAgICAgICAgICAvLyBjb21wYXJpc29ucy4KLSAgICAg ICAgICAgICAgICAvLyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUw OTU4Ci0gICAgICAgICAgICAgICAgCi0gICAgICAgICAgICAgICAgQXJnIGxlZnRJbW0gPSBpbW0o bGVmdCk7CiAgICAgICAgICAgICAgICAgQXJnIHJpZ2h0SW1tID0gaW1tKHJpZ2h0KTsKIAogICAg ICAgICAgICAgICAgIGF1dG8gdHJ5Q29tcGFyZSA9IFsmXSAoCkBAIC0xNDg2LDEyICsxNDgxLDYg QEAgY2xhc3MgTG93ZXJUb0FpciB7CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJu IHJlc3VsdDsKICAgICAgICAgICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICAgICAg fQotICAgICAgICAgICAgICAgICAgICBpZiAobGVmdEltbSAmJiBsZWZ0SW1tLmlzUmVwcmVzZW50 YWJsZUFzKHdpZHRoLCBzaWduZWRuZXNzKSkgewotICAgICAgICAgICAgICAgICAgICAgICAgaWYg KEluc3QgcmVzdWx0ID0gdHJ5Q29tcGFyZSh3aWR0aCwgbGVmdEltbSwgbG9hZFByb21pc2Uocmln aHQsIGxvYWRPcGNvZGUpKSkgewotICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbW1pdElu dGVybmFsKHJpZ2h0KTsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICByZXR1cm4gcmVzdWx0 OwotICAgICAgICAgICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICAgICAgICB9CiAgICAg ICAgICAgICAgICAgICAgIHJldHVybiBJbnN0KCk7CiAgICAgICAgICAgICAgICAgfTsKIApAQCAt MTU0OCwxMSArMTUzNyw2IEBAIGNsYXNzIExvd2VyVG9BaXIgewogCiAgICAgICAgICAgICAgICAg Ly8gTm93IGhhbmRsZSBjb21wYXJlcyB0aGF0IGludm9sdmUgYW4gaW1tZWRpYXRlIGFuZCBhIHRt cC4KICAgICAgICAgICAgICAgICAKLSAgICAgICAgICAgICAgICBpZiAobGVmdEltbSAmJiBsZWZ0 SW1tLmlzUmVwcmVzZW50YWJsZUFzPGludDMyX3Q+KCkpIHsKLSAgICAgICAgICAgICAgICAgICAg aWYgKEluc3QgcmVzdWx0ID0gdHJ5Q29tcGFyZSh3aWR0aCwgbGVmdEltbSwgdG1wUHJvbWlzZShy aWdodCkpKQotICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIHJlc3VsdDsKLSAgICAgICAg ICAgICAgICB9Ci0gICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgaWYgKHJpZ2h0SW1t ICYmIHJpZ2h0SW1tLmlzUmVwcmVzZW50YWJsZUFzPGludDMyX3Q+KCkpIHsKICAgICAgICAgICAg ICAgICAgICAgaWYgKEluc3QgcmVzdWx0ID0gdHJ5Q29tcGFyZSh3aWR0aCwgdG1wUHJvbWlzZShs ZWZ0KSwgcmlnaHRJbW0pKQogICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIHJlc3VsdDsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9iMy9CM1JlZHVjZVN0cmVuZ3RoLmNw cCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9iMy9CM1JlZHVjZVN0cmVuZ3RoLmNwcAppbmRleCA1 NTAyZDVlNDdlNTg3MDYxMDYyYjE2ODZkOWJiM2MyNjkzNThiOTQ5Li4xMjI5Mjg4OGFhYzIzNWJh NzBlZmY5NWI4NjEzYzcwOTQxZGVjYmI4IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvYjMvQjNSZWR1Y2VTdHJlbmd0aC5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2Iz L0IzUmVkdWNlU3RyZW5ndGguY3BwCkBAIC0xNjY2LDYzICsxNjY2LDU1IEBAIGNsYXNzIFJlZHVj ZVN0cmVuZ3RoIHsKICAgICAgICAgICAgIGJyZWFrOwogCiAgICAgICAgIGNhc2UgTGVzc1RoYW46 Ci0gICAgICAgICAgICAvLyBGSVhNRTogV2UgY291bGQgZG8gYSBiZXR0ZXIgam9iIG9mIGNhbm9u aWNhbGl6aW5nIGludGVnZXIgY29tcGFyaXNvbnMuCi0gICAgICAgICAgICAvLyBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUwOTU4Ci0KLSAgICAgICAgICAgIHJlcGxh Y2VXaXRoTmV3VmFsdWUoCi0gICAgICAgICAgICAgICAgbV9wcm9jLmFkZEJvb2xDb25zdGFudCgK LSAgICAgICAgICAgICAgICAgICAgbV92YWx1ZS0+b3JpZ2luKCksCi0gICAgICAgICAgICAgICAg ICAgIG1fdmFsdWUtPmNoaWxkKDApLT5sZXNzVGhhbkNvbnN0YW50KG1fdmFsdWUtPmNoaWxkKDEp KSkpOwotICAgICAgICAgICAgYnJlYWs7Ci0KICAgICAgICAgY2FzZSBHcmVhdGVyVGhhbjoKLSAg ICAgICAgICAgIHJlcGxhY2VXaXRoTmV3VmFsdWUoCi0gICAgICAgICAgICAgICAgbV9wcm9jLmFk ZEJvb2xDb25zdGFudCgKLSAgICAgICAgICAgICAgICAgICAgbV92YWx1ZS0+b3JpZ2luKCksCi0g ICAgICAgICAgICAgICAgICAgIG1fdmFsdWUtPmNoaWxkKDApLT5ncmVhdGVyVGhhbkNvbnN0YW50 KG1fdmFsdWUtPmNoaWxkKDEpKSkpOwotICAgICAgICAgICAgYnJlYWs7Ci0KICAgICAgICAgY2Fz ZSBMZXNzRXF1YWw6Ci0gICAgICAgICAgICByZXBsYWNlV2l0aE5ld1ZhbHVlKAotICAgICAgICAg ICAgICAgIG1fcHJvYy5hZGRCb29sQ29uc3RhbnQoCi0gICAgICAgICAgICAgICAgICAgIG1fdmFs dWUtPm9yaWdpbigpLAotICAgICAgICAgICAgICAgICAgICBtX3ZhbHVlLT5jaGlsZCgwKS0+bGVz c0VxdWFsQ29uc3RhbnQobV92YWx1ZS0+Y2hpbGQoMSkpKSk7Ci0gICAgICAgICAgICBicmVhazsK LQogICAgICAgICBjYXNlIEdyZWF0ZXJFcXVhbDoKLSAgICAgICAgICAgIHJlcGxhY2VXaXRoTmV3 VmFsdWUoCi0gICAgICAgICAgICAgICAgbV9wcm9jLmFkZEJvb2xDb25zdGFudCgKLSAgICAgICAg ICAgICAgICAgICAgbV92YWx1ZS0+b3JpZ2luKCksCi0gICAgICAgICAgICAgICAgICAgIG1fdmFs dWUtPmNoaWxkKDApLT5ncmVhdGVyRXF1YWxDb25zdGFudChtX3ZhbHVlLT5jaGlsZCgxKSkpKTsK LSAgICAgICAgICAgIGJyZWFrOwotCiAgICAgICAgIGNhc2UgQWJvdmU6Ci0gICAgICAgICAgICBy ZXBsYWNlV2l0aE5ld1ZhbHVlKAotICAgICAgICAgICAgICAgIG1fcHJvYy5hZGRCb29sQ29uc3Rh bnQoCi0gICAgICAgICAgICAgICAgICAgIG1fdmFsdWUtPm9yaWdpbigpLAotICAgICAgICAgICAg ICAgICAgICBtX3ZhbHVlLT5jaGlsZCgwKS0+YWJvdmVDb25zdGFudChtX3ZhbHVlLT5jaGlsZCgx KSkpKTsKLSAgICAgICAgICAgIGJyZWFrOwotCiAgICAgICAgIGNhc2UgQmVsb3c6Ci0gICAgICAg ICAgICByZXBsYWNlV2l0aE5ld1ZhbHVlKAotICAgICAgICAgICAgICAgIG1fcHJvYy5hZGRCb29s Q29uc3RhbnQoCi0gICAgICAgICAgICAgICAgICAgIG1fdmFsdWUtPm9yaWdpbigpLAotICAgICAg ICAgICAgICAgICAgICBtX3ZhbHVlLT5jaGlsZCgwKS0+YmVsb3dDb25zdGFudChtX3ZhbHVlLT5j aGlsZCgxKSkpKTsKLSAgICAgICAgICAgIGJyZWFrOwotCiAgICAgICAgIGNhc2UgQWJvdmVFcXVh bDoKLSAgICAgICAgICAgIHJlcGxhY2VXaXRoTmV3VmFsdWUoCi0gICAgICAgICAgICAgICAgbV9w cm9jLmFkZEJvb2xDb25zdGFudCgKLSAgICAgICAgICAgICAgICAgICAgbV92YWx1ZS0+b3JpZ2lu KCksCi0gICAgICAgICAgICAgICAgICAgIG1fdmFsdWUtPmNoaWxkKDApLT5hYm92ZUVxdWFsQ29u c3RhbnQobV92YWx1ZS0+Y2hpbGQoMSkpKSk7Ci0gICAgICAgICAgICBicmVhazsKKyAgICAgICAg Y2FzZSBCZWxvd0VxdWFsOiB7CisgICAgICAgICAgICBhdXRvKiB2YWx1ZSA9IG5ld0NvbXBhcmlz b25WYXVlSWZOZWNlc3NhcnkoKTsKKyAgICAgICAgICAgIFRyaVN0YXRlIHJlc3VsdCA9IE1peGVk VHJpU3RhdGU7CisgICAgICAgICAgICBzd2l0Y2ggKHZhbHVlLT5vcGNvZGUoKSkgeworICAgICAg ICAgICAgY2FzZSBMZXNzVGhhbjoKKyAgICAgICAgICAgICAgICByZXN1bHQgPSB2YWx1ZS0+Y2hp bGQoMSktPmdyZWF0ZXJUaGFuQ29uc3RhbnQodmFsdWUtPmNoaWxkKDApKTsKKyAgICAgICAgICAg ICAgICBicmVhazsKKyAgICAgICAgICAgIGNhc2UgR3JlYXRlclRoYW46CisgICAgICAgICAgICAg ICAgcmVzdWx0ID0gdmFsdWUtPmNoaWxkKDEpLT5sZXNzVGhhbkNvbnN0YW50KHZhbHVlLT5jaGls ZCgwKSk7CisgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICBjYXNlIExlc3NFcXVh bDoKKyAgICAgICAgICAgICAgICByZXN1bHQgPSB2YWx1ZS0+Y2hpbGQoMSktPmdyZWF0ZXJFcXVh bENvbnN0YW50KHZhbHVlLT5jaGlsZCgwKSk7CisgICAgICAgICAgICAgICAgYnJlYWs7CisgICAg ICAgICAgICBjYXNlIEdyZWF0ZXJFcXVhbDoKKyAgICAgICAgICAgICAgICByZXN1bHQgPSB2YWx1 ZS0+Y2hpbGQoMSktPmxlc3NFcXVhbENvbnN0YW50KHZhbHVlLT5jaGlsZCgwKSk7CisgICAgICAg ICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICBjYXNlIEFib3ZlOgorICAgICAgICAgICAgICAg IHJlc3VsdCA9IHZhbHVlLT5jaGlsZCgxKS0+YmVsb3dDb25zdGFudCh2YWx1ZS0+Y2hpbGQoMCkp OworICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgY2FzZSBCZWxvdzoKKyAgICAg ICAgICAgICAgICByZXN1bHQgPSB2YWx1ZS0+Y2hpbGQoMSktPmFib3ZlQ29uc3RhbnQodmFsdWUt PmNoaWxkKDApKTsKKyAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgIGNhc2UgQWJv dmVFcXVhbDoKKyAgICAgICAgICAgICAgICByZXN1bHQgPSB2YWx1ZS0+Y2hpbGQoMSktPmJlbG93 RXF1YWxDb25zdGFudCh2YWx1ZS0+Y2hpbGQoMCkpOworICAgICAgICAgICAgICAgIGJyZWFrOwor ICAgICAgICAgICAgY2FzZSBCZWxvd0VxdWFsOgorICAgICAgICAgICAgICAgIHJlc3VsdCA9IHZh bHVlLT5jaGlsZCgxKS0+YWJvdmVFcXVhbENvbnN0YW50KHZhbHVlLT5jaGlsZCgwKSk7CisgICAg ICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICBkZWZhdWx0OgorICAgICAgICAgICAgICAg IFJFTEVBU0VfQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgICAgICAgICAgICAgYnJlYWs7Cisg ICAgICAgICAgICB9CiAKLSAgICAgICAgY2FzZSBCZWxvd0VxdWFsOgotICAgICAgICAgICAgcmVw bGFjZVdpdGhOZXdWYWx1ZSgKLSAgICAgICAgICAgICAgICBtX3Byb2MuYWRkQm9vbENvbnN0YW50 KAotICAgICAgICAgICAgICAgICAgICBtX3ZhbHVlLT5vcmlnaW4oKSwKLSAgICAgICAgICAgICAg ICAgICAgbV92YWx1ZS0+Y2hpbGQoMCktPmJlbG93RXF1YWxDb25zdGFudChtX3ZhbHVlLT5jaGls ZCgxKSkpKTsKKyAgICAgICAgICAgIGlmIChhdXRvKiBjb25zdGFudCA9IG1fcHJvYy5hZGRCb29s Q29uc3RhbnQodmFsdWUtPm9yaWdpbigpLCByZXN1bHQpKSB7CisgICAgICAgICAgICAgICAgcmVw bGFjZVdpdGhOZXdWYWx1ZShjb25zdGFudCk7CisgICAgICAgICAgICAgICAgYnJlYWs7CisgICAg ICAgICAgICB9CisKKyAgICAgICAgICAgIC8vIFJlcGxhY2Ugd2l0aCBuZXdseSBjcmVhdGVkICJ2 YWx1ZSIuIEl0cyBvcGNvZGUgaXMgZmxpcHBlZCBhbmQgb3BlcmFuZHMgYXJlIHN3YXBwZWQgZnJv bSBtX3ZhbHVlLgorICAgICAgICAgICAgaWYgKG1fdmFsdWUgIT0gdmFsdWUpCisgICAgICAgICAg ICAgICAgcmVwbGFjZVdpdGhOZXdWYWx1ZSh2YWx1ZSk7CiAgICAgICAgICAgICBicmVhazsKKyAg ICAgICAgfQogCiAgICAgICAgIGNhc2UgRXF1YWxPclVub3JkZXJlZDoKICAgICAgICAgICAgIGhh bmRsZUNvbW11dGF0aXZpdHkoKTsKQEAgLTIxMzQsNiArMjEyNiwzMSBAQCBjbGFzcyBSZWR1Y2VT dHJlbmd0aCB7CiAgICAgICAgIHByZWRlY2Vzc29yLT51cGRhdGVQcmVkZWNlc3NvcnNBZnRlcigp OwogICAgIH0KIAorICAgIHN0YXRpYyBib29sIHNob3VsZFN3YXBCaW5hcnlPcGVyYW5kcyhWYWx1 ZSogdmFsdWUpCisgICAgeworICAgICAgICAvLyBOb3RlIHRoYXQgd2UgaGF2ZSBjb21tdXRhdGl2 ZSBvcGVyYXRpb25zIHRoYXQgdGFrZSBtb3JlIHRoYW4gdHdvIGNoaWxkcmVuLiBUaG9zZSBvcGVy YXRpb25zIG1heQorICAgICAgICAvLyBjb21tdXRlIHRoZWlyIGZpcnN0IHR3byBjaGlsZHJlbiB3 aGlsZSBsZWF2aW5nIHRoZSByZXN0IHVuYWZmZWN0ZWQuCisgICAgICAgIEFTU0VSVCh2YWx1ZS0+ bnVtQ2hpbGRyZW4oKSA+PSAyKTsKKworICAgICAgICAvLyBMZWF2ZSBpdCBhbG9uZSBpZiB0aGUg cmlnaHQgY2hpbGQgaXMgYSBjb25zdGFudC4KKyAgICAgICAgaWYgKHZhbHVlLT5jaGlsZCgxKS0+ aXNDb25zdGFudCgpCisgICAgICAgICAgICB8fCB2YWx1ZS0+Y2hpbGQoMCktPm9wY29kZSgpID09 IEF0b21pY1N0cm9uZ0NBUykKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgICAgICBp ZiAodmFsdWUtPmNoaWxkKDApLT5pc0NvbnN0YW50KCkpCisgICAgICAgICAgICByZXR1cm4gdHJ1 ZTsKKworICAgICAgICBpZiAodmFsdWUtPmNoaWxkKDEpLT5vcGNvZGUoKSA9PSBBdG9taWNTdHJv bmdDQVMpCisgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKworICAgICAgICAvLyBTb3J0IHRoZSBv cGVyYW5kcy4gVGhpcyBpcyBhbiBpbXBvcnRhbnQgY2Fub25pY2FsaXphdGlvbi4gV2UgdXNlIHRo ZSBpbmRleCBpbnN0ZWFkIG9mCisgICAgICAgIC8vIHRoZSBhZGRyZXNzIHRvIG1ha2UgdGhpcyBh dCBsZWFzdCBzbGlnaHRseSBkZXRlcm1pbmlzdGljLgorICAgICAgICBpZiAodmFsdWUtPmNoaWxk KDApLT5pbmRleCgpID4gdmFsdWUtPmNoaWxkKDEpLT5pbmRleCgpKQorICAgICAgICAgICAgcmV0 dXJuIHRydWU7CisKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIH0KKwogICAgIC8vIFR1cm4g dGhpczogQWRkKGNvbnN0YW50LCB2YWx1ZSkKICAgICAvLyBJbnRvIHRoaXM6IEFkZCh2YWx1ZSwg Y29uc3RhbnQpCiAgICAgLy8KQEAgLTIxNDMsMzIgKzIxNjAsNDQgQEAgY2xhc3MgUmVkdWNlU3Ry ZW5ndGggewogICAgIC8vIElmIHdlIGRlY2lkZSB0aGF0IHZhbHVlMiBjb21pbmcgZmlyc3QgaXMg dGhlIGNhbm9uaWNhbCBvcmRlcmluZy4KICAgICB2b2lkIGhhbmRsZUNvbW11dGF0aXZpdHkoKQog ICAgIHsKLSAgICAgICAgLy8gTm90ZSB0aGF0IHdlIGhhdmUgY29tbXV0YXRpdmUgb3BlcmF0aW9u cyB0aGF0IHRha2UgbW9yZSB0aGFuIHR3byBjaGlsZHJlbi4gVGhvc2Ugb3BlcmF0aW9ucyBtYXkK LSAgICAgICAgLy8gY29tbXV0ZSB0aGVpciBmaXJzdCB0d28gY2hpbGRyZW4gd2hpbGUgbGVhdmlu ZyB0aGUgcmVzdCB1bmFmZmVjdGVkLgotICAgICAgICBBU1NFUlQobV92YWx1ZS0+bnVtQ2hpbGRy ZW4oKSA+PSAyKTsKLSAgICAgICAgCi0gICAgICAgIC8vIExlYXZlIGl0IGFsb25lIGlmIHRoZSBy aWdodCBjaGlsZCBpcyBhIGNvbnN0YW50LgotICAgICAgICBpZiAobV92YWx1ZS0+Y2hpbGQoMSkt PmlzQ29uc3RhbnQoKQotICAgICAgICAgICAgfHwgbV92YWx1ZS0+Y2hpbGQoMCktPm9wY29kZSgp ID09IEF0b21pY1N0cm9uZ0NBUykKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgCi0gICAg ICAgIGF1dG8gc3dhcCA9IFsmXSAoKSB7CisgICAgICAgIGlmIChzaG91bGRTd2FwQmluYXJ5T3Bl cmFuZHMobV92YWx1ZSkpIHsKICAgICAgICAgICAgIHN0ZDo6c3dhcChtX3ZhbHVlLT5jaGlsZCgw KSwgbV92YWx1ZS0+Y2hpbGQoMSkpOwogICAgICAgICAgICAgbV9jaGFuZ2VkID0gdHJ1ZTsKKyAg ICAgICAgfQorICAgIH0KKworICAgIFZhbHVlKiBuZXdDb21wYXJpc29uVmF1ZUlmTmVjZXNzYXJ5 KCkKKyAgICB7CisgICAgICAgIGF1dG8gZmxpcCA9IFtdIChPcGNvZGUgb3Bjb2RlKSB7CisgICAg ICAgICAgICBzd2l0Y2ggKG9wY29kZSkgeworICAgICAgICAgICAgY2FzZSBMZXNzVGhhbjoKKyAg ICAgICAgICAgICAgICByZXR1cm4gR3JlYXRlclRoYW47CisgICAgICAgICAgICBjYXNlIEdyZWF0 ZXJUaGFuOgorICAgICAgICAgICAgICAgIHJldHVybiBMZXNzVGhhbjsKKyAgICAgICAgICAgIGNh c2UgTGVzc0VxdWFsOgorICAgICAgICAgICAgICAgIHJldHVybiBHcmVhdGVyRXF1YWw7CisgICAg ICAgICAgICBjYXNlIEdyZWF0ZXJFcXVhbDoKKyAgICAgICAgICAgICAgICByZXR1cm4gTGVzc0Vx dWFsOworICAgICAgICAgICAgY2FzZSBBYm92ZToKKyAgICAgICAgICAgICAgICByZXR1cm4gQmVs b3c7CisgICAgICAgICAgICBjYXNlIEJlbG93OgorICAgICAgICAgICAgICAgIHJldHVybiBBYm92 ZTsKKyAgICAgICAgICAgIGNhc2UgQWJvdmVFcXVhbDoKKyAgICAgICAgICAgICAgICByZXR1cm4g QmVsb3dFcXVhbDsKKyAgICAgICAgICAgIGNhc2UgQmVsb3dFcXVhbDoKKyAgICAgICAgICAgICAg ICByZXR1cm4gQWJvdmVFcXVhbDsKKyAgICAgICAgICAgIGRlZmF1bHQ6CisgICAgICAgICAgICAg ICAgcmV0dXJuIG9wY29kZTsKKyAgICAgICAgICAgIH0KICAgICAgICAgfTsKLSAgICAgICAgCi0g ICAgICAgIGlmIChtX3ZhbHVlLT5jaGlsZCgwKS0+aXNDb25zdGFudCgpKQotICAgICAgICAgICAg cmV0dXJuIHN3YXAoKTsKLSAgICAgICAgCi0gICAgICAgIGlmIChtX3ZhbHVlLT5jaGlsZCgxKS0+ b3Bjb2RlKCkgPT0gQXRvbWljU3Ryb25nQ0FTKQotICAgICAgICAgICAgcmV0dXJuIHN3YXAoKTsK LSAgICAgICAgCi0gICAgICAgIC8vIFNvcnQgdGhlIG9wZXJhbmRzLiBUaGlzIGlzIGFuIGltcG9y dGFudCBjYW5vbmljYWxpemF0aW9uLiBXZSB1c2UgdGhlIGluZGV4IGluc3RlYWQgb2YKLSAgICAg ICAgLy8gdGhlIGFkZHJlc3MgdG8gbWFrZSB0aGlzIGF0IGxlYXN0IHNsaWdodGx5IGRldGVybWlu aXN0aWMuCi0gICAgICAgIGlmIChtX3ZhbHVlLT5jaGlsZCgwKS0+aW5kZXgoKSA+IG1fdmFsdWUt PmNoaWxkKDEpLT5pbmRleCgpKQotICAgICAgICAgICAgcmV0dXJuIHN3YXAoKTsKKyAgICAgICAg aWYgKHNob3VsZFN3YXBCaW5hcnlPcGVyYW5kcyhtX3ZhbHVlKSkgeworICAgICAgICAgICAgbV9j aGFuZ2VkID0gdHJ1ZTsKKyAgICAgICAgICAgIHJldHVybiBtX3Byb2MuYWRkPFZhbHVlPihmbGlw KG1fdmFsdWUtPm9wY29kZSgpKSwgbV92YWx1ZS0+b3JpZ2luKCksIG1fdmFsdWUtPmNoaWxkKDEp LCBtX3ZhbHVlLT5jaGlsZCgwKSk7CisgICAgICAgIH0KKyAgICAgICAgcmV0dXJuIG1fdmFsdWU7 CiAgICAgfQogCisKICAgICAvLyBGSVhNRTogVGhpcyBzaG91bGQgcmVhbGx5IGJlIGEgZm9yd2Fy ZCBhbmFseXNpcy4gSW5zdGVhZCwgd2UgdXNlcyBhIGJvdW5kZWQtc2VhcmNoIGJhY2t3YXJkcwog ICAgIC8vIGFuYWx5c2lzLgogICAgIEludFJhbmdlIHJhbmdlRm9yKFZhbHVlKiB2YWx1ZSwgdW5z aWduZWQgdGltZVRvTGl2ZSA9IDUpCg== 335518 2018-03-10 12:11:34 -0800 2018-03-10 23:16:20 -0800 Patch bug-150958-20180311051133.patch text/plain 11055 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjI5NTAzCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBj Yjc3YWExZjAxNzkwM2QzNDZjYjM0ODJhNjMyMjAxZWMyZjM1ZWM0Li42YThjMzIyYWUyMTY1YmZj ZTUzYjViYTFhNzdmODRiNTI3YjljMDRhIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNSBAQAorMjAxOC0wMy0xMCAgWXVzdWtlIFN1enVraSAgPHV0YXRhbmUudGVhQGdtYWls LmNvbT4KKworICAgICAgICBCMzo6cmVkdWNlU3RyZW5ndGggc2hvdWxkIGNhbm9uaWNhbGl6ZSBp bnRlZ2VyIGNvbXBhcmlzb25zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xNTA5NTgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBUaGlzIHBhdGNoIHNvcnRzIG9wZXJhbmRzIG9mIGNvbXBhcmlzb25zIGJ5IGZs aXBwaW5nIG9wY29kZS4gRm9yIGV4YW1wbGUsIGBBYm92ZSgwLCBAMilgIGlzCisgICAgICAgIGNv bnZlcnRlZCB0byBgQmVsb3coQDIsIDApYC4gVGhpcyBzb3J0aW5nIGlzIHRoZSBzYW1lIHRvIGhh bmRsZUNvbW11dGF0aXZpdHkgcnVsZS4gU2luY2Ugd2UKKyAgICAgICAgY2Fub25pY2FsaXplIGNv bXBhcmlzb25zIHRvIGhhdmUgY29uc3RhbnQgdmFsdWUgYXQgbGVhc3Qgb24gdGhlIHJpZ2h0IGhh bmQgc2lkZSwgd2UgY2FuCisgICAgICAgIHJlbW92ZSBwYXR0ZXJuIG1hdGNoaW5ncyBjaGVja2lu ZyBsZWZ0SW1tIGluIEIzTG93ZXJUb0Fpci4KKworICAgICAgICBTaW5jZSB0aGlzIGZsaXBwaW5n IGNoYW5nZXMgdGhlIG9wY29kZSBvZiB0aGUgdmFsdWUsIHRvIGFjaGlldmUgc2FmZWx5LCB3ZSBq dXN0IGNyZWF0ZSBhCisgICAgICAgIG5ldyB2YWx1ZSB3aGljaCBoYXMgZmxpcHBlZCBvcGNvZGUg YW5kIHN3YXBwZWQgb3BlcmFuZHMuIElmIHdlIGNhbiBmb2xkIGl0IHRvIGEgY29uc3RhbnQsCisg ICAgICAgIHdlIHJlcGxhY2UgbV92YWx1ZSB3aXRoIHRoaXMgY29uc3RhbnQuIElmIHdlIGZhaWwg dG8gZm9sZCBpdCB0byBjb25zdGFudCwgd2UgcmVwbGFjZQorICAgICAgICBtX3ZhbHVlIHdpdGgg dGhlIGZsaXBwZWQgb25lLgorCisgICAgICAgIFRoZXNlIGNvbXBhcmlzb25zIGFyZSBhbHJlYWR5 IGhhbmRsZWQgaW4gdGVzdGIzLgorCisgICAgICAgICogYjMvQjNMb3dlclRvQWlyLmNwcDoKKyAg ICAgICAgKiBiMy9CM1JlZHVjZVN0cmVuZ3RoLmNwcDoKKwogMjAxOC0wMy0wOSAgQnJpYW4gQnVy ZyAgPGJidXJnQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiB0aGVyZSBzaG91 bGQgb25seSBiZSBvbmUgd2F5IGZvciBhc3luYyBiYWNrZW5kIGNvbW1hbmRzIHRvIHNlbmQgZmFp bHVyZQpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2IzL0IzTG93ZXJUb0Fpci5j cHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYjMvQjNMb3dlclRvQWlyLmNwcAppbmRleCBhMDhl MWI0OTgwYTYyNThjZjNjZjhiYmViY2NkNTNkNDBlNjkwMTY0Li5jMjU0YWE4NmVhZWEwNjVlN2Ix ZTk5Y2JiNTE0YzZlMzUwMGMwOTE0IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv YjMvQjNMb3dlclRvQWlyLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYjMvQjNMb3dl clRvQWlyLmNwcApAQCAtMTQ2MiwxMSArMTQ2Miw2IEBAIGNsYXNzIExvd2VyVG9BaXIgewogICAg ICAgICAgICAgVmFsdWUqIHJpZ2h0ID0gdmFsdWUtPmNoaWxkKDEpOwogCiAgICAgICAgICAgICBp ZiAoaXNJbnQodmFsdWUtPmNoaWxkKDApLT50eXBlKCkpKSB7Ci0gICAgICAgICAgICAgICAgLy8g RklYTUU6IFdlIHdvdWxkbid0IGhhdmUgdG8gd29ycnkgYWJvdXQgbGVmdEltbSBpZiB3ZSBjYW5v bmljYWxpemVkIGludGVnZXIKLSAgICAgICAgICAgICAgICAvLyBjb21wYXJpc29ucy4KLSAgICAg ICAgICAgICAgICAvLyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUw OTU4Ci0gICAgICAgICAgICAgICAgCi0gICAgICAgICAgICAgICAgQXJnIGxlZnRJbW0gPSBpbW0o bGVmdCk7CiAgICAgICAgICAgICAgICAgQXJnIHJpZ2h0SW1tID0gaW1tKHJpZ2h0KTsKIAogICAg ICAgICAgICAgICAgIGF1dG8gdHJ5Q29tcGFyZSA9IFsmXSAoCkBAIC0xNDg2LDEyICsxNDgxLDYg QEAgY2xhc3MgTG93ZXJUb0FpciB7CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJu IHJlc3VsdDsKICAgICAgICAgICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICAgICAg fQotICAgICAgICAgICAgICAgICAgICBpZiAobGVmdEltbSAmJiBsZWZ0SW1tLmlzUmVwcmVzZW50 YWJsZUFzKHdpZHRoLCBzaWduZWRuZXNzKSkgewotICAgICAgICAgICAgICAgICAgICAgICAgaWYg KEluc3QgcmVzdWx0ID0gdHJ5Q29tcGFyZSh3aWR0aCwgbGVmdEltbSwgbG9hZFByb21pc2Uocmln aHQsIGxvYWRPcGNvZGUpKSkgewotICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbW1pdElu dGVybmFsKHJpZ2h0KTsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICByZXR1cm4gcmVzdWx0 OwotICAgICAgICAgICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICAgICAgICB9CiAgICAg ICAgICAgICAgICAgICAgIHJldHVybiBJbnN0KCk7CiAgICAgICAgICAgICAgICAgfTsKIApAQCAt MTU0OCwxMSArMTUzNyw2IEBAIGNsYXNzIExvd2VyVG9BaXIgewogCiAgICAgICAgICAgICAgICAg Ly8gTm93IGhhbmRsZSBjb21wYXJlcyB0aGF0IGludm9sdmUgYW4gaW1tZWRpYXRlIGFuZCBhIHRt cC4KICAgICAgICAgICAgICAgICAKLSAgICAgICAgICAgICAgICBpZiAobGVmdEltbSAmJiBsZWZ0 SW1tLmlzUmVwcmVzZW50YWJsZUFzPGludDMyX3Q+KCkpIHsKLSAgICAgICAgICAgICAgICAgICAg aWYgKEluc3QgcmVzdWx0ID0gdHJ5Q29tcGFyZSh3aWR0aCwgbGVmdEltbSwgdG1wUHJvbWlzZShy aWdodCkpKQotICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIHJlc3VsdDsKLSAgICAgICAg ICAgICAgICB9Ci0gICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgaWYgKHJpZ2h0SW1t ICYmIHJpZ2h0SW1tLmlzUmVwcmVzZW50YWJsZUFzPGludDMyX3Q+KCkpIHsKICAgICAgICAgICAg ICAgICAgICAgaWYgKEluc3QgcmVzdWx0ID0gdHJ5Q29tcGFyZSh3aWR0aCwgdG1wUHJvbWlzZShs ZWZ0KSwgcmlnaHRJbW0pKQogICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIHJlc3VsdDsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9iMy9CM1JlZHVjZVN0cmVuZ3RoLmNw cCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9iMy9CM1JlZHVjZVN0cmVuZ3RoLmNwcAppbmRleCA1 NTAyZDVlNDdlNTg3MDYxMDYyYjE2ODZkOWJiM2MyNjkzNThiOTQ5Li5hYzcwZDIzZGRjNWQ5NWUz M2U5YTg5MzliM2ZjYzAyOTg0Y2U5MWQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvYjMvQjNSZWR1Y2VTdHJlbmd0aC5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2Iz L0IzUmVkdWNlU3RyZW5ndGguY3BwCkBAIC0xNjY2LDYzICsxNjY2LDU1IEBAIGNsYXNzIFJlZHVj ZVN0cmVuZ3RoIHsKICAgICAgICAgICAgIGJyZWFrOwogCiAgICAgICAgIGNhc2UgTGVzc1RoYW46 Ci0gICAgICAgICAgICAvLyBGSVhNRTogV2UgY291bGQgZG8gYSBiZXR0ZXIgam9iIG9mIGNhbm9u aWNhbGl6aW5nIGludGVnZXIgY29tcGFyaXNvbnMuCi0gICAgICAgICAgICAvLyBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUwOTU4Ci0KLSAgICAgICAgICAgIHJlcGxh Y2VXaXRoTmV3VmFsdWUoCi0gICAgICAgICAgICAgICAgbV9wcm9jLmFkZEJvb2xDb25zdGFudCgK LSAgICAgICAgICAgICAgICAgICAgbV92YWx1ZS0+b3JpZ2luKCksCi0gICAgICAgICAgICAgICAg ICAgIG1fdmFsdWUtPmNoaWxkKDApLT5sZXNzVGhhbkNvbnN0YW50KG1fdmFsdWUtPmNoaWxkKDEp KSkpOwotICAgICAgICAgICAgYnJlYWs7Ci0KICAgICAgICAgY2FzZSBHcmVhdGVyVGhhbjoKLSAg ICAgICAgICAgIHJlcGxhY2VXaXRoTmV3VmFsdWUoCi0gICAgICAgICAgICAgICAgbV9wcm9jLmFk ZEJvb2xDb25zdGFudCgKLSAgICAgICAgICAgICAgICAgICAgbV92YWx1ZS0+b3JpZ2luKCksCi0g ICAgICAgICAgICAgICAgICAgIG1fdmFsdWUtPmNoaWxkKDApLT5ncmVhdGVyVGhhbkNvbnN0YW50 KG1fdmFsdWUtPmNoaWxkKDEpKSkpOwotICAgICAgICAgICAgYnJlYWs7Ci0KICAgICAgICAgY2Fz ZSBMZXNzRXF1YWw6Ci0gICAgICAgICAgICByZXBsYWNlV2l0aE5ld1ZhbHVlKAotICAgICAgICAg ICAgICAgIG1fcHJvYy5hZGRCb29sQ29uc3RhbnQoCi0gICAgICAgICAgICAgICAgICAgIG1fdmFs dWUtPm9yaWdpbigpLAotICAgICAgICAgICAgICAgICAgICBtX3ZhbHVlLT5jaGlsZCgwKS0+bGVz c0VxdWFsQ29uc3RhbnQobV92YWx1ZS0+Y2hpbGQoMSkpKSk7Ci0gICAgICAgICAgICBicmVhazsK LQogICAgICAgICBjYXNlIEdyZWF0ZXJFcXVhbDoKLSAgICAgICAgICAgIHJlcGxhY2VXaXRoTmV3 VmFsdWUoCi0gICAgICAgICAgICAgICAgbV9wcm9jLmFkZEJvb2xDb25zdGFudCgKLSAgICAgICAg ICAgICAgICAgICAgbV92YWx1ZS0+b3JpZ2luKCksCi0gICAgICAgICAgICAgICAgICAgIG1fdmFs dWUtPmNoaWxkKDApLT5ncmVhdGVyRXF1YWxDb25zdGFudChtX3ZhbHVlLT5jaGlsZCgxKSkpKTsK LSAgICAgICAgICAgIGJyZWFrOwotCiAgICAgICAgIGNhc2UgQWJvdmU6Ci0gICAgICAgICAgICBy ZXBsYWNlV2l0aE5ld1ZhbHVlKAotICAgICAgICAgICAgICAgIG1fcHJvYy5hZGRCb29sQ29uc3Rh bnQoCi0gICAgICAgICAgICAgICAgICAgIG1fdmFsdWUtPm9yaWdpbigpLAotICAgICAgICAgICAg ICAgICAgICBtX3ZhbHVlLT5jaGlsZCgwKS0+YWJvdmVDb25zdGFudChtX3ZhbHVlLT5jaGlsZCgx KSkpKTsKLSAgICAgICAgICAgIGJyZWFrOwotCiAgICAgICAgIGNhc2UgQmVsb3c6Ci0gICAgICAg ICAgICByZXBsYWNlV2l0aE5ld1ZhbHVlKAotICAgICAgICAgICAgICAgIG1fcHJvYy5hZGRCb29s Q29uc3RhbnQoCi0gICAgICAgICAgICAgICAgICAgIG1fdmFsdWUtPm9yaWdpbigpLAotICAgICAg ICAgICAgICAgICAgICBtX3ZhbHVlLT5jaGlsZCgwKS0+YmVsb3dDb25zdGFudChtX3ZhbHVlLT5j aGlsZCgxKSkpKTsKLSAgICAgICAgICAgIGJyZWFrOwotCiAgICAgICAgIGNhc2UgQWJvdmVFcXVh bDoKLSAgICAgICAgICAgIHJlcGxhY2VXaXRoTmV3VmFsdWUoCi0gICAgICAgICAgICAgICAgbV9w cm9jLmFkZEJvb2xDb25zdGFudCgKLSAgICAgICAgICAgICAgICAgICAgbV92YWx1ZS0+b3JpZ2lu KCksCi0gICAgICAgICAgICAgICAgICAgIG1fdmFsdWUtPmNoaWxkKDApLT5hYm92ZUVxdWFsQ29u c3RhbnQobV92YWx1ZS0+Y2hpbGQoMSkpKSk7Ci0gICAgICAgICAgICBicmVhazsKKyAgICAgICAg Y2FzZSBCZWxvd0VxdWFsOiB7CisgICAgICAgICAgICBhdXRvKiB2YWx1ZSA9IG5ld0NvbXBhcmlz b25WYXVlSWZOZWNlc3NhcnkoKTsKKyAgICAgICAgICAgIFRyaVN0YXRlIHJlc3VsdCA9IE1peGVk VHJpU3RhdGU7CisgICAgICAgICAgICBzd2l0Y2ggKHZhbHVlLT5vcGNvZGUoKSkgeworICAgICAg ICAgICAgY2FzZSBMZXNzVGhhbjoKKyAgICAgICAgICAgICAgICByZXN1bHQgPSB2YWx1ZS0+Y2hp bGQoMSktPmdyZWF0ZXJUaGFuQ29uc3RhbnQodmFsdWUtPmNoaWxkKDApKTsKKyAgICAgICAgICAg ICAgICBicmVhazsKKyAgICAgICAgICAgIGNhc2UgR3JlYXRlclRoYW46CisgICAgICAgICAgICAg ICAgcmVzdWx0ID0gdmFsdWUtPmNoaWxkKDEpLT5sZXNzVGhhbkNvbnN0YW50KHZhbHVlLT5jaGls ZCgwKSk7CisgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICBjYXNlIExlc3NFcXVh bDoKKyAgICAgICAgICAgICAgICByZXN1bHQgPSB2YWx1ZS0+Y2hpbGQoMSktPmdyZWF0ZXJFcXVh bENvbnN0YW50KHZhbHVlLT5jaGlsZCgwKSk7CisgICAgICAgICAgICAgICAgYnJlYWs7CisgICAg ICAgICAgICBjYXNlIEdyZWF0ZXJFcXVhbDoKKyAgICAgICAgICAgICAgICByZXN1bHQgPSB2YWx1 ZS0+Y2hpbGQoMSktPmxlc3NFcXVhbENvbnN0YW50KHZhbHVlLT5jaGlsZCgwKSk7CisgICAgICAg ICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICBjYXNlIEFib3ZlOgorICAgICAgICAgICAgICAg IHJlc3VsdCA9IHZhbHVlLT5jaGlsZCgxKS0+YmVsb3dDb25zdGFudCh2YWx1ZS0+Y2hpbGQoMCkp OworICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgY2FzZSBCZWxvdzoKKyAgICAg ICAgICAgICAgICByZXN1bHQgPSB2YWx1ZS0+Y2hpbGQoMSktPmFib3ZlQ29uc3RhbnQodmFsdWUt PmNoaWxkKDApKTsKKyAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgIGNhc2UgQWJv dmVFcXVhbDoKKyAgICAgICAgICAgICAgICByZXN1bHQgPSB2YWx1ZS0+Y2hpbGQoMSktPmJlbG93 RXF1YWxDb25zdGFudCh2YWx1ZS0+Y2hpbGQoMCkpOworICAgICAgICAgICAgICAgIGJyZWFrOwor ICAgICAgICAgICAgY2FzZSBCZWxvd0VxdWFsOgorICAgICAgICAgICAgICAgIHJlc3VsdCA9IHZh bHVlLT5jaGlsZCgxKS0+YWJvdmVFcXVhbENvbnN0YW50KHZhbHVlLT5jaGlsZCgwKSk7CisgICAg ICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICBkZWZhdWx0OgorICAgICAgICAgICAgICAg IFJFTEVBU0VfQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgICAgICAgICAgICAgYnJlYWs7Cisg ICAgICAgICAgICB9CiAKLSAgICAgICAgY2FzZSBCZWxvd0VxdWFsOgotICAgICAgICAgICAgcmVw bGFjZVdpdGhOZXdWYWx1ZSgKLSAgICAgICAgICAgICAgICBtX3Byb2MuYWRkQm9vbENvbnN0YW50 KAotICAgICAgICAgICAgICAgICAgICBtX3ZhbHVlLT5vcmlnaW4oKSwKLSAgICAgICAgICAgICAg ICAgICAgbV92YWx1ZS0+Y2hpbGQoMCktPmJlbG93RXF1YWxDb25zdGFudChtX3ZhbHVlLT5jaGls ZCgxKSkpKTsKKyAgICAgICAgICAgIGlmIChhdXRvKiBjb25zdGFudCA9IG1fcHJvYy5hZGRCb29s Q29uc3RhbnQodmFsdWUtPm9yaWdpbigpLCByZXN1bHQpKSB7CisgICAgICAgICAgICAgICAgcmVw bGFjZVdpdGhOZXdWYWx1ZShjb25zdGFudCk7CisgICAgICAgICAgICAgICAgYnJlYWs7CisgICAg ICAgICAgICB9CisKKyAgICAgICAgICAgIC8vIFJlcGxhY2Ugd2l0aCBuZXdseSBjcmVhdGVkICJ2 YWx1ZSIuIEl0cyBvcGNvZGUgaXMgZmxpcHBlZCBhbmQgb3BlcmFuZHMgYXJlIHN3YXBwZWQgZnJv bSBtX3ZhbHVlLgorICAgICAgICAgICAgaWYgKG1fdmFsdWUgIT0gdmFsdWUpCisgICAgICAgICAg ICAgICAgcmVwbGFjZVdpdGhOZXdWYWx1ZSh2YWx1ZSk7CiAgICAgICAgICAgICBicmVhazsKKyAg ICAgICAgfQogCiAgICAgICAgIGNhc2UgRXF1YWxPclVub3JkZXJlZDoKICAgICAgICAgICAgIGhh bmRsZUNvbW11dGF0aXZpdHkoKTsKQEAgLTIxMzQsNiArMjEyNiwzMSBAQCBjbGFzcyBSZWR1Y2VT dHJlbmd0aCB7CiAgICAgICAgIHByZWRlY2Vzc29yLT51cGRhdGVQcmVkZWNlc3NvcnNBZnRlcigp OwogICAgIH0KIAorICAgIHN0YXRpYyBib29sIHNob3VsZFN3YXBCaW5hcnlPcGVyYW5kcyhWYWx1 ZSogdmFsdWUpCisgICAgeworICAgICAgICAvLyBOb3RlIHRoYXQgd2UgaGF2ZSBjb21tdXRhdGl2 ZSBvcGVyYXRpb25zIHRoYXQgdGFrZSBtb3JlIHRoYW4gdHdvIGNoaWxkcmVuLiBUaG9zZSBvcGVy YXRpb25zIG1heQorICAgICAgICAvLyBjb21tdXRlIHRoZWlyIGZpcnN0IHR3byBjaGlsZHJlbiB3 aGlsZSBsZWF2aW5nIHRoZSByZXN0IHVuYWZmZWN0ZWQuCisgICAgICAgIEFTU0VSVCh2YWx1ZS0+ bnVtQ2hpbGRyZW4oKSA+PSAyKTsKKworICAgICAgICAvLyBMZWF2ZSBpdCBhbG9uZSBpZiB0aGUg cmlnaHQgY2hpbGQgaXMgYSBjb25zdGFudC4KKyAgICAgICAgaWYgKHZhbHVlLT5jaGlsZCgxKS0+ aXNDb25zdGFudCgpCisgICAgICAgICAgICB8fCB2YWx1ZS0+Y2hpbGQoMCktPm9wY29kZSgpID09 IEF0b21pY1N0cm9uZ0NBUykKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgICAgICBp ZiAodmFsdWUtPmNoaWxkKDApLT5pc0NvbnN0YW50KCkpCisgICAgICAgICAgICByZXR1cm4gdHJ1 ZTsKKworICAgICAgICBpZiAodmFsdWUtPmNoaWxkKDEpLT5vcGNvZGUoKSA9PSBBdG9taWNTdHJv bmdDQVMpCisgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKworICAgICAgICAvLyBTb3J0IHRoZSBv cGVyYW5kcy4gVGhpcyBpcyBhbiBpbXBvcnRhbnQgY2Fub25pY2FsaXphdGlvbi4gV2UgdXNlIHRo ZSBpbmRleCBpbnN0ZWFkIG9mCisgICAgICAgIC8vIHRoZSBhZGRyZXNzIHRvIG1ha2UgdGhpcyBh dCBsZWFzdCBzbGlnaHRseSBkZXRlcm1pbmlzdGljLgorICAgICAgICBpZiAodmFsdWUtPmNoaWxk KDApLT5pbmRleCgpID4gdmFsdWUtPmNoaWxkKDEpLT5pbmRleCgpKQorICAgICAgICAgICAgcmV0 dXJuIHRydWU7CisKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIH0KKwogICAgIC8vIFR1cm4g dGhpczogQWRkKGNvbnN0YW50LCB2YWx1ZSkKICAgICAvLyBJbnRvIHRoaXM6IEFkZCh2YWx1ZSwg Y29uc3RhbnQpCiAgICAgLy8KQEAgLTIxNDMsMzAgKzIxNjAsNDEgQEAgY2xhc3MgUmVkdWNlU3Ry ZW5ndGggewogICAgIC8vIElmIHdlIGRlY2lkZSB0aGF0IHZhbHVlMiBjb21pbmcgZmlyc3QgaXMg dGhlIGNhbm9uaWNhbCBvcmRlcmluZy4KICAgICB2b2lkIGhhbmRsZUNvbW11dGF0aXZpdHkoKQog ICAgIHsKLSAgICAgICAgLy8gTm90ZSB0aGF0IHdlIGhhdmUgY29tbXV0YXRpdmUgb3BlcmF0aW9u cyB0aGF0IHRha2UgbW9yZSB0aGFuIHR3byBjaGlsZHJlbi4gVGhvc2Ugb3BlcmF0aW9ucyBtYXkK LSAgICAgICAgLy8gY29tbXV0ZSB0aGVpciBmaXJzdCB0d28gY2hpbGRyZW4gd2hpbGUgbGVhdmlu ZyB0aGUgcmVzdCB1bmFmZmVjdGVkLgotICAgICAgICBBU1NFUlQobV92YWx1ZS0+bnVtQ2hpbGRy ZW4oKSA+PSAyKTsKLSAgICAgICAgCi0gICAgICAgIC8vIExlYXZlIGl0IGFsb25lIGlmIHRoZSBy aWdodCBjaGlsZCBpcyBhIGNvbnN0YW50LgotICAgICAgICBpZiAobV92YWx1ZS0+Y2hpbGQoMSkt PmlzQ29uc3RhbnQoKQotICAgICAgICAgICAgfHwgbV92YWx1ZS0+Y2hpbGQoMCktPm9wY29kZSgp ID09IEF0b21pY1N0cm9uZ0NBUykKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgCi0gICAg ICAgIGF1dG8gc3dhcCA9IFsmXSAoKSB7CisgICAgICAgIGlmIChzaG91bGRTd2FwQmluYXJ5T3Bl cmFuZHMobV92YWx1ZSkpIHsKICAgICAgICAgICAgIHN0ZDo6c3dhcChtX3ZhbHVlLT5jaGlsZCgw KSwgbV92YWx1ZS0+Y2hpbGQoMSkpOwogICAgICAgICAgICAgbV9jaGFuZ2VkID0gdHJ1ZTsKKyAg ICAgICAgfQorICAgIH0KKworICAgIFZhbHVlKiBuZXdDb21wYXJpc29uVmF1ZUlmTmVjZXNzYXJ5 KCkKKyAgICB7CisgICAgICAgIGF1dG8gZmxpcCA9IFtdIChPcGNvZGUgb3Bjb2RlKSB7CisgICAg ICAgICAgICBzd2l0Y2ggKG9wY29kZSkgeworICAgICAgICAgICAgY2FzZSBMZXNzVGhhbjoKKyAg ICAgICAgICAgICAgICByZXR1cm4gR3JlYXRlclRoYW47CisgICAgICAgICAgICBjYXNlIEdyZWF0 ZXJUaGFuOgorICAgICAgICAgICAgICAgIHJldHVybiBMZXNzVGhhbjsKKyAgICAgICAgICAgIGNh c2UgTGVzc0VxdWFsOgorICAgICAgICAgICAgICAgIHJldHVybiBHcmVhdGVyRXF1YWw7CisgICAg ICAgICAgICBjYXNlIEdyZWF0ZXJFcXVhbDoKKyAgICAgICAgICAgICAgICByZXR1cm4gTGVzc0Vx dWFsOworICAgICAgICAgICAgY2FzZSBBYm92ZToKKyAgICAgICAgICAgICAgICByZXR1cm4gQmVs b3c7CisgICAgICAgICAgICBjYXNlIEJlbG93OgorICAgICAgICAgICAgICAgIHJldHVybiBBYm92 ZTsKKyAgICAgICAgICAgIGNhc2UgQWJvdmVFcXVhbDoKKyAgICAgICAgICAgICAgICByZXR1cm4g QmVsb3dFcXVhbDsKKyAgICAgICAgICAgIGNhc2UgQmVsb3dFcXVhbDoKKyAgICAgICAgICAgICAg ICByZXR1cm4gQWJvdmVFcXVhbDsKKyAgICAgICAgICAgIGRlZmF1bHQ6CisgICAgICAgICAgICAg ICAgcmV0dXJuIG9wY29kZTsKKyAgICAgICAgICAgIH0KICAgICAgICAgfTsKLSAgICAgICAgCi0g ICAgICAgIGlmIChtX3ZhbHVlLT5jaGlsZCgwKS0+aXNDb25zdGFudCgpKQotICAgICAgICAgICAg cmV0dXJuIHN3YXAoKTsKLSAgICAgICAgCi0gICAgICAgIGlmIChtX3ZhbHVlLT5jaGlsZCgxKS0+ b3Bjb2RlKCkgPT0gQXRvbWljU3Ryb25nQ0FTKQotICAgICAgICAgICAgcmV0dXJuIHN3YXAoKTsK LSAgICAgICAgCi0gICAgICAgIC8vIFNvcnQgdGhlIG9wZXJhbmRzLiBUaGlzIGlzIGFuIGltcG9y dGFudCBjYW5vbmljYWxpemF0aW9uLiBXZSB1c2UgdGhlIGluZGV4IGluc3RlYWQgb2YKLSAgICAg ICAgLy8gdGhlIGFkZHJlc3MgdG8gbWFrZSB0aGlzIGF0IGxlYXN0IHNsaWdodGx5IGRldGVybWlu aXN0aWMuCi0gICAgICAgIGlmIChtX3ZhbHVlLT5jaGlsZCgwKS0+aW5kZXgoKSA+IG1fdmFsdWUt PmNoaWxkKDEpLT5pbmRleCgpKQotICAgICAgICAgICAgcmV0dXJuIHN3YXAoKTsKKyAgICAgICAg aWYgKHNob3VsZFN3YXBCaW5hcnlPcGVyYW5kcyhtX3ZhbHVlKSkgeworICAgICAgICAgICAgbV9j aGFuZ2VkID0gdHJ1ZTsKKyAgICAgICAgICAgIHJldHVybiBtX3Byb2MuYWRkPFZhbHVlPihmbGlw KG1fdmFsdWUtPm9wY29kZSgpKSwgbV92YWx1ZS0+b3JpZ2luKCksIG1fdmFsdWUtPmNoaWxkKDEp LCBtX3ZhbHVlLT5jaGlsZCgwKSk7CisgICAgICAgIH0KKyAgICAgICAgcmV0dXJuIG1fdmFsdWU7 CiAgICAgfQogCiAgICAgLy8gRklYTUU6IFRoaXMgc2hvdWxkIHJlYWxseSBiZSBhIGZvcndhcmQg YW5hbHlzaXMuIEluc3RlYWQsIHdlIHVzZXMgYSBib3VuZGVkLXNlYXJjaCBiYWNrd2FyZHMK