122081 2013-09-29 18:45:00 -0700 FTL: refactor compileAdd and compileArithSub into one function. 2013-09-29 23:31:42 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 nrotem webkit-unassigned commit-queue oldest_to_newest 934414 0 nrotem 2013-09-29 18:45:00 -0700 FTL: refactor compileAdd and compileArithSub into one function. 934415 1 212941 nrotem 2013-09-29 18:45:14 -0700 Created attachment 212941 Patch 934423 2 212941 ggaren 2013-09-29 19:02:06 -0700 Comment on attachment 212941 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=212941&action=review > Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp:285 > case ValueAdd: > - compileAdd(); > + compileAddSub(false /* this is an add */); > break; > case ArithSub: > - compileArithSub(); > + compileAddSub(true /* this is a sub */); WebKit style for booleans that are "true" or "false" constants at the call site is to use named enum values. Something like: enum AddOrSub { Add, Sub }; compileAddOrSub(Add); compileAddOrSub(Sub); > Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp:696 > + LValue C1 =lowDouble(m_node->child1()); > + LValue C2 =lowDouble(m_node->child2()); Need spaces after the "="s. > Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp:707 > - > + Please revert this accidental whitespace change. 934434 3 212947 nrotem 2013-09-29 20:58:03 -0700 Created attachment 212947 Patch 934439 4 212947 ggaren 2013-09-29 21:49:41 -0700 Comment on attachment 212947 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=212947&action=review > Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp:660 > + void compileAddSub(AddOrSubKind OpKind) > { > + bool isSub = OpKind == Sub; Sorry to keep going with the style nits, but the "O" in "OpKind" should be lower case. I'm going to r+ this patch. Can you post a follow-up to fix the "O"? 934440 5 nrotem 2013-09-29 22:07:48 -0700 Okay. I will fix the 'O' 934442 6 212949 nrotem 2013-09-29 22:09:44 -0700 Created attachment 212949 Patch 934462 7 212949 ggaren 2013-09-29 23:04:12 -0700 Comment on attachment 212949 Patch r=me 934465 8 212949 commit-queue 2013-09-29 23:31:40 -0700 Comment on attachment 212949 Patch Clearing flags on attachment: 212949 Committed r156634: <http://trac.webkit.org/changeset/156634> 934466 9 commit-queue 2013-09-29 23:31:42 -0700 All reviewed patches have been landed. Closing bug. 212941 2013-09-29 18:45:14 -0700 2013-09-29 20:58:01 -0700 Patch bug-122081-20130929184513.patch text/plain 5611 nrotem U3VidmVyc2lvbiBSZXZpc2lvbjogMTU2NjIxCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAz NzgwZmY1NDliMjM4ZTFiZDY0ZGUzZDZhODRhOWUyZTI1MTM5MmVlLi5lMTM1OGNlZmM0YmJkOGIx Yjk1NzM2MGM2MzZiOTM3YTRiM2MyNWVmIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNCBAQAorMjAxMy0wOS0yOSAgTmFkYXYgUm90ZW0gIDxucm90ZW1AYXBwbGUuY29tPgor CisgICAgICAgIEZUTDogcmVmYWN0b3IgY29tcGlsZUFkZCBhbmQgY29tcGlsZUFyaXRoU3ViIGlu dG8gb25lIGZ1bmN0aW9uLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTIyMDgxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiBmdGwvRlRMTG93ZXJERkdUb0xMVk0uY3BwOgorICAgICAgICAoSlNDOjpGVEw6 Okxvd2VyREZHVG9MTFZNOjpjb21waWxlTm9kZSk6CisgICAgICAgIChKU0M6OkZUTDo6TG93ZXJE RkdUb0xMVk06OmNvbXBpbGVBZGRTdWIpOgorCiAyMDEzLTA5LTI5ICBBbmRyZWFzIEtsaW5nICA8 YWtsaW5nQGFwcGxlLmNvbT4KIAogICAgICAgICBQYXNzIFZNIGluc3RlYWQgb2YgSlNHbG9iYWxP YmplY3QgdG8gQXJyYXlQcm90b3R5cGUgY29uc3RydWN0b3IuCmRpZmYgLS1naXQgYS9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvZnRsL0ZUTExvd2VyREZHVG9MTFZNLmNwcCBiL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9mdGwvRlRMTG93ZXJERkdUb0xMVk0uY3BwCmluZGV4IDQ3ZWM2Y2FlNTA1NWFiYmRl YjA5NDgzNjJlZmFjYTQzMGI4ODdmODAuLmJkMjljZmQwYmJhZjVmZDY2Y2Q3NTYyYjc2YzcyNjdm ZTc3ZmUyNGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMTG93ZXJE RkdUb0xMVk0uY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMTG93ZXJERkdU b0xMVk0uY3BwCkBAIC0yNzksMTAgKzI3OSwxMCBAQCBwcml2YXRlOgogICAgICAgICAgICAgYnJl YWs7CiAgICAgICAgIGNhc2UgQXJpdGhBZGQ6CiAgICAgICAgIGNhc2UgVmFsdWVBZGQ6Ci0gICAg ICAgICAgICBjb21waWxlQWRkKCk7CisgICAgICAgICAgICBjb21waWxlQWRkU3ViKGZhbHNlIC8q IHRoaXMgaXMgYW4gYWRkICovKTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICBjYXNlIEFy aXRoU3ViOgotICAgICAgICAgICAgY29tcGlsZUFyaXRoU3ViKCk7CisgICAgICAgICAgICBjb21w aWxlQWRkU3ViKHRydWUgLyogdGhpcyBpcyBhIHN1YiAqLyk7CiAgICAgICAgICAgICBicmVhazsK ICAgICAgICAgY2FzZSBBcml0aE11bDoKICAgICAgICAgICAgIGNvbXBpbGVBcml0aE11bCgpOwpA QCAtNjU0LDcgKzY1NCw3IEBAIHByaXZhdGU6CiAgICAgICAgIERGR19OT0RFX0RPX1RPX0NISUxE UkVOKG1fZ3JhcGgsIG1fbm9kZSwgc3BlY3VsYXRlKTsKICAgICB9CiAgICAgCi0gICAgdm9pZCBj b21waWxlQWRkKCkKKyAgICB2b2lkIGNvbXBpbGVBZGRTdWIoYm9vbCBpc1N1YikKICAgICB7CiAg ICAgICAgIHN3aXRjaCAobV9ub2RlLT5iaW5hcnlVc2VLaW5kKCkpIHsKICAgICAgICAgY2FzZSBJ bnQzMlVzZTogewpAQCAtNjYyLDU5ICs2NjIsMTIgQEAgcHJpdmF0ZToKICAgICAgICAgICAgIExW YWx1ZSByaWdodCA9IGxvd0ludDMyKG1fbm9kZS0+Y2hpbGQyKCkpOwogICAgICAgICAgICAgCiAg ICAgICAgICAgICBpZiAoYnl0ZWNvZGVDYW5UcnVuY2F0ZUludGVnZXIobV9ub2RlLT5hcml0aE5v ZGVGbGFncygpKSkgewotICAgICAgICAgICAgICAgIHNldEludDMyKG1fb3V0LmFkZChsZWZ0LCBy aWdodCkpOworICAgICAgICAgICAgICAgIHNldEludDMyKGlzU3ViID8gbV9vdXQuc3ViKGxlZnQs IHJpZ2h0KSA6IG1fb3V0LmFkZChsZWZ0LCByaWdodCkpOwogICAgICAgICAgICAgICAgIGJyZWFr OwogICAgICAgICAgICAgfQotICAgICAgICAgICAgCi0gICAgICAgICAgICBMVmFsdWUgcmVzdWx0 ID0gbV9vdXQuYWRkV2l0aE92ZXJmbG93MzIobGVmdCwgcmlnaHQpOwotICAgICAgICAgICAgc3Bl Y3VsYXRlKE92ZXJmbG93LCBub1ZhbHVlKCksIDAsIG1fb3V0LmV4dHJhY3RWYWx1ZShyZXN1bHQs IDEpKTsKLSAgICAgICAgICAgIHNldEludDMyKG1fb3V0LmV4dHJhY3RWYWx1ZShyZXN1bHQsIDAp KTsKLSAgICAgICAgICAgIGJyZWFrOwotICAgICAgICB9Ci0gICAgICAgICAgICAKLSAgICAgICAg Y2FzZSBNYWNoaW5lSW50VXNlOiB7Ci0gICAgICAgICAgICBpZiAoIW1fc3RhdGUuZm9yTm9kZSht X25vZGUtPmNoaWxkMSgpKS5jb3VsZEJlVHlwZShTcGVjSW50NTIpCi0gICAgICAgICAgICAgICAg JiYgIW1fc3RhdGUuZm9yTm9kZShtX25vZGUtPmNoaWxkMigpKS5jb3VsZEJlVHlwZShTcGVjSW50 NTIpKSB7Ci0gICAgICAgICAgICAgICAgSW50NTJLaW5kIGtpbmQ7Ci0gICAgICAgICAgICAgICAg TFZhbHVlIGxlZnQgPSBsb3dXaGljaGV2ZXJJbnQ1MihtX25vZGUtPmNoaWxkMSgpLCBraW5kKTsK LSAgICAgICAgICAgICAgICBMVmFsdWUgcmlnaHQgPSBsb3dJbnQ1MihtX25vZGUtPmNoaWxkMigp LCBraW5kKTsKLSAgICAgICAgICAgICAgICBzZXRJbnQ1MihtX291dC5hZGQobGVmdCwgcmlnaHQp LCBraW5kKTsKLSAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgIH0KLSAgICAgICAg ICAgIAotICAgICAgICAgICAgTFZhbHVlIGxlZnQgPSBsb3dJbnQ1MihtX25vZGUtPmNoaWxkMSgp KTsKLSAgICAgICAgICAgIExWYWx1ZSByaWdodCA9IGxvd0ludDUyKG1fbm9kZS0+Y2hpbGQyKCkp OwotICAgICAgICAgICAgTFZhbHVlIHJlc3VsdCA9IG1fb3V0LmFkZFdpdGhPdmVyZmxvdzY0KGxl ZnQsIHJpZ2h0KTsKLSAgICAgICAgICAgIHNwZWN1bGF0ZShJbnQ1Mk92ZXJmbG93LCBub1ZhbHVl KCksIDAsIG1fb3V0LmV4dHJhY3RWYWx1ZShyZXN1bHQsIDEpKTsKLSAgICAgICAgICAgIHNldElu dDUyKG1fb3V0LmV4dHJhY3RWYWx1ZShyZXN1bHQsIDApKTsKLSAgICAgICAgICAgIGJyZWFrOwot ICAgICAgICB9Ci0gICAgICAgICAgICAKLSAgICAgICAgY2FzZSBOdW1iZXJVc2U6IHsKLSAgICAg ICAgICAgIHNldERvdWJsZSgKLSAgICAgICAgICAgICAgICBtX291dC5kb3VibGVBZGQobG93RG91 YmxlKG1fbm9kZS0+Y2hpbGQxKCkpLCBsb3dEb3VibGUobV9ub2RlLT5jaGlsZDIoKSkpKTsKLSAg ICAgICAgICAgIGJyZWFrOwotICAgICAgICB9Ci0gICAgICAgICAgICAKLSAgICAgICAgZGVmYXVs dDoKLSAgICAgICAgICAgIFJFTEVBU0VfQVNTRVJUX05PVF9SRUFDSEVEKCk7Ci0gICAgICAgICAg ICBicmVhazsKLSAgICAgICAgfQotICAgIH0KLSAgICAKLSAgICB2b2lkIGNvbXBpbGVBcml0aFN1 YigpCi0gICAgewotICAgICAgICBzd2l0Y2ggKG1fbm9kZS0+YmluYXJ5VXNlS2luZCgpKSB7Ci0g ICAgICAgIGNhc2UgSW50MzJVc2U6IHsKLSAgICAgICAgICAgIExWYWx1ZSBsZWZ0ID0gbG93SW50 MzIobV9ub2RlLT5jaGlsZDEoKSk7Ci0gICAgICAgICAgICBMVmFsdWUgcmlnaHQgPSBsb3dJbnQz MihtX25vZGUtPmNoaWxkMigpKTsKLSAgICAgICAgICAgIAotICAgICAgICAgICAgaWYgKGJ5dGVj b2RlQ2FuVHJ1bmNhdGVJbnRlZ2VyKG1fbm9kZS0+YXJpdGhOb2RlRmxhZ3MoKSkpIHsKLSAgICAg ICAgICAgICAgICBzZXRJbnQzMihtX291dC5zdWIobGVmdCwgcmlnaHQpKTsKLSAgICAgICAgICAg ICAgICBicmVhazsKLSAgICAgICAgICAgIH0KLSAgICAgICAgICAgIAotICAgICAgICAgICAgTFZh bHVlIHJlc3VsdCA9IG1fb3V0LnN1YldpdGhPdmVyZmxvdzMyKGxlZnQsIHJpZ2h0KTsKKworICAg ICAgICAgICAgTFZhbHVlIHJlc3VsdCA9IGlzU3ViID8gbV9vdXQuc3ViV2l0aE92ZXJmbG93MzIo bGVmdCwgcmlnaHQpIDogbV9vdXQuYWRkV2l0aE92ZXJmbG93MzIobGVmdCwgcmlnaHQpOworCiAg ICAgICAgICAgICBzcGVjdWxhdGUoT3ZlcmZsb3csIG5vVmFsdWUoKSwgMCwgbV9vdXQuZXh0cmFj dFZhbHVlKHJlc3VsdCwgMSkpOwogICAgICAgICAgICAgc2V0SW50MzIobV9vdXQuZXh0cmFjdFZh bHVlKHJlc3VsdCwgMCkpOwogICAgICAgICAgICAgYnJlYWs7CkBAIC03MjYsMjEgKzY3OSwyMyBA QCBwcml2YXRlOgogICAgICAgICAgICAgICAgIEludDUyS2luZCBraW5kOwogICAgICAgICAgICAg ICAgIExWYWx1ZSBsZWZ0ID0gbG93V2hpY2hldmVySW50NTIobV9ub2RlLT5jaGlsZDEoKSwga2lu ZCk7CiAgICAgICAgICAgICAgICAgTFZhbHVlIHJpZ2h0ID0gbG93SW50NTIobV9ub2RlLT5jaGls ZDIoKSwga2luZCk7Ci0gICAgICAgICAgICAgICAgc2V0SW50NTIobV9vdXQuc3ViKGxlZnQsIHJp Z2h0KSwga2luZCk7CisgICAgICAgICAgICAgICAgc2V0SW50NTIoaXNTdWIgPyBtX291dC5zdWIo bGVmdCwgcmlnaHQpIDogbV9vdXQuYWRkKGxlZnQsIHJpZ2h0KSwga2luZCk7CiAgICAgICAgICAg ICAgICAgYnJlYWs7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICAKICAgICAgICAgICAgIExW YWx1ZSBsZWZ0ID0gbG93SW50NTIobV9ub2RlLT5jaGlsZDEoKSk7CiAgICAgICAgICAgICBMVmFs dWUgcmlnaHQgPSBsb3dJbnQ1MihtX25vZGUtPmNoaWxkMigpKTsKLSAgICAgICAgICAgIExWYWx1 ZSByZXN1bHQgPSBtX291dC5zdWJXaXRoT3ZlcmZsb3c2NChsZWZ0LCByaWdodCk7CisgICAgICAg ICAgICBMVmFsdWUgcmVzdWx0ID0gaXNTdWIgPyBtX291dC5zdWJXaXRoT3ZlcmZsb3c2NChsZWZ0 LCByaWdodCkgOiBtX291dC5hZGRXaXRoT3ZlcmZsb3c2NChsZWZ0LCByaWdodCk7CiAgICAgICAg ICAgICBzcGVjdWxhdGUoSW50NTJPdmVyZmxvdywgbm9WYWx1ZSgpLCAwLCBtX291dC5leHRyYWN0 VmFsdWUocmVzdWx0LCAxKSk7CiAgICAgICAgICAgICBzZXRJbnQ1MihtX291dC5leHRyYWN0VmFs dWUocmVzdWx0LCAwKSk7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQogICAgICAgICAg ICAgCiAgICAgICAgIGNhc2UgTnVtYmVyVXNlOiB7Ci0gICAgICAgICAgICBzZXREb3VibGUoCi0g ICAgICAgICAgICAgICAgbV9vdXQuZG91YmxlU3ViKGxvd0RvdWJsZShtX25vZGUtPmNoaWxkMSgp KSwgbG93RG91YmxlKG1fbm9kZS0+Y2hpbGQyKCkpKSk7CisgICAgICAgICAgICBMVmFsdWUgQzEg PWxvd0RvdWJsZShtX25vZGUtPmNoaWxkMSgpKTsKKyAgICAgICAgICAgIExWYWx1ZSBDMiA9bG93 RG91YmxlKG1fbm9kZS0+Y2hpbGQyKCkpOworCisgICAgICAgICAgICBzZXREb3VibGUoaXNTdWIg PyBtX291dC5kb3VibGVTdWIoQzEsIEMyKSA6IG1fb3V0LmRvdWJsZUFkZChDMSwgQzIpKTsKICAg ICAgICAgICAgIGJyZWFrOwogICAgICAgICB9CiAgICAgICAgICAgICAKQEAgLTc0OSw3ICs3MDQs NyBAQCBwcml2YXRlOgogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIH0KICAgICB9Ci0gICAg CisKICAgICB2b2lkIGNvbXBpbGVBcml0aE11bCgpCiAgICAgewogICAgICAgICBzd2l0Y2ggKG1f bm9kZS0+YmluYXJ5VXNlS2luZCgpKSB7Cg== 212947 2013-09-29 20:58:03 -0700 2013-09-29 22:09:40 -0700 Patch bug-122081-20130929205803.patch text/plain 5522 nrotem U3VidmVyc2lvbiBSZXZpc2lvbjogMTU2NjIxCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAz NzgwZmY1NDliMjM4ZTFiZDY0ZGUzZDZhODRhOWUyZTI1MTM5MmVlLi5lMTM1OGNlZmM0YmJkOGIx Yjk1NzM2MGM2MzZiOTM3YTRiM2MyNWVmIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNCBAQAorMjAxMy0wOS0yOSAgTmFkYXYgUm90ZW0gIDxucm90ZW1AYXBwbGUuY29tPgor CisgICAgICAgIEZUTDogcmVmYWN0b3IgY29tcGlsZUFkZCBhbmQgY29tcGlsZUFyaXRoU3ViIGlu dG8gb25lIGZ1bmN0aW9uLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTIyMDgxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiBmdGwvRlRMTG93ZXJERkdUb0xMVk0uY3BwOgorICAgICAgICAoSlNDOjpGVEw6 Okxvd2VyREZHVG9MTFZNOjpjb21waWxlTm9kZSk6CisgICAgICAgIChKU0M6OkZUTDo6TG93ZXJE RkdUb0xMVk06OmNvbXBpbGVBZGRTdWIpOgorCiAyMDEzLTA5LTI5ICBBbmRyZWFzIEtsaW5nICA8 YWtsaW5nQGFwcGxlLmNvbT4KIAogICAgICAgICBQYXNzIFZNIGluc3RlYWQgb2YgSlNHbG9iYWxP YmplY3QgdG8gQXJyYXlQcm90b3R5cGUgY29uc3RydWN0b3IuCmRpZmYgLS1naXQgYS9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvZnRsL0ZUTExvd2VyREZHVG9MTFZNLmNwcCBiL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9mdGwvRlRMTG93ZXJERkdUb0xMVk0uY3BwCmluZGV4IDQ3ZWM2Y2FlNTA1NWFiYmRl YjA5NDgzNjJlZmFjYTQzMGI4ODdmODAuLjBiYjZiZDJiMWUyZDM0Y2M3MGNkYmYyYmM5ZDJmMTM3 ZGQyZGIyMzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMTG93ZXJE RkdUb0xMVk0uY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMTG93ZXJERkdU b0xMVk0uY3BwCkBAIC0yNzksMTAgKzI3OSwxMCBAQCBwcml2YXRlOgogICAgICAgICAgICAgYnJl YWs7CiAgICAgICAgIGNhc2UgQXJpdGhBZGQ6CiAgICAgICAgIGNhc2UgVmFsdWVBZGQ6Ci0gICAg ICAgICAgICBjb21waWxlQWRkKCk7CisgICAgICAgICAgICBjb21waWxlQWRkU3ViKEFkZCk7CiAg ICAgICAgICAgICBicmVhazsKICAgICAgICAgY2FzZSBBcml0aFN1YjoKLSAgICAgICAgICAgIGNv bXBpbGVBcml0aFN1YigpOworICAgICAgICAgICAgY29tcGlsZUFkZFN1YihTdWIpOwogICAgICAg ICAgICAgYnJlYWs7CiAgICAgICAgIGNhc2UgQXJpdGhNdWw6CiAgICAgICAgICAgICBjb21waWxl QXJpdGhNdWwoKTsKQEAgLTY1NCw2NyArNjU0LDIyIEBAIHByaXZhdGU6CiAgICAgICAgIERGR19O T0RFX0RPX1RPX0NISUxEUkVOKG1fZ3JhcGgsIG1fbm9kZSwgc3BlY3VsYXRlKTsKICAgICB9CiAg ICAgCi0gICAgdm9pZCBjb21waWxlQWRkKCkKKyAgICBlbnVtIEFkZE9yU3ViS2luZCB7QWRkLCBT dWJ9OworICAgIHZvaWQgY29tcGlsZUFkZFN1YihBZGRPclN1YktpbmQgT3BLaW5kKQogICAgIHsK KyAgICAgICAgYm9vbCBpc1N1YiA9IE9wS2luZCA9PSBTdWI7CiAgICAgICAgIHN3aXRjaCAobV9u b2RlLT5iaW5hcnlVc2VLaW5kKCkpIHsKICAgICAgICAgY2FzZSBJbnQzMlVzZTogewogICAgICAg ICAgICAgTFZhbHVlIGxlZnQgPSBsb3dJbnQzMihtX25vZGUtPmNoaWxkMSgpKTsKICAgICAgICAg ICAgIExWYWx1ZSByaWdodCA9IGxvd0ludDMyKG1fbm9kZS0+Y2hpbGQyKCkpOwogICAgICAgICAg ICAgCiAgICAgICAgICAgICBpZiAoYnl0ZWNvZGVDYW5UcnVuY2F0ZUludGVnZXIobV9ub2RlLT5h cml0aE5vZGVGbGFncygpKSkgewotICAgICAgICAgICAgICAgIHNldEludDMyKG1fb3V0LmFkZChs ZWZ0LCByaWdodCkpOworICAgICAgICAgICAgICAgIHNldEludDMyKGlzU3ViID8gbV9vdXQuc3Vi KGxlZnQsIHJpZ2h0KSA6IG1fb3V0LmFkZChsZWZ0LCByaWdodCkpOwogICAgICAgICAgICAgICAg IGJyZWFrOwogICAgICAgICAgICAgfQotICAgICAgICAgICAgCi0gICAgICAgICAgICBMVmFsdWUg cmVzdWx0ID0gbV9vdXQuYWRkV2l0aE92ZXJmbG93MzIobGVmdCwgcmlnaHQpOwotICAgICAgICAg ICAgc3BlY3VsYXRlKE92ZXJmbG93LCBub1ZhbHVlKCksIDAsIG1fb3V0LmV4dHJhY3RWYWx1ZShy ZXN1bHQsIDEpKTsKLSAgICAgICAgICAgIHNldEludDMyKG1fb3V0LmV4dHJhY3RWYWx1ZShyZXN1 bHQsIDApKTsKLSAgICAgICAgICAgIGJyZWFrOwotICAgICAgICB9Ci0gICAgICAgICAgICAKLSAg ICAgICAgY2FzZSBNYWNoaW5lSW50VXNlOiB7Ci0gICAgICAgICAgICBpZiAoIW1fc3RhdGUuZm9y Tm9kZShtX25vZGUtPmNoaWxkMSgpKS5jb3VsZEJlVHlwZShTcGVjSW50NTIpCi0gICAgICAgICAg ICAgICAgJiYgIW1fc3RhdGUuZm9yTm9kZShtX25vZGUtPmNoaWxkMigpKS5jb3VsZEJlVHlwZShT cGVjSW50NTIpKSB7Ci0gICAgICAgICAgICAgICAgSW50NTJLaW5kIGtpbmQ7Ci0gICAgICAgICAg ICAgICAgTFZhbHVlIGxlZnQgPSBsb3dXaGljaGV2ZXJJbnQ1MihtX25vZGUtPmNoaWxkMSgpLCBr aW5kKTsKLSAgICAgICAgICAgICAgICBMVmFsdWUgcmlnaHQgPSBsb3dJbnQ1MihtX25vZGUtPmNo aWxkMigpLCBraW5kKTsKLSAgICAgICAgICAgICAgICBzZXRJbnQ1MihtX291dC5hZGQobGVmdCwg cmlnaHQpLCBraW5kKTsKLSAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgIH0KLSAg ICAgICAgICAgIAotICAgICAgICAgICAgTFZhbHVlIGxlZnQgPSBsb3dJbnQ1MihtX25vZGUtPmNo aWxkMSgpKTsKLSAgICAgICAgICAgIExWYWx1ZSByaWdodCA9IGxvd0ludDUyKG1fbm9kZS0+Y2hp bGQyKCkpOwotICAgICAgICAgICAgTFZhbHVlIHJlc3VsdCA9IG1fb3V0LmFkZFdpdGhPdmVyZmxv dzY0KGxlZnQsIHJpZ2h0KTsKLSAgICAgICAgICAgIHNwZWN1bGF0ZShJbnQ1Mk92ZXJmbG93LCBu b1ZhbHVlKCksIDAsIG1fb3V0LmV4dHJhY3RWYWx1ZShyZXN1bHQsIDEpKTsKLSAgICAgICAgICAg IHNldEludDUyKG1fb3V0LmV4dHJhY3RWYWx1ZShyZXN1bHQsIDApKTsKLSAgICAgICAgICAgIGJy ZWFrOwotICAgICAgICB9Ci0gICAgICAgICAgICAKLSAgICAgICAgY2FzZSBOdW1iZXJVc2U6IHsK LSAgICAgICAgICAgIHNldERvdWJsZSgKLSAgICAgICAgICAgICAgICBtX291dC5kb3VibGVBZGQo bG93RG91YmxlKG1fbm9kZS0+Y2hpbGQxKCkpLCBsb3dEb3VibGUobV9ub2RlLT5jaGlsZDIoKSkp KTsKLSAgICAgICAgICAgIGJyZWFrOwotICAgICAgICB9Ci0gICAgICAgICAgICAKLSAgICAgICAg ZGVmYXVsdDoKLSAgICAgICAgICAgIFJFTEVBU0VfQVNTRVJUX05PVF9SRUFDSEVEKCk7Ci0gICAg ICAgICAgICBicmVhazsKLSAgICAgICAgfQotICAgIH0KLSAgICAKLSAgICB2b2lkIGNvbXBpbGVB cml0aFN1YigpCi0gICAgewotICAgICAgICBzd2l0Y2ggKG1fbm9kZS0+YmluYXJ5VXNlS2luZCgp KSB7Ci0gICAgICAgIGNhc2UgSW50MzJVc2U6IHsKLSAgICAgICAgICAgIExWYWx1ZSBsZWZ0ID0g bG93SW50MzIobV9ub2RlLT5jaGlsZDEoKSk7Ci0gICAgICAgICAgICBMVmFsdWUgcmlnaHQgPSBs b3dJbnQzMihtX25vZGUtPmNoaWxkMigpKTsKLSAgICAgICAgICAgIAotICAgICAgICAgICAgaWYg KGJ5dGVjb2RlQ2FuVHJ1bmNhdGVJbnRlZ2VyKG1fbm9kZS0+YXJpdGhOb2RlRmxhZ3MoKSkpIHsK LSAgICAgICAgICAgICAgICBzZXRJbnQzMihtX291dC5zdWIobGVmdCwgcmlnaHQpKTsKLSAgICAg ICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgIH0KLSAgICAgICAgICAgIAotICAgICAgICAg ICAgTFZhbHVlIHJlc3VsdCA9IG1fb3V0LnN1YldpdGhPdmVyZmxvdzMyKGxlZnQsIHJpZ2h0KTsK KworICAgICAgICAgICAgTFZhbHVlIHJlc3VsdCA9IGlzU3ViID8gbV9vdXQuc3ViV2l0aE92ZXJm bG93MzIobGVmdCwgcmlnaHQpIDogbV9vdXQuYWRkV2l0aE92ZXJmbG93MzIobGVmdCwgcmlnaHQp OworCiAgICAgICAgICAgICBzcGVjdWxhdGUoT3ZlcmZsb3csIG5vVmFsdWUoKSwgMCwgbV9vdXQu ZXh0cmFjdFZhbHVlKHJlc3VsdCwgMSkpOwogICAgICAgICAgICAgc2V0SW50MzIobV9vdXQuZXh0 cmFjdFZhbHVlKHJlc3VsdCwgMCkpOwogICAgICAgICAgICAgYnJlYWs7CkBAIC03MjYsMjEgKzY4 MSwyMyBAQCBwcml2YXRlOgogICAgICAgICAgICAgICAgIEludDUyS2luZCBraW5kOwogICAgICAg ICAgICAgICAgIExWYWx1ZSBsZWZ0ID0gbG93V2hpY2hldmVySW50NTIobV9ub2RlLT5jaGlsZDEo KSwga2luZCk7CiAgICAgICAgICAgICAgICAgTFZhbHVlIHJpZ2h0ID0gbG93SW50NTIobV9ub2Rl LT5jaGlsZDIoKSwga2luZCk7Ci0gICAgICAgICAgICAgICAgc2V0SW50NTIobV9vdXQuc3ViKGxl ZnQsIHJpZ2h0KSwga2luZCk7CisgICAgICAgICAgICAgICAgc2V0SW50NTIoaXNTdWIgPyBtX291 dC5zdWIobGVmdCwgcmlnaHQpIDogbV9vdXQuYWRkKGxlZnQsIHJpZ2h0KSwga2luZCk7CiAgICAg ICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICAKICAgICAgICAg ICAgIExWYWx1ZSBsZWZ0ID0gbG93SW50NTIobV9ub2RlLT5jaGlsZDEoKSk7CiAgICAgICAgICAg ICBMVmFsdWUgcmlnaHQgPSBsb3dJbnQ1MihtX25vZGUtPmNoaWxkMigpKTsKLSAgICAgICAgICAg IExWYWx1ZSByZXN1bHQgPSBtX291dC5zdWJXaXRoT3ZlcmZsb3c2NChsZWZ0LCByaWdodCk7Cisg ICAgICAgICAgICBMVmFsdWUgcmVzdWx0ID0gaXNTdWIgPyBtX291dC5zdWJXaXRoT3ZlcmZsb3c2 NChsZWZ0LCByaWdodCkgOiBtX291dC5hZGRXaXRoT3ZlcmZsb3c2NChsZWZ0LCByaWdodCk7CiAg ICAgICAgICAgICBzcGVjdWxhdGUoSW50NTJPdmVyZmxvdywgbm9WYWx1ZSgpLCAwLCBtX291dC5l eHRyYWN0VmFsdWUocmVzdWx0LCAxKSk7CiAgICAgICAgICAgICBzZXRJbnQ1MihtX291dC5leHRy YWN0VmFsdWUocmVzdWx0LCAwKSk7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQogICAg ICAgICAgICAgCiAgICAgICAgIGNhc2UgTnVtYmVyVXNlOiB7Ci0gICAgICAgICAgICBzZXREb3Vi bGUoCi0gICAgICAgICAgICAgICAgbV9vdXQuZG91YmxlU3ViKGxvd0RvdWJsZShtX25vZGUtPmNo aWxkMSgpKSwgbG93RG91YmxlKG1fbm9kZS0+Y2hpbGQyKCkpKSk7CisgICAgICAgICAgICBMVmFs dWUgQzEgPSBsb3dEb3VibGUobV9ub2RlLT5jaGlsZDEoKSk7CisgICAgICAgICAgICBMVmFsdWUg QzIgPSBsb3dEb3VibGUobV9ub2RlLT5jaGlsZDIoKSk7CisKKyAgICAgICAgICAgIHNldERvdWJs ZShpc1N1YiA/IG1fb3V0LmRvdWJsZVN1YihDMSwgQzIpIDogbV9vdXQuZG91YmxlQWRkKEMxLCBD MikpOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIH0KICAgICAgICAgICAgIAo= 212949 2013-09-29 22:09:44 -0700 2013-09-29 23:31:40 -0700 Patch bug-122081-20130929220943.patch text/plain 5522 nrotem U3VidmVyc2lvbiBSZXZpc2lvbjogMTU2NjIxCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAz NzgwZmY1NDliMjM4ZTFiZDY0ZGUzZDZhODRhOWUyZTI1MTM5MmVlLi5lMTM1OGNlZmM0YmJkOGIx Yjk1NzM2MGM2MzZiOTM3YTRiM2MyNWVmIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNCBAQAorMjAxMy0wOS0yOSAgTmFkYXYgUm90ZW0gIDxucm90ZW1AYXBwbGUuY29tPgor CisgICAgICAgIEZUTDogcmVmYWN0b3IgY29tcGlsZUFkZCBhbmQgY29tcGlsZUFyaXRoU3ViIGlu dG8gb25lIGZ1bmN0aW9uLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTIyMDgxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiBmdGwvRlRMTG93ZXJERkdUb0xMVk0uY3BwOgorICAgICAgICAoSlNDOjpGVEw6 Okxvd2VyREZHVG9MTFZNOjpjb21waWxlTm9kZSk6CisgICAgICAgIChKU0M6OkZUTDo6TG93ZXJE RkdUb0xMVk06OmNvbXBpbGVBZGRTdWIpOgorCiAyMDEzLTA5LTI5ICBBbmRyZWFzIEtsaW5nICA8 YWtsaW5nQGFwcGxlLmNvbT4KIAogICAgICAgICBQYXNzIFZNIGluc3RlYWQgb2YgSlNHbG9iYWxP YmplY3QgdG8gQXJyYXlQcm90b3R5cGUgY29uc3RydWN0b3IuCmRpZmYgLS1naXQgYS9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvZnRsL0ZUTExvd2VyREZHVG9MTFZNLmNwcCBiL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9mdGwvRlRMTG93ZXJERkdUb0xMVk0uY3BwCmluZGV4IDQ3ZWM2Y2FlNTA1NWFiYmRl YjA5NDgzNjJlZmFjYTQzMGI4ODdmODAuLjRmNTY2NjkyZDA1MzZlYjkyYzA3NTRhZDBmZjlkOWUy N2JkZjkyZmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMTG93ZXJE RkdUb0xMVk0uY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMTG93ZXJERkdU b0xMVk0uY3BwCkBAIC0yNzksMTAgKzI3OSwxMCBAQCBwcml2YXRlOgogICAgICAgICAgICAgYnJl YWs7CiAgICAgICAgIGNhc2UgQXJpdGhBZGQ6CiAgICAgICAgIGNhc2UgVmFsdWVBZGQ6Ci0gICAg ICAgICAgICBjb21waWxlQWRkKCk7CisgICAgICAgICAgICBjb21waWxlQWRkU3ViKEFkZCk7CiAg ICAgICAgICAgICBicmVhazsKICAgICAgICAgY2FzZSBBcml0aFN1YjoKLSAgICAgICAgICAgIGNv bXBpbGVBcml0aFN1YigpOworICAgICAgICAgICAgY29tcGlsZUFkZFN1YihTdWIpOwogICAgICAg ICAgICAgYnJlYWs7CiAgICAgICAgIGNhc2UgQXJpdGhNdWw6CiAgICAgICAgICAgICBjb21waWxl QXJpdGhNdWwoKTsKQEAgLTY1NCw2NyArNjU0LDIyIEBAIHByaXZhdGU6CiAgICAgICAgIERGR19O T0RFX0RPX1RPX0NISUxEUkVOKG1fZ3JhcGgsIG1fbm9kZSwgc3BlY3VsYXRlKTsKICAgICB9CiAg ICAgCi0gICAgdm9pZCBjb21waWxlQWRkKCkKKyAgICBlbnVtIEFkZE9yU3ViS2luZCB7QWRkLCBT dWJ9OworICAgIHZvaWQgY29tcGlsZUFkZFN1YihBZGRPclN1YktpbmQgb3BLaW5kKQogICAgIHsK KyAgICAgICAgYm9vbCBpc1N1YiA9IG9wS2luZCA9PSBTdWI7CiAgICAgICAgIHN3aXRjaCAobV9u b2RlLT5iaW5hcnlVc2VLaW5kKCkpIHsKICAgICAgICAgY2FzZSBJbnQzMlVzZTogewogICAgICAg ICAgICAgTFZhbHVlIGxlZnQgPSBsb3dJbnQzMihtX25vZGUtPmNoaWxkMSgpKTsKICAgICAgICAg ICAgIExWYWx1ZSByaWdodCA9IGxvd0ludDMyKG1fbm9kZS0+Y2hpbGQyKCkpOwogICAgICAgICAg ICAgCiAgICAgICAgICAgICBpZiAoYnl0ZWNvZGVDYW5UcnVuY2F0ZUludGVnZXIobV9ub2RlLT5h cml0aE5vZGVGbGFncygpKSkgewotICAgICAgICAgICAgICAgIHNldEludDMyKG1fb3V0LmFkZChs ZWZ0LCByaWdodCkpOworICAgICAgICAgICAgICAgIHNldEludDMyKGlzU3ViID8gbV9vdXQuc3Vi KGxlZnQsIHJpZ2h0KSA6IG1fb3V0LmFkZChsZWZ0LCByaWdodCkpOwogICAgICAgICAgICAgICAg IGJyZWFrOwogICAgICAgICAgICAgfQotICAgICAgICAgICAgCi0gICAgICAgICAgICBMVmFsdWUg cmVzdWx0ID0gbV9vdXQuYWRkV2l0aE92ZXJmbG93MzIobGVmdCwgcmlnaHQpOwotICAgICAgICAg ICAgc3BlY3VsYXRlKE92ZXJmbG93LCBub1ZhbHVlKCksIDAsIG1fb3V0LmV4dHJhY3RWYWx1ZShy ZXN1bHQsIDEpKTsKLSAgICAgICAgICAgIHNldEludDMyKG1fb3V0LmV4dHJhY3RWYWx1ZShyZXN1 bHQsIDApKTsKLSAgICAgICAgICAgIGJyZWFrOwotICAgICAgICB9Ci0gICAgICAgICAgICAKLSAg ICAgICAgY2FzZSBNYWNoaW5lSW50VXNlOiB7Ci0gICAgICAgICAgICBpZiAoIW1fc3RhdGUuZm9y Tm9kZShtX25vZGUtPmNoaWxkMSgpKS5jb3VsZEJlVHlwZShTcGVjSW50NTIpCi0gICAgICAgICAg ICAgICAgJiYgIW1fc3RhdGUuZm9yTm9kZShtX25vZGUtPmNoaWxkMigpKS5jb3VsZEJlVHlwZShT cGVjSW50NTIpKSB7Ci0gICAgICAgICAgICAgICAgSW50NTJLaW5kIGtpbmQ7Ci0gICAgICAgICAg ICAgICAgTFZhbHVlIGxlZnQgPSBsb3dXaGljaGV2ZXJJbnQ1MihtX25vZGUtPmNoaWxkMSgpLCBr aW5kKTsKLSAgICAgICAgICAgICAgICBMVmFsdWUgcmlnaHQgPSBsb3dJbnQ1MihtX25vZGUtPmNo aWxkMigpLCBraW5kKTsKLSAgICAgICAgICAgICAgICBzZXRJbnQ1MihtX291dC5hZGQobGVmdCwg cmlnaHQpLCBraW5kKTsKLSAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgIH0KLSAg ICAgICAgICAgIAotICAgICAgICAgICAgTFZhbHVlIGxlZnQgPSBsb3dJbnQ1MihtX25vZGUtPmNo aWxkMSgpKTsKLSAgICAgICAgICAgIExWYWx1ZSByaWdodCA9IGxvd0ludDUyKG1fbm9kZS0+Y2hp bGQyKCkpOwotICAgICAgICAgICAgTFZhbHVlIHJlc3VsdCA9IG1fb3V0LmFkZFdpdGhPdmVyZmxv dzY0KGxlZnQsIHJpZ2h0KTsKLSAgICAgICAgICAgIHNwZWN1bGF0ZShJbnQ1Mk92ZXJmbG93LCBu b1ZhbHVlKCksIDAsIG1fb3V0LmV4dHJhY3RWYWx1ZShyZXN1bHQsIDEpKTsKLSAgICAgICAgICAg IHNldEludDUyKG1fb3V0LmV4dHJhY3RWYWx1ZShyZXN1bHQsIDApKTsKLSAgICAgICAgICAgIGJy ZWFrOwotICAgICAgICB9Ci0gICAgICAgICAgICAKLSAgICAgICAgY2FzZSBOdW1iZXJVc2U6IHsK LSAgICAgICAgICAgIHNldERvdWJsZSgKLSAgICAgICAgICAgICAgICBtX291dC5kb3VibGVBZGQo bG93RG91YmxlKG1fbm9kZS0+Y2hpbGQxKCkpLCBsb3dEb3VibGUobV9ub2RlLT5jaGlsZDIoKSkp KTsKLSAgICAgICAgICAgIGJyZWFrOwotICAgICAgICB9Ci0gICAgICAgICAgICAKLSAgICAgICAg ZGVmYXVsdDoKLSAgICAgICAgICAgIFJFTEVBU0VfQVNTRVJUX05PVF9SRUFDSEVEKCk7Ci0gICAg ICAgICAgICBicmVhazsKLSAgICAgICAgfQotICAgIH0KLSAgICAKLSAgICB2b2lkIGNvbXBpbGVB cml0aFN1YigpCi0gICAgewotICAgICAgICBzd2l0Y2ggKG1fbm9kZS0+YmluYXJ5VXNlS2luZCgp KSB7Ci0gICAgICAgIGNhc2UgSW50MzJVc2U6IHsKLSAgICAgICAgICAgIExWYWx1ZSBsZWZ0ID0g bG93SW50MzIobV9ub2RlLT5jaGlsZDEoKSk7Ci0gICAgICAgICAgICBMVmFsdWUgcmlnaHQgPSBs b3dJbnQzMihtX25vZGUtPmNoaWxkMigpKTsKLSAgICAgICAgICAgIAotICAgICAgICAgICAgaWYg KGJ5dGVjb2RlQ2FuVHJ1bmNhdGVJbnRlZ2VyKG1fbm9kZS0+YXJpdGhOb2RlRmxhZ3MoKSkpIHsK LSAgICAgICAgICAgICAgICBzZXRJbnQzMihtX291dC5zdWIobGVmdCwgcmlnaHQpKTsKLSAgICAg ICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgIH0KLSAgICAgICAgICAgIAotICAgICAgICAg ICAgTFZhbHVlIHJlc3VsdCA9IG1fb3V0LnN1YldpdGhPdmVyZmxvdzMyKGxlZnQsIHJpZ2h0KTsK KworICAgICAgICAgICAgTFZhbHVlIHJlc3VsdCA9IGlzU3ViID8gbV9vdXQuc3ViV2l0aE92ZXJm bG93MzIobGVmdCwgcmlnaHQpIDogbV9vdXQuYWRkV2l0aE92ZXJmbG93MzIobGVmdCwgcmlnaHQp OworCiAgICAgICAgICAgICBzcGVjdWxhdGUoT3ZlcmZsb3csIG5vVmFsdWUoKSwgMCwgbV9vdXQu ZXh0cmFjdFZhbHVlKHJlc3VsdCwgMSkpOwogICAgICAgICAgICAgc2V0SW50MzIobV9vdXQuZXh0 cmFjdFZhbHVlKHJlc3VsdCwgMCkpOwogICAgICAgICAgICAgYnJlYWs7CkBAIC03MjYsMjEgKzY4 MSwyMyBAQCBwcml2YXRlOgogICAgICAgICAgICAgICAgIEludDUyS2luZCBraW5kOwogICAgICAg ICAgICAgICAgIExWYWx1ZSBsZWZ0ID0gbG93V2hpY2hldmVySW50NTIobV9ub2RlLT5jaGlsZDEo KSwga2luZCk7CiAgICAgICAgICAgICAgICAgTFZhbHVlIHJpZ2h0ID0gbG93SW50NTIobV9ub2Rl LT5jaGlsZDIoKSwga2luZCk7Ci0gICAgICAgICAgICAgICAgc2V0SW50NTIobV9vdXQuc3ViKGxl ZnQsIHJpZ2h0KSwga2luZCk7CisgICAgICAgICAgICAgICAgc2V0SW50NTIoaXNTdWIgPyBtX291 dC5zdWIobGVmdCwgcmlnaHQpIDogbV9vdXQuYWRkKGxlZnQsIHJpZ2h0KSwga2luZCk7CiAgICAg ICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICAKICAgICAgICAg ICAgIExWYWx1ZSBsZWZ0ID0gbG93SW50NTIobV9ub2RlLT5jaGlsZDEoKSk7CiAgICAgICAgICAg ICBMVmFsdWUgcmlnaHQgPSBsb3dJbnQ1MihtX25vZGUtPmNoaWxkMigpKTsKLSAgICAgICAgICAg IExWYWx1ZSByZXN1bHQgPSBtX291dC5zdWJXaXRoT3ZlcmZsb3c2NChsZWZ0LCByaWdodCk7Cisg ICAgICAgICAgICBMVmFsdWUgcmVzdWx0ID0gaXNTdWIgPyBtX291dC5zdWJXaXRoT3ZlcmZsb3c2 NChsZWZ0LCByaWdodCkgOiBtX291dC5hZGRXaXRoT3ZlcmZsb3c2NChsZWZ0LCByaWdodCk7CiAg ICAgICAgICAgICBzcGVjdWxhdGUoSW50NTJPdmVyZmxvdywgbm9WYWx1ZSgpLCAwLCBtX291dC5l eHRyYWN0VmFsdWUocmVzdWx0LCAxKSk7CiAgICAgICAgICAgICBzZXRJbnQ1MihtX291dC5leHRy YWN0VmFsdWUocmVzdWx0LCAwKSk7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQogICAg ICAgICAgICAgCiAgICAgICAgIGNhc2UgTnVtYmVyVXNlOiB7Ci0gICAgICAgICAgICBzZXREb3Vi bGUoCi0gICAgICAgICAgICAgICAgbV9vdXQuZG91YmxlU3ViKGxvd0RvdWJsZShtX25vZGUtPmNo aWxkMSgpKSwgbG93RG91YmxlKG1fbm9kZS0+Y2hpbGQyKCkpKSk7CisgICAgICAgICAgICBMVmFs dWUgQzEgPSBsb3dEb3VibGUobV9ub2RlLT5jaGlsZDEoKSk7CisgICAgICAgICAgICBMVmFsdWUg QzIgPSBsb3dEb3VibGUobV9ub2RlLT5jaGlsZDIoKSk7CisKKyAgICAgICAgICAgIHNldERvdWJs ZShpc1N1YiA/IG1fb3V0LmRvdWJsZVN1YihDMSwgQzIpIDogbV9vdXQuZG91YmxlQWRkKEMxLCBD MikpOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIH0KICAgICAgICAgICAgIAo=