147893 2015-08-11 12:28:00 -0700 jsc-tailcall: Arity fixup should make use of the possible extra empty slots at top of the frame 2015-08-11 19:00:24 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 basile_clement basile_clement fpizlo ggaren mark.lam msaboff oldest_to_newest 1116644 0 basile_clement 2015-08-11 12:28:00 -0700 This would: - Allow to not have to move the call frame when there is a single missing argument and the top of the frame was not aligned - Make computing the "real" frame simpler: any frame always has aligned size alignUp(max(argCount, numParameters) + CallFrameHeaderSize). Right now, the formula is quite contrived: alignUp(max(argCount, argCount + alignUp(numParameters - argCount)) + CallFrameHeaderSize) 1116801 1 258786 basile_clement 2015-08-11 17:35:58 -0700 Created attachment 258786 Patch 1116805 2 258786 msaboff 2015-08-11 17:58:06 -0700 Comment on attachment 258786 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=258786&action=review r=me > Source/JavaScriptCore/jit/ThunkGenerators.cpp:443 > + jit.store32(JSInterfaceJIT::regT5, MacroAssembler::BaseIndex(JSInterfaceJIT::callFrameRegister, JSInterfaceJIT::argumentGPR2, JSInterfaceJIT::TimesEight)); > + jit.move(JSInterfaceJIT::TrustedImm32(JSValue::UndefinedTag), JSInterfaceJIT::regT5); > + jit.store32(JSInterfaceJIT::regT5, MacroAssembler::BaseIndex(JSInterfaceJIT::callFrameRegister, JSInterfaceJIT::argumentGPR2, JSInterfaceJIT::TimesEight, 4)); Instead of no offset or 4 and even though the existing code does this, use OBJECT_OFFSETOF(JSValue, u.asBits.payload) and OBJECT_OFFSETOF(JSValue, u.asBits.tag). 1116808 3 basile_clement 2015-08-11 18:03:49 -0700 (In reply to comment #2) > Comment on attachment 258786 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=258786&action=review > > r=me > > > Source/JavaScriptCore/jit/ThunkGenerators.cpp:443 > > + jit.store32(JSInterfaceJIT::regT5, MacroAssembler::BaseIndex(JSInterfaceJIT::callFrameRegister, JSInterfaceJIT::argumentGPR2, JSInterfaceJIT::TimesEight)); > > + jit.move(JSInterfaceJIT::TrustedImm32(JSValue::UndefinedTag), JSInterfaceJIT::regT5); > > + jit.store32(JSInterfaceJIT::regT5, MacroAssembler::BaseIndex(JSInterfaceJIT::callFrameRegister, JSInterfaceJIT::argumentGPR2, JSInterfaceJIT::TimesEight, 4)); > > Instead of no offset or 4 and even though the existing code does this, use > OBJECT_OFFSETOF(JSValue, u.asBits.payload) and OBJECT_OFFSETOF(JSValue, > u.asBits.tag). Fixed locally (with the TagOffset and PayloadOffset shorthands). 1116825 4 basile_clement 2015-08-11 19:00:24 -0700 Committed r188318 <http://trac.webkit.org/changeset/188318>. 258786 2015-08-11 17:35:58 -0700 2015-08-11 17:58:06 -0700 Patch bug-147893-20150811173542.patch text/plain 13695 basile_clement U3VidmVyc2lvbiBSZXZpc2lvbjogMTg4Mjg5CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBm OGFhOWM0Y2RlMjg0MGFlZmZjNmM1MDhiYjU1MGNmNDE4NmRiMmZlLi44N2E4MmY2NzY5OGZlOWY1 MThlMTI1MjZiOWQ4OGI4ZWM4ZWMzZDdkIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs NSArMSwzMiBAQAogMjAxNS0wOC0xMSAgQmFzaWxlIENsZW1lbnQgIDxiYXNpbGVfY2xlbWVudEBh cHBsZS5jb20+CiAKKyAgICAgICAganNjLXRhaWxjYWxsOiBBcml0eSBmaXh1cCBzaG91bGQgbWFr ZSB1c2Ugb2YgdGhlIHBvc3NpYmxlIGV4dHJhIGVtcHR5IHNsb3RzIGF0IHRvcCBvZiB0aGUgZnJh bWUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0Nzg5 MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMg Y2hhbmdlcyB0aGUgd2F5IGFyaXR5IGZpeHVwIGlzIHBlcmZvcm1lZC4gU2luY2UgcjE4Nzc2Nywg d2UgYWx3YXlzCisgICAgICAgIGVuc3VyZSB0aGF0IHRoZSB0b3RhbCBhbW91bnQgb2Ygc3BhY2Ug cmVzZXJ2ZWQgZm9yIGEgY2FsbCBmcmFtZSBpcworICAgICAgICBzdGFjay1hbGlnbmVkLCB3aGlj aCBtZWFucyB0aGF0IGZvciBhIG5vbi1hbGlnbmVkIGNhbGwgZnJhbWUgc2l6ZSwgd2UKKyAgICAg ICAgaGF2ZSBhbiBhZGRpdGlvbmFsICJmcmVlIiBzbG90IGF0IHRoZSB0b3Agb2YgdGhlIGZyYW1l LiBUaGlzIG1ha2VzIGl0CisgICAgICAgIHNvIHRoYXQgd2hlbiBwZXJmb3JtaW5nIGFyaXR5IGZp eHVwLCB3ZSBmaXJzdCB1c2UgdGhhdCBzcGFjZSBpZgorICAgICAgICBuZWNlc3NhcnkgYmVmb3Jl IG1vdmluZyB0aGUgZnJhbWUgZG93bi4KKworICAgICAgICBUaGlzIGVuc3VyZXMgdGhhdCB0aGUg dG90YWwgc3RhY2sgc3BhY2UgdXNlZCBieSBhIGZyYW1lIGlzIGFsd2F5cworICAgICAgICBtYXgo YXJnQ291bnQsIG51bVBhcmFtZXRlcnMpICsgSlNTdGFjazo6Q2FsbEZyYW1lSGVhZGVyU2l6ZSwg cm91bmRlZCB1cAorICAgICAgICB0byBiZSBhIG11bHRpcGxlIG9mIDIuCisKKyAgICAgICAgKiBq aXQvQ0NhbGxIZWxwZXJzLmg6CisgICAgICAgICogaml0L1RodW5rR2VuZXJhdG9ycy5jcHA6Cisg ICAgICAgIChKU0M6OmFyaXR5Rml4dXBHZW5lcmF0b3IpOgorICAgICAgICAqIGxsaW50L0xvd0xl dmVsSW50ZXJwcmV0ZXIuYXNtOgorICAgICAgICAqIGxsaW50L0xvd0xldmVsSW50ZXJwcmV0ZXIz Ml82NC5hc206CisgICAgICAgICogbGxpbnQvTG93TGV2ZWxJbnRlcnByZXRlcjY0LmFzbToKKyAg ICAgICAgKiBydW50aW1lL0NvbW1vblNsb3dQYXRocy5oOgorICAgICAgICAoSlNDOjpDb21tb25T bG93UGF0aHM6OmFyaXR5Q2hlY2tGb3IpOiBSZXR1cm5zIHRoZSBwYWRkaW5nIGluIGFtb3VudCBv ZiBzbG90cyBpbnN0ZWFkIG9mIGFsaWduZWQgc3RhY2sgdW5pdHMKKworMjAxNS0wOC0xMSAgQmFz aWxlIENsZW1lbnQgIDxiYXNpbGVfY2xlbWVudEBhcHBsZS5jb20+CisKICAgICAgICAganNjLXRh aWxjYWxsOiBNYWtlIHRhaWwgY2FsbCB0ZXN0cyBydW4gaW4gYWxsIHRpZXJzCiAgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDc4OTUKIApkaWZmIC0tZ2l0 IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9DQ2FsbEhlbHBlcnMuaCBiL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9qaXQvQ0NhbGxIZWxwZXJzLmgKaW5kZXggMTU3MDU3N2M1YzJhMTViM2E1ZTE2 Y2I5N2UyYTE3OGY1N2M2NDcyNi4uZGI1YzhhMGQ3ZWFmNmFlYTFkNzdmNjllZjJmNjlkM2NlOTAw ZmI5NCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9DQ2FsbEhlbHBlcnMu aAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0NDYWxsSGVscGVycy5oCkBAIC0yMDQ3 LDEwICsyMDQ3LDcgQEAgcHVibGljOgogICAgICAgICBsb2FkUHRyKEFkZHJlc3MoR1BSSW5mbzo6 Y2FsbEZyYW1lUmVnaXN0ZXIsIEpTU3RhY2s6OkNvZGVCbG9jayAqIHN0YXRpY19jYXN0PGludD4o c2l6ZW9mKFJlZ2lzdGVyKSkpLCB0ZW1wMik7CiAgICAgICAgIGxvYWQzMihBZGRyZXNzKHRlbXAy LCBDb2RlQmxvY2s6Om9mZnNldE9mTnVtUGFyYW1ldGVycygpKSwgdGVtcDIpOwogICAgICAgICBN YWNyb0Fzc2VtYmxlcjo6SnVtcCBhcmd1bWVudENvdW50V2FzTm90Rml4ZWRVcCA9IGJyYW5jaDMy KEJlbG93T3JFcXVhbCwgdGVtcDIsIHRlbXAxKTsKLSAgICAgICAgc3ViMzIodGVtcDEsIHRlbXAy KTsKLSAgICAgICAgYWRkMzIoVHJ1c3RlZEltbTMyKHN0YWNrQWxpZ25tZW50UmVnaXN0ZXJzKCkg LSAxKSwgdGVtcDIpOwotICAgICAgICBhbmQzMihUcnVzdGVkSW1tMzIoLXN0YWNrQWxpZ25tZW50 UmVnaXN0ZXJzKCkpLCB0ZW1wMik7Ci0gICAgICAgIGFkZDMyKHRlbXAyLCB0ZW1wMSk7CisgICAg ICAgIG1vdmUodGVtcDIsIHRlbXAxKTsKICAgICAgICAgYXJndW1lbnRDb3VudFdhc05vdEZpeGVk VXAubGluayh0aGlzKTsKIAogICAgICAgICBhZGQzMihUcnVzdGVkSW1tMzIoc3RhY2tBbGlnbm1l bnRSZWdpc3RlcnMoKSArIEpTU3RhY2s6OkNhbGxGcmFtZUhlYWRlclNpemUgLSAxKSwgdGVtcDEp OwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9UaHVua0dlbmVyYXRvcnMu Y3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9UaHVua0dlbmVyYXRvcnMuY3BwCmluZGV4 IDgxNGRjNTVhZmMwNzhhMGQzMTAwNmI3NWRkNDY1YzdmNWIxNzQ0NDcuLjg1ZTJhZWIzMDc0OTNh NzAxY2E3YWE1ZTE0ZmFiZWQ5Nzg3MWM4NmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9qaXQvVGh1bmtHZW5lcmF0b3JzLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv aml0L1RodW5rR2VuZXJhdG9ycy5jcHAKQEAgLTM2Nyw3ICszNjcsNyBAQCBNYWNyb0Fzc2VtYmxl ckNvZGVSZWYgYXJpdHlGaXh1cEdlbmVyYXRvcihWTSogdm0pCiB7CiAgICAgSlNJbnRlcmZhY2VK SVQgaml0KHZtKTsKIAotICAgIC8vIFdlIGVudGVyIHdpdGggZml4dXAgY291bnQsIGluIGFsaWdu ZWQgc3RhY2sgdW5pdHMsIGluIGFyZ3VtZW50R1BSMCBhbmQgdGhlIHJldHVybiB0aHVuayBpbiBh cmd1bWVudEdQUjEKKyAgICAvLyBXZSBlbnRlciB3aXRoIGZpeHVwIGNvdW50IGluIGFyZ3VtZW50 R1BSMAogICAgIC8vIFdlIGhhdmUgdGhlIGd1YXJhbnRlZSB0aGF0IGEwLCBhMSwgYTIsIHQzLCB0 NCBhbmQgdDUgKG9yIHQwIGZvciBXaW5kb3dzKSBhcmUgYWxsIGRpc3RpbmN0IDotKQogI2lmIFVT RShKU1ZBTFVFNjQpCiAjaWYgT1MoV0lORE9XUykKQEAgLTM3OCwxMiArMzc4LDI1IEBAIE1hY3Jv QXNzZW1ibGVyQ29kZVJlZiBhcml0eUZpeHVwR2VuZXJhdG9yKFZNKiB2bSkKICMgIGlmIENQVShY ODZfNjQpCiAgICAgaml0LnBvcChKU0ludGVyZmFjZUpJVDo6cmVnVDQpOwogIyAgZW5kaWYKLSAg ICBqaXQubHNoaWZ0MzIoSlNJbnRlcmZhY2VKSVQ6OlRydXN0ZWRJbW0zMihsb2dTdGFja0FsaWdu bWVudFJlZ2lzdGVycygpKSwgSlNJbnRlcmZhY2VKSVQ6OmFyZ3VtZW50R1BSMCk7Ci0gICAgaml0 Lm5lZzY0KEpTSW50ZXJmYWNlSklUOjphcmd1bWVudEdQUjApOwogICAgIGppdC5tb3ZlKEpTSW50 ZXJmYWNlSklUOjpjYWxsRnJhbWVSZWdpc3RlciwgSlNJbnRlcmZhY2VKSVQ6OnJlZ1QzKTsKICAg ICBqaXQubG9hZDMyKEpTSW50ZXJmYWNlSklUOjpBZGRyZXNzKEpTSW50ZXJmYWNlSklUOjpjYWxs RnJhbWVSZWdpc3RlciwgSlNTdGFjazo6QXJndW1lbnRDb3VudCAqIHNpemVvZihSZWdpc3Rlcikp LCBKU0ludGVyZmFjZUpJVDo6YXJndW1lbnRHUFIyKTsKICAgICBqaXQuYWRkMzIoSlNJbnRlcmZh Y2VKSVQ6OlRydXN0ZWRJbW0zMihKU1N0YWNrOjpDYWxsRnJhbWVIZWFkZXJTaXplKSwgSlNJbnRl cmZhY2VKSVQ6OmFyZ3VtZW50R1BSMik7CiAKKyAgICAvLyBDaGVjayB0byBzZWUgaWYgd2UgaGF2 ZSBleHRyYSBzbG90cyB3ZSBjYW4gdXNlCisgICAgaml0Lm1vdmUoSlNJbnRlcmZhY2VKSVQ6OmFy Z3VtZW50R1BSMCwgSlNJbnRlcmZhY2VKSVQ6OmFyZ3VtZW50R1BSMSk7CisgICAgaml0LmFuZDMy KEpTSW50ZXJmYWNlSklUOjpUcnVzdGVkSW1tMzIoc3RhY2tBbGlnbm1lbnRSZWdpc3RlcnMoKSAt IDEpLCBKU0ludGVyZmFjZUpJVDo6YXJndW1lbnRHUFIxKTsKKyAgICBKU0ludGVyZmFjZUpJVDo6 SnVtcCBub0V4dHJhU2xvdCA9IGppdC5icmFuY2hUZXN0MzIoTWFjcm9Bc3NlbWJsZXI6Olplcm8s IEpTSW50ZXJmYWNlSklUOjphcmd1bWVudEdQUjEpOworICAgIGppdC5tb3ZlKEpTSW50ZXJmYWNl SklUOjpUcnVzdGVkSW1tNjQoVmFsdWVVbmRlZmluZWQpLCBleHRyYVRlbXApOworICAgIEpTSW50 ZXJmYWNlSklUOjpMYWJlbCBmaWxsRXh0cmFTbG90cyhqaXQubGFiZWwoKSk7CisgICAgaml0LnN0 b3JlNjQoZXh0cmFUZW1wLCBNYWNyb0Fzc2VtYmxlcjo6QmFzZUluZGV4KEpTSW50ZXJmYWNlSklU OjpjYWxsRnJhbWVSZWdpc3RlciwgSlNJbnRlcmZhY2VKSVQ6OmFyZ3VtZW50R1BSMiwgSlNJbnRl cmZhY2VKSVQ6OlRpbWVzRWlnaHQpKTsKKyAgICBqaXQuYWRkMzIoSlNJbnRlcmZhY2VKSVQ6OlRy dXN0ZWRJbW0zMigxKSwgSlNJbnRlcmZhY2VKSVQ6OmFyZ3VtZW50R1BSMik7CisgICAgaml0LmJy YW5jaFN1YjMyKEpTSW50ZXJmYWNlSklUOjpOb25aZXJvLCBKU0ludGVyZmFjZUpJVDo6VHJ1c3Rl ZEltbTMyKDEpLCBKU0ludGVyZmFjZUpJVDo6YXJndW1lbnRHUFIxKS5saW5rVG8oZmlsbEV4dHJh U2xvdHMsICZqaXQpOworICAgIGppdC5hbmQzMihKU0ludGVyZmFjZUpJVDo6VHJ1c3RlZEltbTMy KC1zdGFja0FsaWdubWVudFJlZ2lzdGVycygpKSwgSlNJbnRlcmZhY2VKSVQ6OmFyZ3VtZW50R1BS MCk7CisgICAgSlNJbnRlcmZhY2VKSVQ6Okp1bXAgZG9uZSA9IGppdC5icmFuY2hUZXN0MzIoTWFj cm9Bc3NlbWJsZXI6Olplcm8sIEpTSW50ZXJmYWNlSklUOjphcmd1bWVudEdQUjApOworICAgIG5v RXh0cmFTbG90LmxpbmsoJmppdCk7CisKKyAgICBqaXQubmVnNjQoSlNJbnRlcmZhY2VKSVQ6OmFy Z3VtZW50R1BSMCk7CisKICAgICAvLyBNb3ZlIGN1cnJlbnQgZnJhbWUgZG93biBhcmd1bWVudEdQ UjAgbnVtYmVyIG9mIHNsb3RzCiAgICAgSlNJbnRlcmZhY2VKSVQ6OkxhYmVsIGNvcHlMb29wKGpp dC5sYWJlbCgpKTsKICAgICBqaXQubG9hZDY0KEpTSW50ZXJmYWNlSklUOjpyZWdUMywgZXh0cmFU ZW1wKTsKQEAgLTQwNSw2ICs0MTgsOCBAQCBNYWNyb0Fzc2VtYmxlckNvZGVSZWYgYXJpdHlGaXh1 cEdlbmVyYXRvcihWTSogdm0pCiAgICAgaml0LmFkZFB0cihleHRyYVRlbXAsIEpTSW50ZXJmYWNl SklUOjpjYWxsRnJhbWVSZWdpc3Rlcik7CiAgICAgaml0LmFkZFB0cihleHRyYVRlbXAsIEpTSW50 ZXJmYWNlSklUOjpzdGFja1BvaW50ZXJSZWdpc3Rlcik7CiAKKyAgICBkb25lLmxpbmsoJmppdCk7 CisKICMgIGlmIENQVShYODZfNjQpCiAgICAgaml0LnB1c2goSlNJbnRlcmZhY2VKSVQ6OnJlZ1Q0 KTsKICMgIGVuZGlmCkBAIC00MTMsMTIgKzQyOCwyNyBAQCBNYWNyb0Fzc2VtYmxlckNvZGVSZWYg YXJpdHlGaXh1cEdlbmVyYXRvcihWTSogdm0pCiAjICBpZiBDUFUoWDg2KQogICAgIGppdC5wb3Ao SlNJbnRlcmZhY2VKSVQ6OnJlZ1Q0KTsKICMgIGVuZGlmCi0gICAgaml0LmxzaGlmdDMyKEpTSW50 ZXJmYWNlSklUOjpUcnVzdGVkSW1tMzIobG9nU3RhY2tBbGlnbm1lbnRSZWdpc3RlcnMoKSksIEpT SW50ZXJmYWNlSklUOjphcmd1bWVudEdQUjApOwotICAgIGppdC5uZWczMihKU0ludGVyZmFjZUpJ VDo6YXJndW1lbnRHUFIwKTsKICAgICBqaXQubW92ZShKU0ludGVyZmFjZUpJVDo6Y2FsbEZyYW1l UmVnaXN0ZXIsIEpTSW50ZXJmYWNlSklUOjpyZWdUMyk7CiAgICAgaml0LmxvYWQzMihKU0ludGVy ZmFjZUpJVDo6QWRkcmVzcyhKU0ludGVyZmFjZUpJVDo6Y2FsbEZyYW1lUmVnaXN0ZXIsIEpTU3Rh Y2s6OkFyZ3VtZW50Q291bnQgKiBzaXplb2YoUmVnaXN0ZXIpKSwgSlNJbnRlcmZhY2VKSVQ6OmFy Z3VtZW50R1BSMik7CiAgICAgaml0LmFkZDMyKEpTSW50ZXJmYWNlSklUOjpUcnVzdGVkSW1tMzIo SlNTdGFjazo6Q2FsbEZyYW1lSGVhZGVyU2l6ZSksIEpTSW50ZXJmYWNlSklUOjphcmd1bWVudEdQ UjIpOwogCisgICAgLy8gQ2hlY2sgdG8gc2VlIGlmIHdlIGhhdmUgZXh0cmEgc2xvdHMgd2UgY2Fu IHVzZQorICAgIGppdC5tb3ZlKEpTSW50ZXJmYWNlSklUOjphcmd1bWVudEdQUjAsIEpTSW50ZXJm YWNlSklUOjphcmd1bWVudEdQUjEpOworICAgIGppdC5hbmQzMihKU0ludGVyZmFjZUpJVDo6VHJ1 c3RlZEltbTMyKHN0YWNrQWxpZ25tZW50UmVnaXN0ZXJzKCkgLSAxKSwgSlNJbnRlcmZhY2VKSVQ6 OmFyZ3VtZW50R1BSMSk7CisgICAgSlNJbnRlcmZhY2VKSVQ6Okp1bXAgbm9FeHRyYVNsb3QgPSBq aXQuYnJhbmNoVGVzdDMyKE1hY3JvQXNzZW1ibGVyOjpaZXJvLCBKU0ludGVyZmFjZUpJVDo6YXJn dW1lbnRHUFIxKTsKKyAgICBKU0ludGVyZmFjZUpJVDo6TGFiZWwgZmlsbEV4dHJhU2xvdHMoaml0 LmxhYmVsKCkpOworICAgIGppdC5tb3ZlKEpTSW50ZXJmYWNlSklUOjpUcnVzdGVkSW1tMzIoMCks IEpTSW50ZXJmYWNlSklUOjpyZWdUNSk7CisgICAgaml0LnN0b3JlMzIoSlNJbnRlcmZhY2VKSVQ6 OnJlZ1Q1LCBNYWNyb0Fzc2VtYmxlcjo6QmFzZUluZGV4KEpTSW50ZXJmYWNlSklUOjpjYWxsRnJh bWVSZWdpc3RlciwgSlNJbnRlcmZhY2VKSVQ6OmFyZ3VtZW50R1BSMiwgSlNJbnRlcmZhY2VKSVQ6 OlRpbWVzRWlnaHQpKTsKKyAgICBqaXQubW92ZShKU0ludGVyZmFjZUpJVDo6VHJ1c3RlZEltbTMy KEpTVmFsdWU6OlVuZGVmaW5lZFRhZyksIEpTSW50ZXJmYWNlSklUOjpyZWdUNSk7CisgICAgaml0 LnN0b3JlMzIoSlNJbnRlcmZhY2VKSVQ6OnJlZ1Q1LCBNYWNyb0Fzc2VtYmxlcjo6QmFzZUluZGV4 KEpTSW50ZXJmYWNlSklUOjpjYWxsRnJhbWVSZWdpc3RlciwgSlNJbnRlcmZhY2VKSVQ6OmFyZ3Vt ZW50R1BSMiwgSlNJbnRlcmZhY2VKSVQ6OlRpbWVzRWlnaHQsIDQpKTsKKyAgICBqaXQuYWRkMzIo SlNJbnRlcmZhY2VKSVQ6OlRydXN0ZWRJbW0zMigxKSwgSlNJbnRlcmZhY2VKSVQ6OmFyZ3VtZW50 R1BSMik7CisgICAgaml0LmJyYW5jaFN1YjMyKEpTSW50ZXJmYWNlSklUOjpOb25aZXJvLCBKU0lu dGVyZmFjZUpJVDo6VHJ1c3RlZEltbTMyKDEpLCBKU0ludGVyZmFjZUpJVDo6YXJndW1lbnRHUFIx KS5saW5rVG8oZmlsbEV4dHJhU2xvdHMsICZqaXQpOworICAgIGppdC5hbmQzMihKU0ludGVyZmFj ZUpJVDo6VHJ1c3RlZEltbTMyKC1zdGFja0FsaWdubWVudFJlZ2lzdGVycygpKSwgSlNJbnRlcmZh Y2VKSVQ6OmFyZ3VtZW50R1BSMCk7CisgICAgSlNJbnRlcmZhY2VKSVQ6Okp1bXAgZG9uZSA9IGpp dC5icmFuY2hUZXN0MzIoTWFjcm9Bc3NlbWJsZXI6Olplcm8sIEpTSW50ZXJmYWNlSklUOjphcmd1 bWVudEdQUjApOworICAgIG5vRXh0cmFTbG90LmxpbmsoJmppdCk7CisKKyAgICBqaXQubmVnMzIo SlNJbnRlcmZhY2VKSVQ6OmFyZ3VtZW50R1BSMCk7CisKICAgICAvLyBNb3ZlIGN1cnJlbnQgZnJh bWUgZG93biBhcmd1bWVudEdQUjAgbnVtYmVyIG9mIHNsb3RzCiAgICAgSlNJbnRlcmZhY2VKSVQ6 OkxhYmVsIGNvcHlMb29wKGppdC5sYWJlbCgpKTsKICAgICBqaXQubG9hZDMyKEpTSW50ZXJmYWNl SklUOjpyZWdUMywgSlNJbnRlcmZhY2VKSVQ6OnJlZ1Q1KTsKQEAgLTQ0NSw2ICs0NzUsOCBAQCBN YWNyb0Fzc2VtYmxlckNvZGVSZWYgYXJpdHlGaXh1cEdlbmVyYXRvcihWTSogdm0pCiAgICAgaml0 LmFkZFB0cihKU0ludGVyZmFjZUpJVDo6cmVnVDUsIEpTSW50ZXJmYWNlSklUOjpjYWxsRnJhbWVS ZWdpc3Rlcik7CiAgICAgaml0LmFkZFB0cihKU0ludGVyZmFjZUpJVDo6cmVnVDUsIEpTSW50ZXJm YWNlSklUOjpzdGFja1BvaW50ZXJSZWdpc3Rlcik7CiAKKyAgICBkb25lLmxpbmsoJmppdCk7CisK ICMgIGlmIENQVShYODYpCiAgICAgaml0LnB1c2goSlNJbnRlcmZhY2VKSVQ6OnJlZ1Q0KTsKICMg IGVuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvbGxpbnQvTG93TGV2ZWxJ bnRlcnByZXRlci5hc20gYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvbGxpbnQvTG93TGV2ZWxJbnRl cnByZXRlci5hc20KaW5kZXggZTk4MzRlNDlmYTFlYjEzZDAwNDMzMjVjZWNkMTNhYzE3NjlkODky Yi4uYjhmMmQ4YTdiZWZmNDZkOTczNWNkYjJiMjE2YjM4YzcyY2RlMDNlNCAxMDA2NDQKLS0tIGEv U291cmNlL0phdmFTY3JpcHRDb3JlL2xsaW50L0xvd0xldmVsSW50ZXJwcmV0ZXIuYXNtCisrKyBi L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9sbGludC9Mb3dMZXZlbEludGVycHJldGVyLmFzbQpAQCAt MTY4LDYgKzE2OCw3IEBAIGNvbnN0IEpTRW52aXJvbm1lbnRSZWNvcmRfdmFyaWFibGVzID0gKHNp emVvZiBKU0Vudmlyb25tZW50UmVjb3JkICsgU2xvdFNpemUgLSAxCiBjb25zdCBEaXJlY3RBcmd1 bWVudHNfc3RvcmFnZSA9IChzaXplb2YgRGlyZWN0QXJndW1lbnRzICsgU2xvdFNpemUgLSAxKSAm IH4oU2xvdFNpemUgLSAxKQogCiBjb25zdCBTdGFja0FsaWdubWVudCA9IDE2Citjb25zdCBTdGFj a0FsaWdubWVudFNsb3RzID0gMgogY29uc3QgU3RhY2tBbGlnbm1lbnRNYXNrID0gU3RhY2tBbGln bm1lbnQgLSAxCiAKIGNvbnN0IENhbGxlckZyYW1lQW5kUENTaXplID0gMiAqIFB0clNpemUKQEAg LTczMiwyMCArNzMzLDE1IEBAIGVuZAogbWFjcm8gcG9wRnJhbWUodGVtcDEsIHRlbXAyKQogICAg IGNvbnN0IGFyZ0NvdW50ID0gdGVtcDEKICAgICBjb25zdCBudW1QYXJhbWV0ZXJzID0gdGVtcDIK LSAgICBjb25zdCBtaXNzaW5nQXJnQ291bnQgPSB0ZW1wMgogCiAgICAgbG9hZGkgUGF5bG9hZE9m ZnNldCArIEFyZ3VtZW50Q291bnRbY2ZyXSwgYXJnQ291bnQKLSAgICBtdWxwIFNsb3RTaXplLCBh cmdDb3VudAogICAgIGxvYWRwIENvZGVCbG9ja1tjZnJdLCBudW1QYXJhbWV0ZXJzCiAgICAgbG9h ZGkgQ29kZUJsb2NrOjptX251bVBhcmFtZXRlcnNbbnVtUGFyYW1ldGVyc10sIG51bVBhcmFtZXRl cnMKLSAgICBtdWxwIFNsb3RTaXplLCBudW1QYXJhbWV0ZXJzCiAgICAgYmlsdGVxIG51bVBhcmFt ZXRlcnMsIGFyZ0NvdW50LCAubm9Bcml0eUZpeHVwCisgICAgbW92ZSBudW1QYXJhbWV0ZXJzLCBh cmdDb3VudAogCi0gICAgc3ViaSBudW1QYXJhbWV0ZXJzLCBhcmdDb3VudCwgbWlzc2luZ0FyZ0Nv dW50Ci0gICAgYWRkcCBTdGFja0FsaWdubWVudE1hc2ssIG1pc3NpbmdBcmdDb3VudAotICAgIGFu ZHAgflN0YWNrQWxpZ25tZW50TWFzaywgbWlzc2luZ0FyZ0NvdW50Ci0gICAgYWRkaSBtaXNzaW5n QXJnQ291bnQsIGFyZ0NvdW50CiAubm9Bcml0eUZpeHVwOgorICAgIG11bHAgU2xvdFNpemUsIGFy Z0NvdW50CiAgICAgYWxpZ25GcmFtZVNpemUoYXJnQ291bnQpCiAgICAgYWRkcCBhcmdDb3VudCwg Y2ZyCiBlbmQKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9sbGludC9Mb3dMZXZl bEludGVycHJldGVyMzJfNjQuYXNtIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2xsaW50L0xvd0xl dmVsSW50ZXJwcmV0ZXIzMl82NC5hc20KaW5kZXggNjFjY2IwOTQ3YzI5MTk0ZjA1Zjg2YWQwZWU0 MmQ0MTAyNzY5ZmY5YS4uODY4MGQ0ZDQ0ZTU0MGU0NzQ1ZGVlNjNhNjg1MTY5YzA0ZTlhM2MxZSAx MDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2xsaW50L0xvd0xldmVsSW50ZXJwcmV0 ZXIzMl82NC5hc20KKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2xsaW50L0xvd0xldmVsSW50 ZXJwcmV0ZXIzMl82NC5hc20KQEAgLTU4NSwxMyArNTg1LDI3IEBAIG1hY3JvIGZ1bmN0aW9uQXJp dHlDaGVjayhkb25lTGFiZWwsIHNsb3dQYXRoKQogLnByb2NlZWRJbmxpbmU6CiAgICAgbG9hZGkg Q29tbW9uU2xvd1BhdGhzOjpBcml0eUNoZWNrRGF0YTo6cGFkZGVkU3RhY2tTcGFjZVtyMV0sIHQx CiAgICAgYnRpeiB0MSwgLmNvbnRpbnVlCisgICAgbG9hZGkgUGF5bG9hZE9mZnNldCArIEFyZ3Vt ZW50Q291bnRbY2ZyXSwgdDIKKyAgICBhZGRpIENhbGxGcmFtZUhlYWRlclNsb3RzLCB0MgogCi0g ICAgLy8gTW92ZSBmcmFtZSB1cCAidDEgKiAyIiBzbG90cwotICAgIGxzaGlmdHAgMSwgdDEKKyAg ICAvLyBDaGVjayBpZiB0aGVyZSBhcmUgc29tZSB1bmFsaWduZWQgc2xvdHMgd2UgY2FuIHVzZQor ICAgIG1vdmUgdDEsIHQzCisgICAgYW5kaSBTdGFja0FsaWdubWVudFNsb3RzIC0gMSwgdDMKKyAg ICBidGl6IHQzLCAubm9FeHRyYVNsb3QKKy5maWxsRXh0cmFTbG90czoKKyAgICBtb3ZlIDAsIHQw CisgICAgc3RvcmVpIHQwLCBQYXlsb2FkT2Zmc2V0W2NmciwgdDIsIDhdCisgICAgbW92ZSBVbmRl ZmluZWRUYWcsIHQwCisgICAgc3RvcmVpIHQwLCBUYWdPZmZzZXRbY2ZyLCB0MiwgOF0KKyAgICBh ZGRpIDEsIHQyCisgICAgYnN1YmlueiAxLCB0MywgLmZpbGxFeHRyYVNsb3RzCisgICAgYW5kaSB+ KFN0YWNrQWxpZ25tZW50U2xvdHMgLSAxKSwgdDEKKyAgICBidGl6IHQxLCAuY29udGludWUKKwor Lm5vRXh0cmFTbG90OgorICAgIC8vIE1vdmUgZnJhbWUgdXAgdDEgc2xvdHMKICAgICBuZWdpIHQx CiAgICAgbW92ZSBjZnIsIHQzCi0gICAgbG9hZGkgUGF5bG9hZE9mZnNldCArIEFyZ3VtZW50Q291 bnRbY2ZyXSwgdDIKLSAgICBhZGRpIENhbGxGcmFtZUhlYWRlclNsb3RzLCB0MgogLmNvcHlMb29w OgogICAgIGxvYWRpIFBheWxvYWRPZmZzZXRbdDNdLCB0MAogICAgIHN0b3JlaSB0MCwgUGF5bG9h ZE9mZnNldFt0MywgdDEsIDhdCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvbGxp bnQvTG93TGV2ZWxJbnRlcnByZXRlcjY0LmFzbSBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9sbGlu dC9Mb3dMZXZlbEludGVycHJldGVyNjQuYXNtCmluZGV4IDMzYmE4NjkyZjMxNGY4YTYwYzNjMzMw NTU4MGI0NDE0MGUzZjkwMGYuLjgxMzI5MTk1MWVjYTFkMmFmNjQwMTA3MmYwYjZkNTJkMDNiZTFj OTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9sbGludC9Mb3dMZXZlbEludGVy cHJldGVyNjQuYXNtCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9sbGludC9Mb3dMZXZlbElu dGVycHJldGVyNjQuYXNtCkBAIC00OTYsMTQgKzQ5NiwyNyBAQCBtYWNybyBmdW5jdGlvbkFyaXR5 Q2hlY2soZG9uZUxhYmVsLCBzbG93UGF0aCkKIC5ub0Vycm9yOgogICAgIGxvYWRpIENvbW1vblNs b3dQYXRoczo6QXJpdHlDaGVja0RhdGE6OnBhZGRlZFN0YWNrU3BhY2VbcjFdLCB0MQogICAgIGJ0 aXogdDEsIC5jb250aW51ZQorICAgIGxvYWRpIFBheWxvYWRPZmZzZXQgKyBBcmd1bWVudENvdW50 W2Nmcl0sIHQyCisgICAgYWRkaSBDYWxsRnJhbWVIZWFkZXJTbG90cywgdDIKKworICAgIC8vIENo ZWNrIGlmIHRoZXJlIGFyZSBzb21lIHVuYWxpZ25lZCBzbG90cyB3ZSBjYW4gdXNlCisgICAgbW92 ZSB0MSwgdDMKKyAgICBhbmRpIFN0YWNrQWxpZ25tZW50U2xvdHMgLSAxLCB0MworICAgIGJ0aXog dDMsIC5ub0V4dHJhU2xvdAorICAgIG1vdmUgVmFsdWVVbmRlZmluZWQsIHQwCisuZmlsbEV4dHJh U2xvdHM6CisgICAgc3RvcmVxIHQwLCBbY2ZyLCB0MiwgOF0KKyAgICBhZGRpIDEsIHQyCisgICAg YnN1YmlueiAxLCB0MywgLmZpbGxFeHRyYVNsb3RzCisgICAgYW5kaSB+KFN0YWNrQWxpZ25tZW50 U2xvdHMgLSAxKSwgdDEKKyAgICBidGl6IHQxLCAuY29udGludWUKIAotICAgIC8vIE1vdmUgZnJh bWUgdXAgInQxICogMiIgc2xvdHMKLSAgICBsc2hpZnRwIDEsIHQxCisubm9FeHRyYVNsb3Q6Cisg ICAgLy8gTW92ZSBmcmFtZSB1cCB0MSBzbG90cwogICAgIG5lZ3EgdDEKICAgICBtb3ZlIGNmciwg dDMKICAgICBzdWJwIENhbGxlZVNhdmVTcGFjZUFzVmlydHVhbFJlZ2lzdGVycyAqIDgsIHQzCi0g ICAgbG9hZGkgUGF5bG9hZE9mZnNldCArIEFyZ3VtZW50Q291bnRbY2ZyXSwgdDIKLSAgICBhZGRp IENhbGxGcmFtZUhlYWRlclNsb3RzICsgQ2FsbGVlU2F2ZVNwYWNlQXNWaXJ0dWFsUmVnaXN0ZXJz LCB0MgorICAgIGFkZGkgQ2FsbGVlU2F2ZVNwYWNlQXNWaXJ0dWFsUmVnaXN0ZXJzLCB0MgogLmNv cHlMb29wOgogICAgIGxvYWRxIFt0M10sIHQwCiAgICAgc3RvcmVxIHQwLCBbdDMsIHQxLCA4XQpk aWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvQ29tbW9uU2xvd1BhdGhz LmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9Db21tb25TbG93UGF0aHMuaAppbmRl eCBlOThhYzBhOTBkMDI3N2RiNDU5NGYzM2Q1NTBlMzFhMzdhNjRhZmIzLi44MDQ5ZGU0NzYxYTEy ZDczNmQ3M2ZhNDE2NWM0NGM4M2FlOTVkZjIzIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvcnVudGltZS9Db21tb25TbG93UGF0aHMuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvcnVudGltZS9Db21tb25TbG93UGF0aHMuaApAQCAtNTksMTIgKzU5LDE0IEBAIEFMV0FZU19J TkxJTkUgaW50IGFyaXR5Q2hlY2tGb3IoRXhlY1N0YXRlKiBleGVjLCBKU1N0YWNrKiBzdGFjaywg Q29kZVNwZWNpYWxpemF0CiAgICAgaW50IGFyZ3VtZW50Q291bnRJbmNsdWRpbmdUaGlzID0gZXhl Yy0+YXJndW1lbnRDb3VudEluY2x1ZGluZ1RoaXMoKTsKICAgICAKICAgICBBU1NFUlQoYXJndW1l bnRDb3VudEluY2x1ZGluZ1RoaXMgPCBuZXdDb2RlQmxvY2stPm51bVBhcmFtZXRlcnMoKSk7Ci0g ICAgaW50IG1pc3NpbmdBcmd1bWVudENvdW50ID0gbmV3Q29kZUJsb2NrLT5udW1QYXJhbWV0ZXJz KCkgLSBhcmd1bWVudENvdW50SW5jbHVkaW5nVGhpczsKLSAgICBpbnQgcGFkZGVkU3RhY2tTcGFj ZSA9IFdURjo6cm91bmRVcFRvTXVsdGlwbGVPZihzdGFja0FsaWdubWVudFJlZ2lzdGVycygpLCBt aXNzaW5nQXJndW1lbnRDb3VudCk7CisgICAgaW50IGZyYW1lU2l6ZSA9IGFyZ3VtZW50Q291bnRJ bmNsdWRpbmdUaGlzICsgSlNTdGFjazo6Q2FsbEZyYW1lSGVhZGVyU2l6ZTsKKyAgICBpbnQgYWxp Z25lZEZyYW1lU2l6ZUZvclBhcmFtZXRlcnMgPSBXVEY6OnJvdW5kVXBUb011bHRpcGxlT2Yoc3Rh Y2tBbGlnbm1lbnRSZWdpc3RlcnMoKSwKKyAgICAgICAgbmV3Q29kZUJsb2NrLT5udW1QYXJhbWV0 ZXJzKCkgKyBKU1N0YWNrOjpDYWxsRnJhbWVIZWFkZXJTaXplKTsKKyAgICBpbnQgcGFkZGVkU3Rh Y2tTcGFjZSA9IGFsaWduZWRGcmFtZVNpemVGb3JQYXJhbWV0ZXJzIC0gZnJhbWVTaXplOwogCi0g ICAgaWYgKCFzdGFjay0+ZW5zdXJlQ2FwYWNpdHlGb3IoZXhlYy0+cmVnaXN0ZXJzKCkgLSBwYWRk ZWRTdGFja1NwYWNlKSkKKyAgICBpZiAoIXN0YWNrLT5lbnN1cmVDYXBhY2l0eUZvcihleGVjLT5y ZWdpc3RlcnMoKSAtIHBhZGRlZFN0YWNrU3BhY2UgJSBzdGFja0FsaWdubWVudFJlZ2lzdGVycygp KSkKICAgICAgICAgcmV0dXJuIC0xOwotICAgIHJldHVybiBwYWRkZWRTdGFja1NwYWNlIC8gc3Rh Y2tBbGlnbm1lbnRSZWdpc3RlcnMoKTsKKyAgICByZXR1cm4gcGFkZGVkU3RhY2tTcGFjZTsKIH0K IAogaW5saW5lIGJvb2wgb3BJbihFeGVjU3RhdGUqIGV4ZWMsIEpTVmFsdWUgcHJvcE5hbWUsIEpT VmFsdWUgYmFzZVZhbCkK