185143 2018-04-30 14:57:46 -0700 Move the MayBePrototype JSCell header bit to InlineTypeFlags 2021-11-01 12:06:40 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 keith_miller keith_miller achristensen ews-watchlist mark.lam msaboff saam webkit-bug-importer oldest_to_newest 1419123 0 keith_miller 2018-04-30 14:57:46 -0700 Move the MayBePrototype JSCell header bit to InlineTypeFlags 1419124 1 339150 keith_miller 2018-04-30 14:58:05 -0700 Created attachment 339150 Patch 1419126 2 339150 mark.lam 2018-04-30 15:06:18 -0700 Comment on attachment 339150 Patch r=me 1419130 3 339150 keith_miller 2018-04-30 15:09:55 -0700 Comment on attachment 339150 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=339150&action=review > Source/JavaScriptCore/runtime/JSCellInlines.h:234 > + m_flags = structure->typeInfo().inlineTypeFlags() | (m_flags & static_cast<TypeInfo::InlineTypeFlags>(TypeInfoMayBePrototype)); I actually turned this into a function in TypeInfo since it seems a bit cleaner, are you ok with that change? 1419131 4 mark.lam 2018-04-30 15:10:54 -0700 (In reply to Keith Miller from comment #3) > Comment on attachment 339150 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=339150&action=review > > > Source/JavaScriptCore/runtime/JSCellInlines.h:234 > > + m_flags = structure->typeInfo().inlineTypeFlags() | (m_flags & static_cast<TypeInfo::InlineTypeFlags>(TypeInfoMayBePrototype)); > > I actually turned this into a function in TypeInfo since it seems a bit > cleaner, are you ok with that change? Sounds good. 1419132 5 339152 keith_miller 2018-04-30 15:10:57 -0700 Created attachment 339152 Patch 1419135 6 keith_miller 2018-04-30 15:13:19 -0700 Committed r231172: <https://trac.webkit.org/changeset/231172> 1419136 7 webkit-bug-importer 2018-04-30 15:14:39 -0700 <rdar://problem/39850745> 1810733 8 339152 achristensen 2021-11-01 12:06:40 -0700 Comment on attachment 339152 Patch This has been requesting review for more than one year. If this is still needed, please rebase and re-request review. 339150 2018-04-30 14:58:05 -0700 2018-04-30 15:10:56 -0700 Patch bug-185143-20180430145805.patch text/plain 4858 keith_miller U3VidmVyc2lvbiBSZXZpc2lvbjogMjMxMTY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBm NjMzMjE1YWViNmIwN2U0YTU5M2Y1ODFjZTc3MjhkZDBmZThmOWU2Li4zMmY1NjMxNmEwMDYwOTNi MWJiMzEzN2UzNWRmNzQzNTQxMzhmMmVjIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxOCBAQAorMjAxOC0wNC0zMCAgS2VpdGggTWlsbGVyICA8a2VpdGhfbWlsbGVyQGFwcGxl LmNvbT4KKworICAgICAgICBNb3ZlIHRoZSBNYXlCZVByb3RvdHlwZSBKU0NlbGwgaGVhZGVyIGJp dCB0byBJbmxpbmVUeXBlRmxhZ3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE4NTE0MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogcnVudGltZS9JbmRleGluZ1R5cGUuaDoKKyAgICAgICAgKiBydW50aW1l L0pTQ2VsbElubGluZXMuaDoKKyAgICAgICAgKEpTQzo6SlNDZWxsOjpzZXRTdHJ1Y3R1cmUpOgor ICAgICAgICAoSlNDOjpKU0NlbGw6Om1heUJlUHJvdG90eXBlIGNvbnN0KToKKyAgICAgICAgKEpT Qzo6SlNDZWxsOjpkaWRCZWNvbWVQcm90b3R5cGUpOgorICAgICAgICAqIHJ1bnRpbWUvSlNUeXBl SW5mby5oOgorICAgICAgICAoSlNDOjpUeXBlSW5mbzo6bWF5QmVQcm90b3R5cGUpOgorCiAyMDE4 LTA0LTMwICBLZWl0aCBNaWxsZXIgIDxrZWl0aF9taWxsZXJAYXBwbGUuY29tPgogCiAgICAgICAg IE1vdmUgU3RydWN0dXJlSXNJbW1vcnRhbCB0byBvdXQgb2YgbGluZSBmbGFncy4KZGlmZiAtLWdp dCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0luZGV4aW5nVHlwZS5oIGIvU291cmNl L0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSW5kZXhpbmdUeXBlLmgKaW5kZXggMjQyNmFmZTEzM2I2 ZTU5MjhkMTZmNjE3NWUwZDM4ZjM3YmYyNzFkOS4uNjg5ZmFlMjY0MjA1YjFlMDMxODQxOTBiMTZj Yzg1MWE1YWIwN2Q4MCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUv SW5kZXhpbmdUeXBlLmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSW5kZXhp bmdUeXBlLmgKQEAgLTczLDcgKzczLDYgQEAgc3RhdGljIGNvbnN0IEluZGV4aW5nVHlwZSBNYXlI YXZlSW5kZXhlZEFjY2Vzc29ycyAgICAgICAgID0gMHgxMDsKIC8vIHByb3RvdHlwZS4KIHN0YXRp YyBjb25zdCBJbmRleGluZ1R5cGUgSW5kZXhpbmdUeXBlTG9ja0lzSGVsZCAgICAgICAgICA9IDB4 MjA7CiBzdGF0aWMgY29uc3QgSW5kZXhpbmdUeXBlIEluZGV4aW5nVHlwZUxvY2tIYXNQYXJrZWQg ICAgICAgPSAweDQwOwotc3RhdGljIGNvbnN0IEluZGV4aW5nVHlwZSBJbmRleGluZ1R5cGVNYXlC ZVByb3RvdHlwZSAgICAgID0gMHg4MDsKIAogLy8gTGlzdCBvZiBhY2NlcHRhYmxlIGFycmF5IHR5 cGVzLgogc3RhdGljIGNvbnN0IEluZGV4aW5nVHlwZSBOb25BcnJheSAgICAgICAgICAgICAgICAg ICAgICAgID0gMHgwOwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUv SlNDZWxsSW5saW5lcy5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNDZWxsSW5s aW5lcy5oCmluZGV4IGFkODZjNDgzZGZiYTczODhiNTE2YTE4ZWE4MTUwZDg2M2U1NGU5ZmIuLjAy NmQ1YTA5YjQ3NmQyYTA4YjVlNzVhMjYzN2ExMGJhZmVmNzFhOGYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTQ2VsbElubGluZXMuaAorKysgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvcnVudGltZS9KU0NlbGxJbmxpbmVzLmgKQEAgLTIzMCw3ICsyMzAsOCBAQCBB TFdBWVNfSU5MSU5FIHZvaWQgSlNDZWxsOjpzZXRTdHJ1Y3R1cmUoVk0mIHZtLCBTdHJ1Y3R1cmUq IHN0cnVjdHVyZSkKICAgICAgICAgfHwgdGhpcy0+c3RydWN0dXJlKCktPnRyYW5zaXRpb25XYXRj aHBvaW50U2V0SGFzQmVlbkludmFsaWRhdGVkKCkKICAgICAgICAgfHwgSGVhcDo6aGVhcCh0aGlz KS0+c3RydWN0dXJlSURUYWJsZSgpLmdldChzdHJ1Y3R1cmUtPmlkKCkpID09IHN0cnVjdHVyZSk7 CiAgICAgbV9zdHJ1Y3R1cmVJRCA9IHN0cnVjdHVyZS0+aWQoKTsKLSAgICBtX2ZsYWdzID0gc3Ry dWN0dXJlLT50eXBlSW5mbygpLmlubGluZVR5cGVGbGFncygpOworICAgIC8vIFNpbmNlIHRoZSBT dHJ1Y3R1cmUgZG9lc24ndCB0cmFjayBUeXBlSW5mb01heUJlUHJvdG90eXBlIHdlIG5lZWQgdG8g bWFrZSBzdXJlIHdlIGNvcHkgaXQuCisgICAgbV9mbGFncyA9IHN0cnVjdHVyZS0+dHlwZUluZm8o KS5pbmxpbmVUeXBlRmxhZ3MoKSB8IChtX2ZsYWdzICYgc3RhdGljX2Nhc3Q8VHlwZUluZm86Oklu bGluZVR5cGVGbGFncz4oVHlwZUluZm9NYXlCZVByb3RvdHlwZSkpOwogICAgIG1fdHlwZSA9IHN0 cnVjdHVyZS0+dHlwZUluZm8oKS50eXBlKCk7CiAgICAgSW5kZXhpbmdUeXBlIG5ld0luZGV4aW5n VHlwZSA9IHN0cnVjdHVyZS0+aW5kZXhpbmdUeXBlSW5jbHVkaW5nSGlzdG9yeSgpOwogICAgIGlm IChtX2luZGV4aW5nVHlwZUFuZE1pc2MgIT0gbmV3SW5kZXhpbmdUeXBlKSB7CkBAIC0zNDIsMTQg KzM0MywxNCBAQCBpbmxpbmUgYm9vbCBKU0NlbGxMb2NrOjppc0xvY2tlZCgpIGNvbnN0CiAKIGlu bGluZSBib29sIEpTQ2VsbDo6bWF5QmVQcm90b3R5cGUoKSBjb25zdAogewotICAgIHJldHVybiBt X2luZGV4aW5nVHlwZUFuZE1pc2MgJiBJbmRleGluZ1R5cGVNYXlCZVByb3RvdHlwZTsKKyAgICBy ZXR1cm4gVHlwZUluZm86Om1heUJlUHJvdG90eXBlKGlubGluZVR5cGVGbGFncygpKTsKIH0KIAog aW5saW5lIHZvaWQgSlNDZWxsOjpkaWRCZWNvbWVQcm90b3R5cGUoKQogewogICAgIGlmIChtYXlC ZVByb3RvdHlwZSgpKQogICAgICAgICByZXR1cm47Ci0gICAgV1RGOjphdG9taWNFeGNoYW5nZU9y KCZtX2luZGV4aW5nVHlwZUFuZE1pc2MsIEluZGV4aW5nVHlwZU1heUJlUHJvdG90eXBlKTsKKyAg ICBtX2ZsYWdzIHw9IHN0YXRpY19jYXN0PFR5cGVJbmZvOjpJbmxpbmVUeXBlRmxhZ3M+KFR5cGVJ bmZvTWF5QmVQcm90b3R5cGUpOwogfQogCiBpbmxpbmUgSlNPYmplY3QqIEpTQ2VsbDo6dG9PYmpl Y3QoRXhlY1N0YXRlKiBleGVjLCBKU0dsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0KSBjb25zdApk aWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNUeXBlSW5mby5oIGIv U291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNUeXBlSW5mby5oCmluZGV4IDJlMDRlMTM4 OGI5MDhiMjY4ZjYxYjMyZjkzMzI2MmUyMDQzNTc1NTYuLjkwZmU3NzllNTQxMzUzNTM2NTBmNGRm NTljZDJmYjNmOTc4ODhiNDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50 aW1lL0pTVHlwZUluZm8uaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU1R5 cGVJbmZvLmgKQEAgLTQzLDYgKzQzLDcgQEAgc3RhdGljIGNvbnN0IHVuc2lnbmVkIFR5cGVPZlNo b3VsZENhbGxHZXRDYWxsRGF0YSA9IDEgPDwgMjsgLy8gTmVlZCB0aGlzIGZsYWcgaWYKIHN0YXRp YyBjb25zdCB1bnNpZ25lZCBPdmVycmlkZXNHZXRPd25Qcm9wZXJ0eVNsb3QgPSAxIDw8IDM7CiBz dGF0aWMgY29uc3QgdW5zaWduZWQgT3ZlcnJpZGVzVG9UaGlzID0gMSA8PCA0OyAvLyBJZiB0aGlz IGlzIGZhbHNlIHRoZW4gdGhpcyByZXR1cm5zIHNvbWV0aGluZyBvdGhlciB0aGFuICd0aGlzJy4g Tm9uLW9iamVjdCBjZWxscyB0aGF0IGFyZSB2aXNpYmxlIHRvIEpTIGhhdmUgdGhpcyBzZXQgYXMg ZG8gc29tZSBleG90aWMgb2JqZWN0cy4KIHN0YXRpYyBjb25zdCB1bnNpZ25lZCBIYXNTdGF0aWNQ cm9wZXJ0eVRhYmxlID0gMSA8PCA1Oworc3RhdGljIGNvbnN0IHVuc2lnbmVkIFR5cGVJbmZvTWF5 QmVQcm90b3R5cGUgPSAxIDw8IDY7IC8vIFVubGlrZSBvdGhlciBpbmxpbmUgZmxhZ3MsIHRoaXMg d2lsbCBvbmx5IGJlIHNldCBvbiB0aGUgY2VsbCBpdHNlbGYgYW5kIHdpbGwgbm90IGJlIHNldCBv biB0aGUgU3RydWN0dXJlLgogCiAvLyBPdXQgb2YgbGluZSBmbGFncy4KIApAQCAtODgsNiArODks NyBAQCBwdWJsaWM6CiAgICAgYm9vbCBvdmVycmlkZXNHZXRPd25Qcm9wZXJ0eVNsb3QoKSBjb25z dCB7IHJldHVybiBvdmVycmlkZXNHZXRPd25Qcm9wZXJ0eVNsb3QoaW5saW5lVHlwZUZsYWdzKCkp OyB9CiAgICAgc3RhdGljIGJvb2wgb3ZlcnJpZGVzR2V0T3duUHJvcGVydHlTbG90KElubGluZVR5 cGVGbGFncyBmbGFncykgeyByZXR1cm4gZmxhZ3MgJiBPdmVycmlkZXNHZXRPd25Qcm9wZXJ0eVNs b3Q7IH0KICAgICBzdGF0aWMgYm9vbCBoYXNTdGF0aWNQcm9wZXJ0eVRhYmxlKElubGluZVR5cGVG bGFncyBmbGFncykgeyByZXR1cm4gZmxhZ3MgJiBIYXNTdGF0aWNQcm9wZXJ0eVRhYmxlOyB9Cisg ICAgc3RhdGljIGJvb2wgbWF5QmVQcm90b3R5cGUoSW5saW5lVHlwZUZsYWdzIGZsYWdzKSB7IHJl dHVybiBmbGFncyAmIFR5cGVJbmZvTWF5QmVQcm90b3R5cGU7IH0KICAgICBib29sIG92ZXJyaWRl c1RvVGhpcygpIGNvbnN0IHsgcmV0dXJuIGlzU2V0T25GbGFnczEoT3ZlcnJpZGVzVG9UaGlzKTsg fQogICAgIGJvb2wgc3RydWN0dXJlSXNJbW1vcnRhbCgpIGNvbnN0IHsgcmV0dXJuIGlzU2V0T25G bGFnczIoU3RydWN0dXJlSXNJbW1vcnRhbCk7IH0KICAgICBib29sIG92ZXJyaWRlc0dldFByb3Bl cnR5TmFtZXMoKSBjb25zdCB7IHJldHVybiBpc1NldE9uRmxhZ3MyKE92ZXJyaWRlc0dldFByb3Bl cnR5TmFtZXMpOyB9Cg== 339152 2018-04-30 15:10:57 -0700 2021-11-01 12:06:40 -0700 Patch bug-185143-20180430151057.patch text/plain 5330 keith_miller U3VidmVyc2lvbiBSZXZpc2lvbjogMjMxMTY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBm NjMzMjE1YWViNmIwN2U0YTU5M2Y1ODFjZTc3MjhkZDBmZThmOWU2Li5lZWI5NGNiZjZlNjdlNTI0 MzU5ZjE1Y2JiYzFiOGJkZWUyZjEyZmIxIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxOSBAQAorMjAxOC0wNC0zMCAgS2VpdGggTWlsbGVyICA8a2VpdGhfbWlsbGVyQGFwcGxl LmNvbT4KKworICAgICAgICBNb3ZlIHRoZSBNYXlCZVByb3RvdHlwZSBKU0NlbGwgaGVhZGVyIGJp dCB0byBJbmxpbmVUeXBlRmxhZ3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE4NTE0MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogcnVudGltZS9JbmRleGluZ1R5cGUuaDoKKyAgICAgICAgKiBydW50aW1l L0pTQ2VsbElubGluZXMuaDoKKyAgICAgICAgKEpTQzo6SlNDZWxsOjpzZXRTdHJ1Y3R1cmUpOgor ICAgICAgICAoSlNDOjpKU0NlbGw6Om1heUJlUHJvdG90eXBlIGNvbnN0KToKKyAgICAgICAgKEpT Qzo6SlNDZWxsOjpkaWRCZWNvbWVQcm90b3R5cGUpOgorICAgICAgICAqIHJ1bnRpbWUvSlNUeXBl SW5mby5oOgorICAgICAgICAoSlNDOjpUeXBlSW5mbzo6bWF5QmVQcm90b3R5cGUpOgorICAgICAg ICAoSlNDOjpUeXBlSW5mbzo6bWVyZ2VJbmxpbmVUeXBlRmxhZ3MpOgorCiAyMDE4LTA0LTMwICBL ZWl0aCBNaWxsZXIgIDxrZWl0aF9taWxsZXJAYXBwbGUuY29tPgogCiAgICAgICAgIE1vdmUgU3Ry dWN0dXJlSXNJbW1vcnRhbCB0byBvdXQgb2YgbGluZSBmbGFncy4KZGlmZiAtLWdpdCBhL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0luZGV4aW5nVHlwZS5oIGIvU291cmNlL0phdmFTY3Jp cHRDb3JlL3J1bnRpbWUvSW5kZXhpbmdUeXBlLmgKaW5kZXggMjQyNmFmZTEzM2I2ZTU5MjhkMTZm NjE3NWUwZDM4ZjM3YmYyNzFkOS4uNjg5ZmFlMjY0MjA1YjFlMDMxODQxOTBiMTZjYzg1MWE1YWIw N2Q4MCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSW5kZXhpbmdU eXBlLmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSW5kZXhpbmdUeXBlLmgK QEAgLTczLDcgKzczLDYgQEAgc3RhdGljIGNvbnN0IEluZGV4aW5nVHlwZSBNYXlIYXZlSW5kZXhl ZEFjY2Vzc29ycyAgICAgICAgID0gMHgxMDsKIC8vIHByb3RvdHlwZS4KIHN0YXRpYyBjb25zdCBJ bmRleGluZ1R5cGUgSW5kZXhpbmdUeXBlTG9ja0lzSGVsZCAgICAgICAgICA9IDB4MjA7CiBzdGF0 aWMgY29uc3QgSW5kZXhpbmdUeXBlIEluZGV4aW5nVHlwZUxvY2tIYXNQYXJrZWQgICAgICAgPSAw eDQwOwotc3RhdGljIGNvbnN0IEluZGV4aW5nVHlwZSBJbmRleGluZ1R5cGVNYXlCZVByb3RvdHlw ZSAgICAgID0gMHg4MDsKIAogLy8gTGlzdCBvZiBhY2NlcHRhYmxlIGFycmF5IHR5cGVzLgogc3Rh dGljIGNvbnN0IEluZGV4aW5nVHlwZSBOb25BcnJheSAgICAgICAgICAgICAgICAgICAgICAgID0g MHgwOwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNDZWxsSW5s aW5lcy5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNDZWxsSW5saW5lcy5oCmlu ZGV4IGFkODZjNDgzZGZiYTczODhiNTE2YTE4ZWE4MTUwZDg2M2U1NGU5ZmIuLjgwMjhiODlmYTBm ZWY4YjgwZGI1YmE2YjVmOTRiYThiYjU5N2E0MjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9ydW50aW1lL0pTQ2VsbElubGluZXMuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvcnVudGltZS9KU0NlbGxJbmxpbmVzLmgKQEAgLTIzMCw3ICsyMzAsNyBAQCBBTFdBWVNfSU5M SU5FIHZvaWQgSlNDZWxsOjpzZXRTdHJ1Y3R1cmUoVk0mIHZtLCBTdHJ1Y3R1cmUqIHN0cnVjdHVy ZSkKICAgICAgICAgfHwgdGhpcy0+c3RydWN0dXJlKCktPnRyYW5zaXRpb25XYXRjaHBvaW50U2V0 SGFzQmVlbkludmFsaWRhdGVkKCkKICAgICAgICAgfHwgSGVhcDo6aGVhcCh0aGlzKS0+c3RydWN0 dXJlSURUYWJsZSgpLmdldChzdHJ1Y3R1cmUtPmlkKCkpID09IHN0cnVjdHVyZSk7CiAgICAgbV9z dHJ1Y3R1cmVJRCA9IHN0cnVjdHVyZS0+aWQoKTsKLSAgICBtX2ZsYWdzID0gc3RydWN0dXJlLT50 eXBlSW5mbygpLmlubGluZVR5cGVGbGFncygpOworICAgIG1fZmxhZ3MgPSBUeXBlSW5mbzo6bWVy Z2VJbmxpbmVUeXBlRmxhZ3Moc3RydWN0dXJlLT50eXBlSW5mbygpLmlubGluZVR5cGVGbGFncygp LCBtX2ZsYWdzKTsKICAgICBtX3R5cGUgPSBzdHJ1Y3R1cmUtPnR5cGVJbmZvKCkudHlwZSgpOwog ICAgIEluZGV4aW5nVHlwZSBuZXdJbmRleGluZ1R5cGUgPSBzdHJ1Y3R1cmUtPmluZGV4aW5nVHlw ZUluY2x1ZGluZ0hpc3RvcnkoKTsKICAgICBpZiAobV9pbmRleGluZ1R5cGVBbmRNaXNjICE9IG5l d0luZGV4aW5nVHlwZSkgewpAQCAtMzQyLDE0ICszNDIsMTQgQEAgaW5saW5lIGJvb2wgSlNDZWxs TG9jazo6aXNMb2NrZWQoKSBjb25zdAogCiBpbmxpbmUgYm9vbCBKU0NlbGw6Om1heUJlUHJvdG90 eXBlKCkgY29uc3QKIHsKLSAgICByZXR1cm4gbV9pbmRleGluZ1R5cGVBbmRNaXNjICYgSW5kZXhp bmdUeXBlTWF5QmVQcm90b3R5cGU7CisgICAgcmV0dXJuIFR5cGVJbmZvOjptYXlCZVByb3RvdHlw ZShpbmxpbmVUeXBlRmxhZ3MoKSk7CiB9CiAKIGlubGluZSB2b2lkIEpTQ2VsbDo6ZGlkQmVjb21l UHJvdG90eXBlKCkKIHsKICAgICBpZiAobWF5QmVQcm90b3R5cGUoKSkKICAgICAgICAgcmV0dXJu OwotICAgIFdURjo6YXRvbWljRXhjaGFuZ2VPcigmbV9pbmRleGluZ1R5cGVBbmRNaXNjLCBJbmRl eGluZ1R5cGVNYXlCZVByb3RvdHlwZSk7CisgICAgbV9mbGFncyB8PSBzdGF0aWNfY2FzdDxUeXBl SW5mbzo6SW5saW5lVHlwZUZsYWdzPihUeXBlSW5mb01heUJlUHJvdG90eXBlKTsKIH0KIAogaW5s aW5lIEpTT2JqZWN0KiBKU0NlbGw6OnRvT2JqZWN0KEV4ZWNTdGF0ZSogZXhlYywgSlNHbG9iYWxP YmplY3QqIGdsb2JhbE9iamVjdCkgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9ydW50aW1lL0pTVHlwZUluZm8uaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1l L0pTVHlwZUluZm8uaAppbmRleCAyZTA0ZTEzODhiOTA4YjI2OGY2MWIzMmY5MzMyNjJlMjA0MzU3 NTU2Li5mYzRiYjQ0NWY2MTZkY2ZiZTU3MzFjNzg1NTJlNTM3MDIxOTdiZDU2IDEwMDY0NAotLS0g YS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU1R5cGVJbmZvLmgKKysrIGIvU291cmNl L0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNUeXBlSW5mby5oCkBAIC00Myw2ICs0Myw3IEBAIHN0 YXRpYyBjb25zdCB1bnNpZ25lZCBUeXBlT2ZTaG91bGRDYWxsR2V0Q2FsbERhdGEgPSAxIDw8IDI7 IC8vIE5lZWQgdGhpcyBmbGFnIGlmCiBzdGF0aWMgY29uc3QgdW5zaWduZWQgT3ZlcnJpZGVzR2V0 T3duUHJvcGVydHlTbG90ID0gMSA8PCAzOwogc3RhdGljIGNvbnN0IHVuc2lnbmVkIE92ZXJyaWRl c1RvVGhpcyA9IDEgPDwgNDsgLy8gSWYgdGhpcyBpcyBmYWxzZSB0aGVuIHRoaXMgcmV0dXJucyBz b21ldGhpbmcgb3RoZXIgdGhhbiAndGhpcycuIE5vbi1vYmplY3QgY2VsbHMgdGhhdCBhcmUgdmlz aWJsZSB0byBKUyBoYXZlIHRoaXMgc2V0IGFzIGRvIHNvbWUgZXhvdGljIG9iamVjdHMuCiBzdGF0 aWMgY29uc3QgdW5zaWduZWQgSGFzU3RhdGljUHJvcGVydHlUYWJsZSA9IDEgPDwgNTsKK3N0YXRp YyBjb25zdCB1bnNpZ25lZCBUeXBlSW5mb01heUJlUHJvdG90eXBlID0gMSA8PCA3OyAvLyBVbmxp a2Ugb3RoZXIgaW5saW5lIGZsYWdzLCB0aGlzIHdpbGwgb25seSBiZSBzZXQgb24gdGhlIGNlbGwg aXRzZWxmIGFuZCB3aWxsIG5vdCBiZSBzZXQgb24gdGhlIFN0cnVjdHVyZS4KIAogLy8gT3V0IG9m IGxpbmUgZmxhZ3MuCiAKQEAgLTg4LDYgKzg5LDcgQEAgcHVibGljOgogICAgIGJvb2wgb3ZlcnJp ZGVzR2V0T3duUHJvcGVydHlTbG90KCkgY29uc3QgeyByZXR1cm4gb3ZlcnJpZGVzR2V0T3duUHJv cGVydHlTbG90KGlubGluZVR5cGVGbGFncygpKTsgfQogICAgIHN0YXRpYyBib29sIG92ZXJyaWRl c0dldE93blByb3BlcnR5U2xvdChJbmxpbmVUeXBlRmxhZ3MgZmxhZ3MpIHsgcmV0dXJuIGZsYWdz ICYgT3ZlcnJpZGVzR2V0T3duUHJvcGVydHlTbG90OyB9CiAgICAgc3RhdGljIGJvb2wgaGFzU3Rh dGljUHJvcGVydHlUYWJsZShJbmxpbmVUeXBlRmxhZ3MgZmxhZ3MpIHsgcmV0dXJuIGZsYWdzICYg SGFzU3RhdGljUHJvcGVydHlUYWJsZTsgfQorICAgIHN0YXRpYyBib29sIG1heUJlUHJvdG90eXBl KElubGluZVR5cGVGbGFncyBmbGFncykgeyByZXR1cm4gZmxhZ3MgJiBUeXBlSW5mb01heUJlUHJv dG90eXBlOyB9CiAgICAgYm9vbCBvdmVycmlkZXNUb1RoaXMoKSBjb25zdCB7IHJldHVybiBpc1Nl dE9uRmxhZ3MxKE92ZXJyaWRlc1RvVGhpcyk7IH0KICAgICBib29sIHN0cnVjdHVyZUlzSW1tb3J0 YWwoKSBjb25zdCB7IHJldHVybiBpc1NldE9uRmxhZ3MyKFN0cnVjdHVyZUlzSW1tb3J0YWwpOyB9 CiAgICAgYm9vbCBvdmVycmlkZXNHZXRQcm9wZXJ0eU5hbWVzKCkgY29uc3QgeyByZXR1cm4gaXNT ZXRPbkZsYWdzMihPdmVycmlkZXNHZXRQcm9wZXJ0eU5hbWVzKTsgfQpAQCAtMTE1LDYgKzExNywx MiBAQCBwdWJsaWM6CiAgICAgICAgIHJldHVybiBPQkpFQ1RfT0ZGU0VUT0YoVHlwZUluZm8sIG1f dHlwZSk7CiAgICAgfQogCisgICAgLy8gU2luY2UgdGhlIFN0cnVjdHVyZSBkb2Vzbid0IHRyYWNr IFR5cGVJbmZvTWF5QmVQcm90b3R5cGUsIHdlIG5lZWQgdG8gbWFrZSBzdXJlIHdlIGNvcHkgaXQu CisgICAgc3RhdGljIElubGluZVR5cGVGbGFncyBtZXJnZUlubGluZVR5cGVGbGFncyhJbmxpbmVU eXBlRmxhZ3Mgc3RydWN0dXJlRmxhZ3MsIElubGluZVR5cGVGbGFncyBvbGRDZWxsRmxhZ3MpCisg ICAgeworICAgICAgICByZXR1cm4gc3RydWN0dXJlRmxhZ3MgfCAob2xkQ2VsbEZsYWdzICYgc3Rh dGljX2Nhc3Q8SW5saW5lVHlwZUZsYWdzPihUeXBlSW5mb01heUJlUHJvdG90eXBlKSk7CisgICAg fQorCiAgICAgSW5saW5lVHlwZUZsYWdzIGlubGluZVR5cGVGbGFncygpIGNvbnN0IHsgcmV0dXJu IG1fZmxhZ3M7IH0KICAgICBPdXRPZkxpbmVUeXBlRmxhZ3Mgb3V0T2ZMaW5lVHlwZUZsYWdzKCkg Y29uc3QgeyByZXR1cm4gbV9mbGFnczI7IH0KIAo=