104457 2012-12-08 14:22:45 -0800 Remove code duplicates from MacroAssemblerARM 2013-04-10 13:32:16 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Other All RESOLVED FIXED P2 Normal --- 108645 1 paroga paroga barraclough dbates fpizlo loki oliver ossy rgabor webkit.review.bot zherczeg oldest_to_newest 786623 0 paroga 2012-12-08 14:22:45 -0800 Remove code duplicates from MacroAssemblerARM 786625 1 178381 paroga 2012-12-08 14:30:34 -0800 Created attachment 178381 Patch 786626 2 178381 darin 2012-12-08 14:32:42 -0800 Comment on attachment 178381 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=178381&action=review > Source/JavaScriptCore/assembler/MacroAssemblerARM.h:491 > - m_assembler.ldrUniqueImmediate(ARMRegisters::S0, reinterpret_cast<ARMWord>(address)); > - m_assembler.moveImm(imm.m_value, ARMRegisters::S1); > - m_assembler.dtrUp(ARMAssembler::StoreUint32, ARMRegisters::S1, ARMRegisters::S0, 0); > + move(imm, ARMRegisters::S1); > + store32(ARMRegisters::S1, address); This doesn’t generate the same code. The moveImm will now come first, before the ldrUniqueImmediate. Is that OK? Is one or the other faster? 823310 3 186152 paroga 2013-02-01 14:56:31 -0800 Created attachment 186152 Patch 833849 4 ossy 2013-02-15 03:28:42 -0800 Could you check this bug? 834183 5 186152 webkit.review.bot 2013-02-15 10:58:29 -0800 Comment on attachment 186152 Patch Rejecting attachment 186152 from review queue. oliver@apple.com does not have reviewer permissions according to http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitpy/common/config/committers.py. - If you do not have reviewer rights please read http://webkit.org/coding/contributing.html for instructions on how to use bugzilla flags. - If you have reviewer rights please correct the error in Tools/Scripts/webkitpy/common/config/committers.py by adding yourself to the file (no review needed). The commit-queue restarts itself every 2 hours. After restart the commit-queue will correctly respect your reviewer rights. 834193 6 186152 webkit.review.bot 2013-02-15 11:13:28 -0800 Comment on attachment 186152 Patch Rejecting attachment 186152 from commit-queue. oliver@apple.com does not have committer permissions according to http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitpy/common/config/committers.py. - If you do not have committer rights please read http://webkit.org/coding/contributing.html for instructions on how to use bugzilla flags. - If you have committer rights please correct the error in Tools/Scripts/webkitpy/common/config/committers.py by adding yourself to the file (no review needed). The commit-queue restarts itself every 2 hours. After restart the commit-queue will correctly respect your committer rights. 873199 7 paroga 2013-04-10 13:32:16 -0700 Committed r148134: <http://trac.webkit.org/changeset/148134> 178381 2012-12-08 14:30:34 -0800 2013-02-01 14:56:27 -0800 Patch bug-104457.patch text/plain 4384 paroga ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDQxOTllMmIuLjdjNjIyOTAgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEyLTEyLTA4ICBQYXRyaWNrIEdhbnN0 ZXJlciAgPHBhcm9nYUB3ZWJraXQub3JnPgorCisgICAgICAgIFJlbW92ZSBjb2RlIGR1cGxpY2F0 ZXMgZnJvbSBNYWNyb0Fzc2VtYmxlckFSTQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTA0NDU3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgUmV1c2Ugc29tZSBleGlzdGluZyBtZXRob2RzIHRvIGF2b2lkIGR1 cGxpY2F0ZWQgY29kZS4KKworICAgICAgICAqIGFzc2VtYmxlci9NYWNyb0Fzc2VtYmxlckFSTS5o OgorICAgICAgICAoSlNDOjpNYWNyb0Fzc2VtYmxlckFSTTo6c3RvcmU4KToKKyAgICAgICAgKEpT Qzo6TWFjcm9Bc3NlbWJsZXJBUk06OnN0b3JlMzIpOgorICAgICAgICAoSlNDOjpNYWNyb0Fzc2Vt YmxlckFSTTo6c3dhcCk6CisgICAgICAgIChKU0M6Ok1hY3JvQXNzZW1ibGVyQVJNOjphZGQzMik6 CisgICAgICAgIChKU0M6Ok1hY3JvQXNzZW1ibGVyQVJNOjpzdWIzMik6CisKIDIwMTItMTItMDcg IEpvbmF0aGFuIExpdSAgPG5ldDE0N0BnbWFpbC5jb20+CiAKICAgICAgICAgQWRkIG1pc3Npbmcg Zm9yd2FyZCBkZWNsYXJhdGlvbiBmb3IgSlNDOjpBcnJheUFsbG9jYXRpb25Qcm9maWxlCmRpZmYg LS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL01hY3JvQXNzZW1ibGVyQVJN LmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL01hY3JvQXNzZW1ibGVyQVJNLmgK aW5kZXggZTZiNWFkMy4uMjU2MWIwYiAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3Jl L2Fzc2VtYmxlci9NYWNyb0Fzc2VtYmxlckFSTS5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9hc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJBUk0uaApAQCAtNDQ1LDEwICs0NDUsMTAgQEAgcHVi bGljOgogICAgICAgICBtX2Fzc2VtYmxlci5iYXNlSW5kZXhUcmFuc2ZlcjMyKEFSTUFzc2VtYmxl cjo6U3RvcmVVaW50OCwgc3JjLCBhZGRyZXNzLmJhc2UsIGFkZHJlc3MuaW5kZXgsIHN0YXRpY19j YXN0PGludD4oYWRkcmVzcy5zY2FsZSksIGFkZHJlc3Mub2Zmc2V0KTsKICAgICB9CiAKLSAgICB2 b2lkIHN0b3JlOChUcnVzdGVkSW1tMzIgaW1tLCB2b2lkKiBhZGRyZXNzKQorICAgIHZvaWQgc3Rv cmU4KFRydXN0ZWRJbW0zMiBpbW0sIGNvbnN0IHZvaWQqIGFkZHJlc3MpCiAgICAgewogICAgICAg ICBtb3ZlKFRydXN0ZWRJbW0zMihyZWludGVycHJldF9jYXN0PEFSTVdvcmQ+KGFkZHJlc3MpKSwg QVJNUmVnaXN0ZXJzOjpTMCk7Ci0gICAgICAgIG1fYXNzZW1ibGVyLm1vdmVJbW0oaW1tLm1fdmFs dWUsIEFSTVJlZ2lzdGVyczo6UzEpOworICAgICAgICBtb3ZlKGltbSwgQVJNUmVnaXN0ZXJzOjpT MSk7CiAgICAgICAgIG1fYXNzZW1ibGVyLmR0clVwKEFSTUFzc2VtYmxlcjo6U3RvcmVVaW50OCwg QVJNUmVnaXN0ZXJzOjpTMSwgQVJNUmVnaXN0ZXJzOjpTMCwgMCk7CiAgICAgfQogCkBAIC00Nzks MTcgKzQ3OSwxNiBAQCBwdWJsaWM6CiAgICAgICAgIG1fYXNzZW1ibGVyLmJhc2VJbmRleFRyYW5z ZmVyMzIoQVJNQXNzZW1ibGVyOjpTdG9yZVVpbnQzMiwgQVJNUmVnaXN0ZXJzOjpTMSwgYWRkcmVz cy5iYXNlLCBhZGRyZXNzLmluZGV4LCBzdGF0aWNfY2FzdDxpbnQ+KGFkZHJlc3Muc2NhbGUpLCBh ZGRyZXNzLm9mZnNldCk7CiAgICAgfQogCi0gICAgdm9pZCBzdG9yZTMyKFJlZ2lzdGVySUQgc3Jj LCB2b2lkKiBhZGRyZXNzKQorICAgIHZvaWQgc3RvcmUzMihSZWdpc3RlcklEIHNyYywgY29uc3Qg dm9pZCogYWRkcmVzcykKICAgICB7CiAgICAgICAgIG1fYXNzZW1ibGVyLmxkclVuaXF1ZUltbWVk aWF0ZShBUk1SZWdpc3RlcnM6OlMwLCByZWludGVycHJldF9jYXN0PEFSTVdvcmQ+KGFkZHJlc3Mp KTsKICAgICAgICAgbV9hc3NlbWJsZXIuZHRyVXAoQVJNQXNzZW1ibGVyOjpTdG9yZVVpbnQzMiwg c3JjLCBBUk1SZWdpc3RlcnM6OlMwLCAwKTsKICAgICB9CiAKLSAgICB2b2lkIHN0b3JlMzIoVHJ1 c3RlZEltbTMyIGltbSwgdm9pZCogYWRkcmVzcykKKyAgICB2b2lkIHN0b3JlMzIoVHJ1c3RlZElt bTMyIGltbSwgY29uc3Qgdm9pZCogYWRkcmVzcykKICAgICB7Ci0gICAgICAgIG1fYXNzZW1ibGVy LmxkclVuaXF1ZUltbWVkaWF0ZShBUk1SZWdpc3RlcnM6OlMwLCByZWludGVycHJldF9jYXN0PEFS TVdvcmQ+KGFkZHJlc3MpKTsKLSAgICAgICAgbV9hc3NlbWJsZXIubW92ZUltbShpbW0ubV92YWx1 ZSwgQVJNUmVnaXN0ZXJzOjpTMSk7Ci0gICAgICAgIG1fYXNzZW1ibGVyLmR0clVwKEFSTUFzc2Vt Ymxlcjo6U3RvcmVVaW50MzIsIEFSTVJlZ2lzdGVyczo6UzEsIEFSTVJlZ2lzdGVyczo6UzAsIDAp OworICAgICAgICBtb3ZlKGltbSwgQVJNUmVnaXN0ZXJzOjpTMSk7CisgICAgICAgIHN0b3JlMzIo QVJNUmVnaXN0ZXJzOjpTMSwgYWRkcmVzcyk7CiAgICAgfQogCiAgICAgdm9pZCBwb3AoUmVnaXN0 ZXJJRCBkZXN0KQpAQCAtNTMyLDkgKzUzMSw5IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgc3dhcChS ZWdpc3RlcklEIHJlZzEsIFJlZ2lzdGVySUQgcmVnMikKICAgICB7Ci0gICAgICAgIG1fYXNzZW1i bGVyLm1vdihBUk1SZWdpc3RlcnM6OlMwLCByZWcxKTsKLSAgICAgICAgbV9hc3NlbWJsZXIubW92 KHJlZzEsIHJlZzIpOwotICAgICAgICBtX2Fzc2VtYmxlci5tb3YocmVnMiwgQVJNUmVnaXN0ZXJz OjpTMCk7CisgICAgICAgIG1vdmUocmVnMSwgQVJNUmVnaXN0ZXJzOjpTMCk7CisgICAgICAgIG1v dmUocmVnMiwgcmVnMSk7CisgICAgICAgIG1vdmUoQVJNUmVnaXN0ZXJzOjpTMCwgcmVnMik7CiAg ICAgfQogCiAgICAgdm9pZCBzaWduRXh0ZW5kMzJUb1B0cihSZWdpc3RlcklEIHNyYywgUmVnaXN0 ZXJJRCBkZXN0KQpAQCAtODg2LDIwICs4ODUsMTYgQEAgcHVibGljOgogCiAgICAgdm9pZCBhZGQz MihUcnVzdGVkSW1tMzIgaW1tLCBBYnNvbHV0ZUFkZHJlc3MgYWRkcmVzcykKICAgICB7Ci0gICAg ICAgIG1fYXNzZW1ibGVyLmxkclVuaXF1ZUltbWVkaWF0ZShBUk1SZWdpc3RlcnM6OlMxLCByZWlu dGVycHJldF9jYXN0PEFSTVdvcmQ+KGFkZHJlc3MubV9wdHIpKTsKLSAgICAgICAgbV9hc3NlbWJs ZXIuZHRyVXAoQVJNQXNzZW1ibGVyOjpMb2FkVWludDMyLCBBUk1SZWdpc3RlcnM6OlMxLCBBUk1S ZWdpc3RlcnM6OlMxLCAwKTsKKyAgICAgICAgbG9hZDMyKGFkZHJlc3MubV9wdHIsIEFSTVJlZ2lz dGVyczo6UzEpOwogICAgICAgICBhZGQzMihpbW0sIEFSTVJlZ2lzdGVyczo6UzEpOwotICAgICAg ICBtX2Fzc2VtYmxlci5sZHJVbmlxdWVJbW1lZGlhdGUoQVJNUmVnaXN0ZXJzOjpTMCwgcmVpbnRl cnByZXRfY2FzdDxBUk1Xb3JkPihhZGRyZXNzLm1fcHRyKSk7Ci0gICAgICAgIG1fYXNzZW1ibGVy LmR0clVwKEFSTUFzc2VtYmxlcjo6U3RvcmVVaW50MzIsIEFSTVJlZ2lzdGVyczo6UzEsIEFSTVJl Z2lzdGVyczo6UzAsIDApOworICAgICAgICBzdG9yZTMyKEFSTVJlZ2lzdGVyczo6UzEsIGFkZHJl c3MubV9wdHIpOwogICAgIH0KIAogICAgIHZvaWQgc3ViMzIoVHJ1c3RlZEltbTMyIGltbSwgQWJz b2x1dGVBZGRyZXNzIGFkZHJlc3MpCiAgICAgewotICAgICAgICBtX2Fzc2VtYmxlci5sZHJVbmlx dWVJbW1lZGlhdGUoQVJNUmVnaXN0ZXJzOjpTMSwgcmVpbnRlcnByZXRfY2FzdDxBUk1Xb3JkPihh ZGRyZXNzLm1fcHRyKSk7Ci0gICAgICAgIG1fYXNzZW1ibGVyLmR0clVwKEFSTUFzc2VtYmxlcjo6 TG9hZFVpbnQzMiwgQVJNUmVnaXN0ZXJzOjpTMSwgQVJNUmVnaXN0ZXJzOjpTMSwgMCk7CisgICAg ICAgIGxvYWQzMihhZGRyZXNzLm1fcHRyLCBBUk1SZWdpc3RlcnM6OlMxKTsKICAgICAgICAgc3Vi MzIoaW1tLCBBUk1SZWdpc3RlcnM6OlMxKTsKLSAgICAgICAgbV9hc3NlbWJsZXIubGRyVW5pcXVl SW1tZWRpYXRlKEFSTVJlZ2lzdGVyczo6UzAsIHJlaW50ZXJwcmV0X2Nhc3Q8QVJNV29yZD4oYWRk cmVzcy5tX3B0cikpOwotICAgICAgICBtX2Fzc2VtYmxlci5kdHJVcChBUk1Bc3NlbWJsZXI6OlN0 b3JlVWludDMyLCBBUk1SZWdpc3RlcnM6OlMxLCBBUk1SZWdpc3RlcnM6OlMwLCAwKTsKKyAgICAg ICAgc3RvcmUzMihBUk1SZWdpc3RlcnM6OlMxLCBhZGRyZXNzLm1fcHRyKTsKICAgICB9CiAKICAg ICB2b2lkIGxvYWQzMihjb25zdCB2b2lkKiBhZGRyZXNzLCBSZWdpc3RlcklEIGRlc3QpCg== 186152 2013-02-01 14:56:31 -0800 2013-02-15 11:13:28 -0800 Patch bug-104457-20130201235313.patch text/plain 4427 paroga U3VidmVyc2lvbiBSZXZpc2lvbjogMTQxNjQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA5 MjZiMmNlMjY3ZDNmNDhjNzRiMDQwYTcyZGU3MjE4NTdiZDU1NzFmLi5lMTVmODgyNGUxZjI0ZTFk ODg0NDg3YThmOGYxN2YyOWUxNDE1MDk2IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxOSBAQAorMjAxMy0wMi0wMSAgUGF0cmljayBHYW5zdGVyZXIgIDxwYXJvZ2FAd2Via2l0 Lm9yZz4KKworICAgICAgICBSZW1vdmUgY29kZSBkdXBsaWNhdGVzIGZyb20gTWFjcm9Bc3NlbWJs ZXJBUk0KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEw NDQ1NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJl dXNlIHNvbWUgZXhpc3RpbmcgbWV0aG9kcyB0byBhdm9pZCBkdXBsaWNhdGVkIGNvZGUuCisKKyAg ICAgICAgKiBhc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJBUk0uaDoKKyAgICAgICAgKEpTQzo6TWFj cm9Bc3NlbWJsZXJBUk06OnN0b3JlOCk6CisgICAgICAgIChKU0M6Ok1hY3JvQXNzZW1ibGVyQVJN OjpzdG9yZTMyKToKKyAgICAgICAgKEpTQzo6TWFjcm9Bc3NlbWJsZXJBUk06OnN3YXApOgorICAg ICAgICAoSlNDOjpNYWNyb0Fzc2VtYmxlckFSTTo6YWRkMzIpOgorICAgICAgICAoSlNDOjpNYWNy b0Fzc2VtYmxlckFSTTo6c3ViMzIpOgorCiAyMDEzLTAyLTAxICBCYWxhenMgS2lsdmFkeSAgPGtp bHZhZHliQGhvbWVqaW5uaS5jb20+CiAKICAgICAgICAgb2ZmbGluZWFzbSBCYXNlSW5kZXggaGFu ZGxpbmcgaXMgYnJva2VuIG9uIEFSTSBkdWUgdG8gTUlQUyBjaGFuZ2VzCmRpZmYgLS1naXQgYS9T b3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL01hY3JvQXNzZW1ibGVyQVJNLmggYi9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL01hY3JvQXNzZW1ibGVyQVJNLmgKaW5kZXggZWJk YmNlYWUxMDRmZjkzZjAyZmFhY2M1OWI0Yzc5YmI3ZmZmMmMxNC4uMmM2OTc3ZWYzOWM0YWI4M2Fm NThkMjJjMzA3ZmFlMTg1MzYzMmZmOCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3Jl L2Fzc2VtYmxlci9NYWNyb0Fzc2VtYmxlckFSTS5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9hc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJBUk0uaApAQCAtNDQ1LDEwICs0NDUsMTAgQEAgcHVi bGljOgogICAgICAgICBtX2Fzc2VtYmxlci5iYXNlSW5kZXhUcmFuc2ZlcjMyKEFSTUFzc2VtYmxl cjo6U3RvcmVVaW50OCwgc3JjLCBhZGRyZXNzLmJhc2UsIGFkZHJlc3MuaW5kZXgsIHN0YXRpY19j YXN0PGludD4oYWRkcmVzcy5zY2FsZSksIGFkZHJlc3Mub2Zmc2V0KTsKICAgICB9CiAKLSAgICB2 b2lkIHN0b3JlOChUcnVzdGVkSW1tMzIgaW1tLCB2b2lkKiBhZGRyZXNzKQorICAgIHZvaWQgc3Rv cmU4KFRydXN0ZWRJbW0zMiBpbW0sIGNvbnN0IHZvaWQqIGFkZHJlc3MpCiAgICAgewogICAgICAg ICBtb3ZlKFRydXN0ZWRJbW0zMihyZWludGVycHJldF9jYXN0PEFSTVdvcmQ+KGFkZHJlc3MpKSwg QVJNUmVnaXN0ZXJzOjpTMCk7Ci0gICAgICAgIG1fYXNzZW1ibGVyLm1vdmVJbW0oaW1tLm1fdmFs dWUsIEFSTVJlZ2lzdGVyczo6UzEpOworICAgICAgICBtb3ZlKGltbSwgQVJNUmVnaXN0ZXJzOjpT MSk7CiAgICAgICAgIG1fYXNzZW1ibGVyLmR0clVwKEFSTUFzc2VtYmxlcjo6U3RvcmVVaW50OCwg QVJNUmVnaXN0ZXJzOjpTMSwgQVJNUmVnaXN0ZXJzOjpTMCwgMCk7CiAgICAgfQogCkBAIC00Nzks MTMgKzQ3OSwxMyBAQCBwdWJsaWM6CiAgICAgICAgIG1fYXNzZW1ibGVyLmJhc2VJbmRleFRyYW5z ZmVyMzIoQVJNQXNzZW1ibGVyOjpTdG9yZVVpbnQzMiwgQVJNUmVnaXN0ZXJzOjpTMSwgYWRkcmVz cy5iYXNlLCBhZGRyZXNzLmluZGV4LCBzdGF0aWNfY2FzdDxpbnQ+KGFkZHJlc3Muc2NhbGUpLCBh ZGRyZXNzLm9mZnNldCk7CiAgICAgfQogCi0gICAgdm9pZCBzdG9yZTMyKFJlZ2lzdGVySUQgc3Jj LCB2b2lkKiBhZGRyZXNzKQorICAgIHZvaWQgc3RvcmUzMihSZWdpc3RlcklEIHNyYywgY29uc3Qg dm9pZCogYWRkcmVzcykKICAgICB7CiAgICAgICAgIG1fYXNzZW1ibGVyLmxkclVuaXF1ZUltbWVk aWF0ZShBUk1SZWdpc3RlcnM6OlMwLCByZWludGVycHJldF9jYXN0PEFSTVdvcmQ+KGFkZHJlc3Mp KTsKICAgICAgICAgbV9hc3NlbWJsZXIuZHRyVXAoQVJNQXNzZW1ibGVyOjpTdG9yZVVpbnQzMiwg c3JjLCBBUk1SZWdpc3RlcnM6OlMwLCAwKTsKICAgICB9CiAKLSAgICB2b2lkIHN0b3JlMzIoVHJ1 c3RlZEltbTMyIGltbSwgdm9pZCogYWRkcmVzcykKKyAgICB2b2lkIHN0b3JlMzIoVHJ1c3RlZElt bTMyIGltbSwgY29uc3Qgdm9pZCogYWRkcmVzcykKICAgICB7CiAgICAgICAgIG1fYXNzZW1ibGVy LmxkclVuaXF1ZUltbWVkaWF0ZShBUk1SZWdpc3RlcnM6OlMwLCByZWludGVycHJldF9jYXN0PEFS TVdvcmQ+KGFkZHJlc3MpKTsKICAgICAgICAgbV9hc3NlbWJsZXIubW92ZUltbShpbW0ubV92YWx1 ZSwgQVJNUmVnaXN0ZXJzOjpTMSk7CkBAIC01MzIsOSArNTMyLDkgQEAgcHVibGljOgogCiAgICAg dm9pZCBzd2FwKFJlZ2lzdGVySUQgcmVnMSwgUmVnaXN0ZXJJRCByZWcyKQogICAgIHsKLSAgICAg ICAgbV9hc3NlbWJsZXIubW92KEFSTVJlZ2lzdGVyczo6UzAsIHJlZzEpOwotICAgICAgICBtX2Fz c2VtYmxlci5tb3YocmVnMSwgcmVnMik7Ci0gICAgICAgIG1fYXNzZW1ibGVyLm1vdihyZWcyLCBB Uk1SZWdpc3RlcnM6OlMwKTsKKyAgICAgICAgbW92ZShyZWcxLCBBUk1SZWdpc3RlcnM6OlMwKTsK KyAgICAgICAgbW92ZShyZWcyLCByZWcxKTsKKyAgICAgICAgbW92ZShBUk1SZWdpc3RlcnM6OlMw LCByZWcyKTsKICAgICB9CiAKICAgICB2b2lkIHNpZ25FeHRlbmQzMlRvUHRyKFJlZ2lzdGVySUQg c3JjLCBSZWdpc3RlcklEIGRlc3QpCkBAIC04ODYsMTEgKzg4Niw5IEBAIHB1YmxpYzoKIAogICAg IHZvaWQgYWRkMzIoVHJ1c3RlZEltbTMyIGltbSwgQWJzb2x1dGVBZGRyZXNzIGFkZHJlc3MpCiAg ICAgewotICAgICAgICBtX2Fzc2VtYmxlci5sZHJVbmlxdWVJbW1lZGlhdGUoQVJNUmVnaXN0ZXJz OjpTMSwgcmVpbnRlcnByZXRfY2FzdDxBUk1Xb3JkPihhZGRyZXNzLm1fcHRyKSk7Ci0gICAgICAg IG1fYXNzZW1ibGVyLmR0clVwKEFSTUFzc2VtYmxlcjo6TG9hZFVpbnQzMiwgQVJNUmVnaXN0ZXJz OjpTMSwgQVJNUmVnaXN0ZXJzOjpTMSwgMCk7CisgICAgICAgIGxvYWQzMihhZGRyZXNzLm1fcHRy LCBBUk1SZWdpc3RlcnM6OlMxKTsKICAgICAgICAgYWRkMzIoaW1tLCBBUk1SZWdpc3RlcnM6OlMx KTsKLSAgICAgICAgbV9hc3NlbWJsZXIubGRyVW5pcXVlSW1tZWRpYXRlKEFSTVJlZ2lzdGVyczo6 UzAsIHJlaW50ZXJwcmV0X2Nhc3Q8QVJNV29yZD4oYWRkcmVzcy5tX3B0cikpOwotICAgICAgICBt X2Fzc2VtYmxlci5kdHJVcChBUk1Bc3NlbWJsZXI6OlN0b3JlVWludDMyLCBBUk1SZWdpc3RlcnM6 OlMxLCBBUk1SZWdpc3RlcnM6OlMwLCAwKTsKKyAgICAgICAgc3RvcmUzMihBUk1SZWdpc3RlcnM6 OlMxLCBhZGRyZXNzLm1fcHRyKTsKICAgICB9CiAKICAgICB2b2lkIGFkZDY0KFRydXN0ZWRJbW0z MiBpbW0sIEFic29sdXRlQWRkcmVzcyBhZGRyZXNzKQpAQCAtOTIwLDExICs5MTgsOSBAQCBwdWJs aWM6CiAKICAgICB2b2lkIHN1YjMyKFRydXN0ZWRJbW0zMiBpbW0sIEFic29sdXRlQWRkcmVzcyBh ZGRyZXNzKQogICAgIHsKLSAgICAgICAgbV9hc3NlbWJsZXIubGRyVW5pcXVlSW1tZWRpYXRlKEFS TVJlZ2lzdGVyczo6UzEsIHJlaW50ZXJwcmV0X2Nhc3Q8QVJNV29yZD4oYWRkcmVzcy5tX3B0cikp OwotICAgICAgICBtX2Fzc2VtYmxlci5kdHJVcChBUk1Bc3NlbWJsZXI6OkxvYWRVaW50MzIsIEFS TVJlZ2lzdGVyczo6UzEsIEFSTVJlZ2lzdGVyczo6UzEsIDApOworICAgICAgICBsb2FkMzIoYWRk cmVzcy5tX3B0ciwgQVJNUmVnaXN0ZXJzOjpTMSk7CiAgICAgICAgIHN1YjMyKGltbSwgQVJNUmVn aXN0ZXJzOjpTMSk7Ci0gICAgICAgIG1fYXNzZW1ibGVyLmxkclVuaXF1ZUltbWVkaWF0ZShBUk1S ZWdpc3RlcnM6OlMwLCByZWludGVycHJldF9jYXN0PEFSTVdvcmQ+KGFkZHJlc3MubV9wdHIpKTsK LSAgICAgICAgbV9hc3NlbWJsZXIuZHRyVXAoQVJNQXNzZW1ibGVyOjpTdG9yZVVpbnQzMiwgQVJN UmVnaXN0ZXJzOjpTMSwgQVJNUmVnaXN0ZXJzOjpTMCwgMCk7CisgICAgICAgIHN0b3JlMzIoQVJN UmVnaXN0ZXJzOjpTMSwgYWRkcmVzcy5tX3B0cik7CiAgICAgfQogCiAgICAgdm9pZCBsb2FkMzIo Y29uc3Qgdm9pZCogYWRkcmVzcywgUmVnaXN0ZXJJRCBkZXN0KQo=