35850 2010-03-07 20:31:17 -0800 TypeInfo is unnecessarily large 2010-03-08 14:45:31 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 oliver webkit-unassigned oldest_to_newest 197057 0 oliver 2010-03-07 20:31:17 -0800 TypeInfo is unnecessarily large 197058 1 50184 oliver 2010-03-07 20:42:18 -0800 Created attachment 50184 Patch 197171 2 50184 darin 2010-03-08 08:01:28 -0800 Comment on attachment 50184 Patch > - JSType type() const { return m_type; } > + JSType type() const { return (JSType)m_type; } This should use static_cast rather than a C-style cast. r=me 197327 3 oliver 2010-03-08 14:45:31 -0800 Committed r55684: <http://trac.webkit.org/changeset/55684> 50184 2010-03-07 20:42:18 -0800 2010-03-08 08:01:28 -0800 Patch bug-35850-20100307204217.patch text/plain 15532 oliver ZGlmZiAtLWdpdCBhL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZyBiL0phdmFTY3JpcHRDb3JlL0No YW5nZUxvZwppbmRleCAyMGM0ODQ2Li45NzJkMzhlIDEwMDY0NAotLS0gYS9KYXZhU2NyaXB0Q29y ZS9DaGFuZ2VMb2cKKysrIGIvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzkg QEAKKzIwMTAtMDMtMDcgIE9saXZlciBIdW50ICA8b2xpdmVyQGFwcGxlLmNvbT4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUeXBlSW5mbyBpcyB1bm5l Y2Vzc2FyaWx5IGxhcmdlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0zNTg1MAorCisgICAgICAgIFJlZHVjZSB0aGUgc2l6ZSBvZiB0aGUgdHlwZSBhbmQg ZmxhZ3MgbWVtYmVycyB0byBhIHNpbmdsZQorICAgICAgICBieXRlIGVhY2gsIHJlZHVjaW5nIHRo ZSBzaXplIG9mIFN0cnVjdHVyZSBieSA4IGJ5dGVzLgorCisgICAgICAgICogYXNzZW1ibGVyL01h Y3JvQXNzZW1ibGVyWDg2Q29tbW9uLmg6CisgICAgICAgIChKU0M6Ok1hY3JvQXNzZW1ibGVyWDg2 Q29tbW9uOjpicmFuY2g4KToKKyAgICAgICAgKEpTQzo6TWFjcm9Bc3NlbWJsZXJYODZDb21tb246 OmJyYW5jaFRlc3Q4KToKKyAgICAgICAgKEpTQzo6TWFjcm9Bc3NlbWJsZXJYODZDb21tb246OnNl dFRlc3Q4KToKKyAgICAgICAgICBBZGQgc2luZ2xlIGJ5dGUgYnJhbmNoZXMsIGFuZCBjb3JyZWN0 IHNldFRlc3Q4IHRvIGRvIGEKKyAgICAgICAgICBzaW5nbGUgYnl0ZSByZWFkIGZyb20gbWVtb3J5 LCBhbmQgYWN0dWFsbHkgc3RvcmUgdGhlIHJlc3VsdAorICAgICAgICAqIGFzc2VtYmxlci9YODZB c3NlbWJsZXIuaDoKKyAgICAgICAgKEpTQzo6WDg2QXNzZW1ibGVyOjopOgorICAgICAgICAoSlND OjpYODZBc3NlbWJsZXI6OmNtcGJfaW0pOgorICAgICAgICAoSlNDOjpYODZBc3NlbWJsZXI6OnRl c3RiX2ltKToKKyAgICAgICAgKiBqaXQvSklUQ2FsbC5jcHA6CisgICAgICAgIChKU0M6OkpJVDo6 ZW1pdF9vcF9jb25zdHJ1Y3RfdmVyaWZ5KToKKyAgICAgICAgKiBqaXQvSklUT3Bjb2Rlcy5jcHA6 CisgICAgICAgIChKU0M6OkpJVDo6ZW1pdF9vcF9pbnN0YW5jZW9mKToKKyAgICAgICAgKEpTQzo6 SklUOjplbWl0X29wX2plcV9udWxsKToKKyAgICAgICAgKEpTQzo6SklUOjplbWl0X29wX2puZXFf bnVsbCk6CisgICAgICAgIChKU0M6OkpJVDo6ZW1pdF9vcF9nZXRfcG5hbWVzKToKKyAgICAgICAg KEpTQzo6SklUOjplbWl0X29wX2NvbnZlcnRfdGhpcyk6CisgICAgICAgIChKU0M6OkpJVDo6ZW1p dF9vcF9jb25zdHJ1Y3RfdmVyaWZ5KToKKyAgICAgICAgKEpTQzo6SklUOjplbWl0X29wX3RvX2pz bnVtYmVyKToKKyAgICAgICAgKEpTQzo6SklUOjplbWl0X29wX2VxX251bGwpOgorICAgICAgICAo SlNDOjpKSVQ6OmVtaXRfb3BfbmVxX251bGwpOgorICAgICAgICAqIHJ1bnRpbWUvSlNUeXBlSW5m by5oOgorICAgICAgICAoSlNDOjpUeXBlSW5mbzo6VHlwZUluZm8pOgorICAgICAgICAoSlNDOjpU eXBlSW5mbzo6dHlwZSk6CisKIDIwMTAtMDMtMDcgIEplZHJ6ZWogTm93YWNraSAgPGplZHJ6ZWou bm93YWNraUBub2tpYS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgU2ltb24gSGF1c21hbm4u CmRpZmYgLS1naXQgYS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJYODZD b21tb24uaCBiL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fzc2VtYmxlclg4NkNvbW1v bi5oCmluZGV4IDBjZWU2MGUuLmFkNzMzZDYgMTAwNjQ0Ci0tLSBhL0phdmFTY3JpcHRDb3JlL2Fz c2VtYmxlci9NYWNyb0Fzc2VtYmxlclg4NkNvbW1vbi5oCisrKyBiL0phdmFTY3JpcHRDb3JlL2Fz c2VtYmxlci9NYWNyb0Fzc2VtYmxlclg4NkNvbW1vbi5oCkBAIC02MTgsNiArNjE4LDEyIEBAIHB1 YmxpYzoKICAgICAvLyBhbiBvcHRpb25hbCBzZWNvbmQgb3BlcmFuZCBvZiBhIG1hc2sgdW5kZXIg d2hpY2ggdG8gcGVyZm9ybSB0aGUgdGVzdC4KIAogcHVibGljOgorICAgIEp1bXAgYnJhbmNoOChD b25kaXRpb24gY29uZCwgQWRkcmVzcyBsZWZ0LCBJbW0zMiByaWdodCkKKyAgICB7CisgICAgICAg IG1fYXNzZW1ibGVyLmNtcGJfaW0ocmlnaHQubV92YWx1ZSwgbGVmdC5vZmZzZXQsIGxlZnQuYmFz ZSk7CisgICAgICAgIHJldHVybiBKdW1wKG1fYXNzZW1ibGVyLmpDQyh4ODZDb25kaXRpb24oY29u ZCkpKTsKKyAgICB9CisKICAgICBKdW1wIGJyYW5jaDMyKENvbmRpdGlvbiBjb25kLCBSZWdpc3Rl cklEIGxlZnQsIFJlZ2lzdGVySUQgcmlnaHQpCiAgICAgewogICAgICAgICBtX2Fzc2VtYmxlci5j bXBsX3JyKHJpZ2h0LCBsZWZ0KTsKQEAgLTcxNSw2ICs3MjEsMTYgQEAgcHVibGljOgogICAgICAg ICAgICAgbV9hc3NlbWJsZXIudGVzdGxfaTMybShtYXNrLm1fdmFsdWUsIGFkZHJlc3Mub2Zmc2V0 LCBhZGRyZXNzLmJhc2UsIGFkZHJlc3MuaW5kZXgsIGFkZHJlc3Muc2NhbGUpOwogICAgICAgICBy ZXR1cm4gSnVtcChtX2Fzc2VtYmxlci5qQ0MoeDg2Q29uZGl0aW9uKGNvbmQpKSk7CiAgICAgfQor ICAgIAorICAgIEp1bXAgYnJhbmNoVGVzdDgoQ29uZGl0aW9uIGNvbmQsIEFkZHJlc3MgYWRkcmVz cywgSW1tMzIgbWFzayA9IEltbTMyKC0xKSkKKyAgICB7CisgICAgICAgIEFTU0VSVCgoY29uZCA9 PSBaZXJvKSB8fCAoY29uZCA9PSBOb25aZXJvKSk7CisgICAgICAgIGlmIChtYXNrLm1fdmFsdWUg PT0gLTEpCisgICAgICAgICAgICBtX2Fzc2VtYmxlci5jbXBiX2ltKDAsIGFkZHJlc3Mub2Zmc2V0 LCBhZGRyZXNzLmJhc2UpOworICAgICAgICBlbHNlCisgICAgICAgICAgICBtX2Fzc2VtYmxlci50 ZXN0Yl9pbShtYXNrLm1fdmFsdWUsIGFkZHJlc3Mub2Zmc2V0LCBhZGRyZXNzLmJhc2UpOworICAg ICAgICByZXR1cm4gSnVtcChtX2Fzc2VtYmxlci5qQ0MoeDg2Q29uZGl0aW9uKGNvbmQpKSk7Cisg ICAgfQogCiAgICAgSnVtcCBqdW1wKCkKICAgICB7CkBAIC05MTUsMTAgKzkzMSwxMSBAQCBwdWJs aWM6CiAgICAgdm9pZCBzZXRUZXN0OChDb25kaXRpb24gY29uZCwgQWRkcmVzcyBhZGRyZXNzLCBJ bW0zMiBtYXNrLCBSZWdpc3RlcklEIGRlc3QpCiAgICAgewogICAgICAgICBpZiAobWFzay5tX3Zh bHVlID09IC0xKQotICAgICAgICAgICAgbV9hc3NlbWJsZXIuY21wbF9pbSgwLCBhZGRyZXNzLm9m ZnNldCwgYWRkcmVzcy5iYXNlKTsKKyAgICAgICAgICAgIG1fYXNzZW1ibGVyLmNtcGJfaW0oMCwg YWRkcmVzcy5vZmZzZXQsIGFkZHJlc3MuYmFzZSk7CiAgICAgICAgIGVsc2UKLSAgICAgICAgICAg IG1fYXNzZW1ibGVyLnRlc3RsX2kzMm0obWFzay5tX3ZhbHVlLCBhZGRyZXNzLm9mZnNldCwgYWRk cmVzcy5iYXNlKTsKKyAgICAgICAgICAgIG1fYXNzZW1ibGVyLnRlc3RiX2ltKG1hc2subV92YWx1 ZSwgYWRkcmVzcy5vZmZzZXQsIGFkZHJlc3MuYmFzZSk7CiAgICAgICAgIG1fYXNzZW1ibGVyLnNl dENDX3IoeDg2Q29uZGl0aW9uKGNvbmQpLCBkZXN0KTsKKyAgICAgICAgbV9hc3NlbWJsZXIubW92 emJsX3JyKGRlc3QsIGRlc3QpOwogICAgIH0KIAogICAgIHZvaWQgc2V0VGVzdDMyKENvbmRpdGlv biBjb25kLCBBZGRyZXNzIGFkZHJlc3MsIEltbTMyIG1hc2ssIFJlZ2lzdGVySUQgZGVzdCkKZGlm ZiAtLWdpdCBhL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9YODZBc3NlbWJsZXIuaCBiL0phdmFT Y3JpcHRDb3JlL2Fzc2VtYmxlci9YODZBc3NlbWJsZXIuaAppbmRleCAxZDAyNGU3Li41N2I4MTFj IDEwMDY0NAotLS0gYS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvWDg2QXNzZW1ibGVyLmgKKysr IGIvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL1g4NkFzc2VtYmxlci5oCkBAIC0xMjgsNiArMTI4 LDcgQEAgcHJpdmF0ZToKICAgICAgICAgUFJFX1NTRV82NiAgICAgICAgICAgICAgICAgICAgICA9 IDB4NjYsCiAgICAgICAgIE9QX1BVU0hfSXogICAgICAgICAgICAgICAgICAgICAgPSAweDY4LAog ICAgICAgICBPUF9JTVVMX0d2RXZJeiAgICAgICAgICAgICAgICAgID0gMHg2OSwKKyAgICAgICAg T1BfR1JPVVAxX0ViSWIgICAgICAgICAgICAgICAgICA9IDB4ODAsCiAgICAgICAgIE9QX0dST1VQ MV9Fdkl6ICAgICAgICAgICAgICAgICAgPSAweDgxLAogICAgICAgICBPUF9HUk9VUDFfRXZJYiAg ICAgICAgICAgICAgICAgID0gMHg4MywKICAgICAgICAgT1BfVEVTVF9Fdkd2ICAgICAgICAgICAg ICAgICAgICA9IDB4ODUsCkBAIC03NTgsNyArNzU5LDcgQEAgcHVibGljOgogICAgICAgICBtX2Zv cm1hdHRlci5vbmVCeXRlT3AoT1BfR1JPVVAxX0V2SXosIEdST1VQMV9PUF9DTVAsIGRzdCk7CiAg ICAgICAgIG1fZm9ybWF0dGVyLmltbWVkaWF0ZTMyKGltbSk7CiAgICAgfQotCisgICAgCiAgICAg dm9pZCBjbXBsX2ltKGludCBpbW0sIGludCBvZmZzZXQsIFJlZ2lzdGVySUQgYmFzZSkKICAgICB7 CiAgICAgICAgIGlmIChDQU5fU0lHTl9FWFRFTkRfOF8zMihpbW0pKSB7CkBAIC03NjksNiArNzcw LDEyIEBAIHB1YmxpYzoKICAgICAgICAgICAgIG1fZm9ybWF0dGVyLmltbWVkaWF0ZTMyKGltbSk7 CiAgICAgICAgIH0KICAgICB9CisgICAgCisgICAgdm9pZCBjbXBiX2ltKGludCBpbW0sIGludCBv ZmZzZXQsIFJlZ2lzdGVySUQgYmFzZSkKKyAgICB7CisgICAgICAgIG1fZm9ybWF0dGVyLm9uZUJ5 dGVPcChPUF9HUk9VUDFfRWJJYiwgR1JPVVAxX09QX0NNUCwgYmFzZSwgb2Zmc2V0KTsKKyAgICAg ICAgbV9mb3JtYXR0ZXIuaW1tZWRpYXRlOChpbW0pOworICAgIH0KIAogICAgIHZvaWQgY21wbF9p bShpbnQgaW1tLCBpbnQgb2Zmc2V0LCBSZWdpc3RlcklEIGJhc2UsIFJlZ2lzdGVySUQgaW5kZXgs IGludCBzY2FsZSkKICAgICB7CkBAIC04ODgsNiArODk1LDEyIEBAIHB1YmxpYzoKICAgICAgICAg bV9mb3JtYXR0ZXIub25lQnl0ZU9wKE9QX0dST1VQM19Fdkl6LCBHUk9VUDNfT1BfVEVTVCwgYmFz ZSwgb2Zmc2V0KTsKICAgICAgICAgbV9mb3JtYXR0ZXIuaW1tZWRpYXRlMzIoaW1tKTsKICAgICB9 CisgICAgCisgICAgdm9pZCB0ZXN0Yl9pbShpbnQgaW1tLCBpbnQgb2Zmc2V0LCBSZWdpc3RlcklE IGJhc2UpCisgICAgeworICAgICAgICBtX2Zvcm1hdHRlci5vbmVCeXRlT3AoT1BfR1JPVVAzX0Vi SWIsIEdST1VQM19PUF9URVNULCBiYXNlLCBvZmZzZXQpOworICAgICAgICBtX2Zvcm1hdHRlci5p bW1lZGlhdGU4KGltbSk7CisgICAgfQogCiAgICAgdm9pZCB0ZXN0bF9pMzJtKGludCBpbW0sIGlu dCBvZmZzZXQsIFJlZ2lzdGVySUQgYmFzZSwgUmVnaXN0ZXJJRCBpbmRleCwgaW50IHNjYWxlKQog ICAgIHsKZGlmZiAtLWdpdCBhL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRDYWxsLmNwcCBiL0phdmFT Y3JpcHRDb3JlL2ppdC9KSVRDYWxsLmNwcAppbmRleCAxNzlhYWQ3Li5kYTYwM2JkIDEwMDY0NAot LS0gYS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUQ2FsbC5jcHAKKysrIGIvSmF2YVNjcmlwdENvcmUv aml0L0pJVENhbGwuY3BwCkBAIC0xNTksNyArMTU5LDcgQEAgdm9pZCBKSVQ6OmVtaXRfb3BfY29u c3RydWN0X3ZlcmlmeShJbnN0cnVjdGlvbiogY3VycmVudEluc3RydWN0aW9uKQogICAgIGVtaXRM b2FkKGRzdCwgcmVnVDEsIHJlZ1QwKTsKICAgICBhZGRTbG93Q2FzZShicmFuY2gzMihOb3RFcXVh bCwgcmVnVDEsIEltbTMyKEpTVmFsdWU6OkNlbGxUYWcpKSk7CiAgICAgbG9hZFB0cihBZGRyZXNz KHJlZ1QwLCBPQkpFQ1RfT0ZGU0VUT0YoSlNDZWxsLCBtX3N0cnVjdHVyZSkpLCByZWdUMik7Ci0g ICAgYWRkU2xvd0Nhc2UoYnJhbmNoMzIoTm90RXF1YWwsIEFkZHJlc3MocmVnVDIsIE9CSkVDVF9P RkZTRVRPRihTdHJ1Y3R1cmUsIG1fdHlwZUluZm8pICsgT0JKRUNUX09GRlNFVE9GKFR5cGVJbmZv LCBtX3R5cGUpKSwgSW1tMzIoT2JqZWN0VHlwZSkpKTsKKyAgICBhZGRTbG93Q2FzZShicmFuY2g4 KE5vdEVxdWFsLCBBZGRyZXNzKHJlZ1QyLCBPQkpFQ1RfT0ZGU0VUT0YoU3RydWN0dXJlLCBtX3R5 cGVJbmZvKSArIE9CSkVDVF9PRkZTRVRPRihUeXBlSW5mbywgbV90eXBlKSksIEltbTMyKE9iamVj dFR5cGUpKSk7CiB9CiAKIHZvaWQgSklUOjplbWl0U2xvd19vcF9jb25zdHJ1Y3RfdmVyaWZ5KElu c3RydWN0aW9uKiBjdXJyZW50SW5zdHJ1Y3Rpb24sIFZlY3RvcjxTbG93Q2FzZUVudHJ5Pjo6aXRl cmF0b3ImIGl0ZXIpCmRpZmYgLS1naXQgYS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUT3Bjb2Rlcy5j cHAgYi9KYXZhU2NyaXB0Q29yZS9qaXQvSklUT3Bjb2Rlcy5jcHAKaW5kZXggYzA0ZTcxYi4uZDA0 ODU3YyAxMDA2NDQKLS0tIGEvSmF2YVNjcmlwdENvcmUvaml0L0pJVE9wY29kZXMuY3BwCisrKyBi L0phdmFTY3JpcHRDb3JlL2ppdC9KSVRPcGNvZGVzLmNwcApAQCAtNTE2LDcgKzUxNiw3IEBAIHZv aWQgSklUOjplbWl0X29wX2luc3RhbmNlb2YoSW5zdHJ1Y3Rpb24qIGN1cnJlbnRJbnN0cnVjdGlv bikKIAogICAgIC8vIENoZWNrIHRoYXQgYmFzZVZhbCAnSW1wbGVtZW50c0RlZmF1bHRIYXNJbnN0 YW5jZScuCiAgICAgbG9hZFB0cihBZGRyZXNzKHJlZ1QwLCBPQkpFQ1RfT0ZGU0VUT0YoSlNDZWxs LCBtX3N0cnVjdHVyZSkpLCByZWdUMCk7Ci0gICAgYWRkU2xvd0Nhc2UoYnJhbmNoVGVzdDMyKFpl cm8sIEFkZHJlc3MocmVnVDAsIE9CSkVDVF9PRkZTRVRPRihTdHJ1Y3R1cmUsIG1fdHlwZUluZm8u bV9mbGFncykpLCBJbW0zMihJbXBsZW1lbnRzRGVmYXVsdEhhc0luc3RhbmNlKSkpOworICAgIGFk ZFNsb3dDYXNlKGJyYW5jaFRlc3Q4KFplcm8sIEFkZHJlc3MocmVnVDAsIE9CSkVDVF9PRkZTRVRP RihTdHJ1Y3R1cmUsIG1fdHlwZUluZm8ubV9mbGFncykpLCBJbW0zMihJbXBsZW1lbnRzRGVmYXVs dEhhc0luc3RhbmNlKSkpOwogCiAgICAgLy8gT3B0aW1pc3RpY2FsbHkgbG9hZCB0aGUgcmVzdWx0 IHRydWUsIGFuZCBzdGFydCBsb29waW5nLgogICAgIC8vIEluaXRpYWxseSwgcmVnVDEgc3RpbGwg Y29udGFpbnMgcHJvdG8gYW5kIHJlZ1QyIHN0aWxsIGNvbnRhaW5zIHZhbHVlLgpAQCAtODY5LDcg Kzg2OSw3IEBAIHZvaWQgSklUOjplbWl0X29wX2plcV9udWxsKEluc3RydWN0aW9uKiBjdXJyZW50 SW5zdHJ1Y3Rpb24pCiAKICAgICAvLyBGaXJzdCwgaGFuZGxlIEpTQ2VsbCBjYXNlcyAtIGNoZWNr IE1hc3F1ZXJhZGVzQXNVbmRlZmluZWQgYml0IG9uIHRoZSBzdHJ1Y3R1cmUuCiAgICAgbG9hZFB0 cihBZGRyZXNzKHJlZ1QwLCBPQkpFQ1RfT0ZGU0VUT0YoSlNDZWxsLCBtX3N0cnVjdHVyZSkpLCBy ZWdUMik7Ci0gICAgYWRkSnVtcChicmFuY2hUZXN0MzIoTm9uWmVybywgQWRkcmVzcyhyZWdUMiwg T0JKRUNUX09GRlNFVE9GKFN0cnVjdHVyZSwgbV90eXBlSW5mby5tX2ZsYWdzKSksIEltbTMyKE1h c3F1ZXJhZGVzQXNVbmRlZmluZWQpKSwgdGFyZ2V0KTsKKyAgICBhZGRKdW1wKGJyYW5jaFRlc3Q4 KE5vblplcm8sIEFkZHJlc3MocmVnVDIsIE9CSkVDVF9PRkZTRVRPRihTdHJ1Y3R1cmUsIG1fdHlw ZUluZm8ubV9mbGFncykpLCBJbW0zMihNYXNxdWVyYWRlc0FzVW5kZWZpbmVkKSksIHRhcmdldCk7 CiAKICAgICBKdW1wIHdhc05vdEltbWVkaWF0ZSA9IGp1bXAoKTsKIApAQCAtODk2LDcgKzg5Niw3 IEBAIHZvaWQgSklUOjplbWl0X29wX2puZXFfbnVsbChJbnN0cnVjdGlvbiogY3VycmVudEluc3Ry dWN0aW9uKQogCiAgICAgLy8gRmlyc3QsIGhhbmRsZSBKU0NlbGwgY2FzZXMgLSBjaGVjayBNYXNx dWVyYWRlc0FzVW5kZWZpbmVkIGJpdCBvbiB0aGUgc3RydWN0dXJlLgogICAgIGxvYWRQdHIoQWRk cmVzcyhyZWdUMCwgT0JKRUNUX09GRlNFVE9GKEpTQ2VsbCwgbV9zdHJ1Y3R1cmUpKSwgcmVnVDIp OwotICAgIGFkZEp1bXAoYnJhbmNoVGVzdDMyKFplcm8sIEFkZHJlc3MocmVnVDIsIE9CSkVDVF9P RkZTRVRPRihTdHJ1Y3R1cmUsIG1fdHlwZUluZm8ubV9mbGFncykpLCBJbW0zMihNYXNxdWVyYWRl c0FzVW5kZWZpbmVkKSksIHRhcmdldCk7CisgICAgYWRkSnVtcChicmFuY2hUZXN0OChaZXJvLCBB ZGRyZXNzKHJlZ1QyLCBPQkpFQ1RfT0ZGU0VUT0YoU3RydWN0dXJlLCBtX3R5cGVJbmZvLm1fZmxh Z3MpKSwgSW1tMzIoTWFzcXVlcmFkZXNBc1VuZGVmaW5lZCkpLCB0YXJnZXQpOwogCiAgICAgSnVt cCB3YXNOb3RJbW1lZGlhdGUgPSBqdW1wKCk7CiAKQEAgLTEyMDksNyArMTIwOSw3IEBAIHZvaWQg SklUOjplbWl0X29wX2dldF9wbmFtZXMoSW5zdHJ1Y3Rpb24qIGN1cnJlbnRJbnN0cnVjdGlvbikK ICAgICAgICAgaXNOb3RPYmplY3QuYXBwZW5kKGJyYW5jaDMyKE5vdEVxdWFsLCByZWdUMSwgSW1t MzIoSlNWYWx1ZTo6Q2VsbFRhZykpKTsKICAgICBpZiAoYmFzZSAhPSBtX2NvZGVCbG9jay0+dGhp c1JlZ2lzdGVyKCkpIHsKICAgICAgICAgbG9hZFB0cihBZGRyZXNzKHJlZ1QwLCBPQkpFQ1RfT0ZG U0VUT0YoSlNDZWxsLCBtX3N0cnVjdHVyZSkpLCByZWdUMik7Ci0gICAgICAgIGlzTm90T2JqZWN0 LmFwcGVuZChicmFuY2gzMihOb3RFcXVhbCwgQWRkcmVzcyhyZWdUMiwgT0JKRUNUX09GRlNFVE9G KFN0cnVjdHVyZSwgbV90eXBlSW5mby5tX3R5cGUpKSwgSW1tMzIoT2JqZWN0VHlwZSkpKTsKKyAg ICAgICAgaXNOb3RPYmplY3QuYXBwZW5kKGJyYW5jaDgoTm90RXF1YWwsIEFkZHJlc3MocmVnVDIs IE9CSkVDVF9PRkZTRVRPRihTdHJ1Y3R1cmUsIG1fdHlwZUluZm8ubV90eXBlKSksIEltbTMyKE9i amVjdFR5cGUpKSk7CiAgICAgfQogCiAgICAgLy8gV2UgY291bGQgaW5saW5lIHRoZSBjYXNlIHdo ZXJlIHlvdSBoYXZlIGEgdmFsaWQgY2FjaGUsIGJ1dApAQCAtMTQ4OCw3ICsxNDg4LDcgQEAgdm9p ZCBKSVQ6OmVtaXRfb3BfY29udmVydF90aGlzKEluc3RydWN0aW9uKiBjdXJyZW50SW5zdHJ1Y3Rp b24pCiAgICAgYWRkU2xvd0Nhc2UoYnJhbmNoMzIoTm90RXF1YWwsIHJlZ1QxLCBJbW0zMihKU1Zh bHVlOjpDZWxsVGFnKSkpOwogCiAgICAgbG9hZFB0cihBZGRyZXNzKHJlZ1QwLCBPQkpFQ1RfT0ZG U0VUT0YoSlNDZWxsLCBtX3N0cnVjdHVyZSkpLCByZWdUMik7Ci0gICAgYWRkU2xvd0Nhc2UoYnJh bmNoVGVzdDMyKE5vblplcm8sIEFkZHJlc3MocmVnVDIsIE9CSkVDVF9PRkZTRVRPRihTdHJ1Y3R1 cmUsIG1fdHlwZUluZm8ubV9mbGFncykpLCBJbW0zMihOZWVkc1RoaXNDb252ZXJzaW9uKSkpOwor ICAgIGFkZFNsb3dDYXNlKGJyYW5jaFRlc3Q4KE5vblplcm8sIEFkZHJlc3MocmVnVDIsIE9CSkVD VF9PRkZTRVRPRihTdHJ1Y3R1cmUsIG1fdHlwZUluZm8ubV9mbGFncykpLCBJbW0zMihOZWVkc1Ro aXNDb252ZXJzaW9uKSkpOwogCiAgICAgbWFwKG1fYnl0ZWNvZGVJbmRleCArIE9QQ09ERV9MRU5H VEgob3BfY29udmVydF90aGlzKSwgdGhpc1JlZ2lzdGVyLCByZWdUMSwgcmVnVDApOwogfQpAQCAt MTk5Miw3ICsxOTkyLDcgQEAgdm9pZCBKSVQ6OmVtaXRfb3BfaW5zdGFuY2VvZihJbnN0cnVjdGlv biogY3VycmVudEluc3RydWN0aW9uKQogCiAgICAgLy8gQ2hlY2sgdGhhdCBiYXNlVmFsICdJbXBs ZW1lbnRzRGVmYXVsdEhhc0luc3RhbmNlJy4KICAgICBsb2FkUHRyKEFkZHJlc3MocmVnVDAsIE9C SkVDVF9PRkZTRVRPRihKU0NlbGwsIG1fc3RydWN0dXJlKSksIHJlZ1QwKTsKLSAgICBhZGRTbG93 Q2FzZShicmFuY2hUZXN0MzIoWmVybywgQWRkcmVzcyhyZWdUMCwgT0JKRUNUX09GRlNFVE9GKFN0 cnVjdHVyZSwgbV90eXBlSW5mby5tX2ZsYWdzKSksIEltbTMyKEltcGxlbWVudHNEZWZhdWx0SGFz SW5zdGFuY2UpKSk7CisgICAgYWRkU2xvd0Nhc2UoYnJhbmNoVGVzdDgoWmVybywgQWRkcmVzcyhy ZWdUMCwgT0JKRUNUX09GRlNFVE9GKFN0cnVjdHVyZSwgbV90eXBlSW5mby5tX2ZsYWdzKSksIElt bTMyKEltcGxlbWVudHNEZWZhdWx0SGFzSW5zdGFuY2UpKSk7CiAKICAgICAvLyBPcHRpbWlzdGlj YWxseSBsb2FkIHRoZSByZXN1bHQgdHJ1ZSwgYW5kIHN0YXJ0IGxvb3BpbmcuCiAgICAgLy8gSW5p dGlhbGx5LCByZWdUMSBzdGlsbCBjb250YWlucyBwcm90byBhbmQgcmVnVDIgc3RpbGwgY29udGFp bnMgdmFsdWUuCkBAIC0yMTUzLDcgKzIxNTMsNyBAQCB2b2lkIEpJVDo6ZW1pdF9vcF9jb25zdHJ1 Y3RfdmVyaWZ5KEluc3RydWN0aW9uKiBjdXJyZW50SW5zdHJ1Y3Rpb24pCiAKICAgICBlbWl0SnVt cFNsb3dDYXNlSWZOb3RKU0NlbGwocmVnVDApOwogICAgIGxvYWRQdHIoQWRkcmVzcyhyZWdUMCwg T0JKRUNUX09GRlNFVE9GKEpTQ2VsbCwgbV9zdHJ1Y3R1cmUpKSwgcmVnVDIpOwotICAgIGFkZFNs b3dDYXNlKGJyYW5jaDMyKE5vdEVxdWFsLCBBZGRyZXNzKHJlZ1QyLCBPQkpFQ1RfT0ZGU0VUT0Yo U3RydWN0dXJlLCBtX3R5cGVJbmZvKSArIE9CSkVDVF9PRkZTRVRPRihUeXBlSW5mbywgbV90eXBl KSksIEltbTMyKE9iamVjdFR5cGUpKSk7CisgICAgYWRkU2xvd0Nhc2UoYnJhbmNoOChOb3RFcXVh bCwgQWRkcmVzcyhyZWdUMiwgT0JKRUNUX09GRlNFVE9GKFN0cnVjdHVyZSwgbV90eXBlSW5mby5t X3R5cGUpKSwgSW1tMzIoT2JqZWN0VHlwZSkpKTsKIAogfQogCkBAIC0yMjYyLDcgKzIyNjIsNyBA QCB2b2lkIEpJVDo6ZW1pdF9vcF9qZXFfbnVsbChJbnN0cnVjdGlvbiogY3VycmVudEluc3RydWN0 aW9uKQogCiAgICAgLy8gRmlyc3QsIGhhbmRsZSBKU0NlbGwgY2FzZXMgLSBjaGVjayBNYXNxdWVy YWRlc0FzVW5kZWZpbmVkIGJpdCBvbiB0aGUgc3RydWN0dXJlLgogICAgIGxvYWRQdHIoQWRkcmVz cyhyZWdUMCwgT0JKRUNUX09GRlNFVE9GKEpTQ2VsbCwgbV9zdHJ1Y3R1cmUpKSwgcmVnVDIpOwot ICAgIGFkZEp1bXAoYnJhbmNoVGVzdDMyKE5vblplcm8sIEFkZHJlc3MocmVnVDIsIE9CSkVDVF9P RkZTRVRPRihTdHJ1Y3R1cmUsIG1fdHlwZUluZm8ubV9mbGFncykpLCBJbW0zMihNYXNxdWVyYWRl c0FzVW5kZWZpbmVkKSksIHRhcmdldCk7CisgICAgYWRkSnVtcChicmFuY2hUZXN0OChOb25aZXJv LCBBZGRyZXNzKHJlZ1QyLCBPQkpFQ1RfT0ZGU0VUT0YoU3RydWN0dXJlLCBtX3R5cGVJbmZvLm1f ZmxhZ3MpKSwgSW1tMzIoTWFzcXVlcmFkZXNBc1VuZGVmaW5lZCkpLCB0YXJnZXQpOwogICAgIEp1 bXAgd2FzTm90SW1tZWRpYXRlID0ganVtcCgpOwogCiAgICAgLy8gTm93IGhhbmRsZSB0aGUgaW1t ZWRpYXRlIGNhc2VzIC0gdW5kZWZpbmVkICYgbnVsbApAQCAtMjI4Myw3ICsyMjgzLDcgQEAgdm9p ZCBKSVQ6OmVtaXRfb3Bfam5lcV9udWxsKEluc3RydWN0aW9uKiBjdXJyZW50SW5zdHJ1Y3Rpb24p CiAKICAgICAvLyBGaXJzdCwgaGFuZGxlIEpTQ2VsbCBjYXNlcyAtIGNoZWNrIE1hc3F1ZXJhZGVz QXNVbmRlZmluZWQgYml0IG9uIHRoZSBzdHJ1Y3R1cmUuCiAgICAgbG9hZFB0cihBZGRyZXNzKHJl Z1QwLCBPQkpFQ1RfT0ZGU0VUT0YoSlNDZWxsLCBtX3N0cnVjdHVyZSkpLCByZWdUMik7Ci0gICAg YWRkSnVtcChicmFuY2hUZXN0MzIoWmVybywgQWRkcmVzcyhyZWdUMiwgT0JKRUNUX09GRlNFVE9G KFN0cnVjdHVyZSwgbV90eXBlSW5mby5tX2ZsYWdzKSksIEltbTMyKE1hc3F1ZXJhZGVzQXNVbmRl ZmluZWQpKSwgdGFyZ2V0KTsKKyAgICBhZGRKdW1wKGJyYW5jaFRlc3Q4KFplcm8sIEFkZHJlc3Mo cmVnVDIsIE9CSkVDVF9PRkZTRVRPRihTdHJ1Y3R1cmUsIG1fdHlwZUluZm8ubV9mbGFncykpLCBJ bW0zMihNYXNxdWVyYWRlc0FzVW5kZWZpbmVkKSksIHRhcmdldCk7CiAgICAgSnVtcCB3YXNOb3RJ bW1lZGlhdGUgPSBqdW1wKCk7CiAKICAgICAvLyBOb3cgaGFuZGxlIHRoZSBpbW1lZGlhdGUgY2Fz ZXMgLSB1bmRlZmluZWQgJiBudWxsCkBAIC0yNDM5LDcgKzI0MzksNyBAQCB2b2lkIEpJVDo6ZW1p dF9vcF9nZXRfcG5hbWVzKEluc3RydWN0aW9uKiBjdXJyZW50SW5zdHJ1Y3Rpb24pCiAgICAgICAg IGlzTm90T2JqZWN0LmFwcGVuZChlbWl0SnVtcElmTm90SlNDZWxsKHJlZ1QwKSk7CiAgICAgaWYg KGJhc2UgIT0gbV9jb2RlQmxvY2stPnRoaXNSZWdpc3RlcigpKSB7CiAgICAgICAgIGxvYWRQdHIo QWRkcmVzcyhyZWdUMCwgT0JKRUNUX09GRlNFVE9GKEpTQ2VsbCwgbV9zdHJ1Y3R1cmUpKSwgcmVn VDIpOwotICAgICAgICBpc05vdE9iamVjdC5hcHBlbmQoYnJhbmNoMzIoTm90RXF1YWwsIEFkZHJl c3MocmVnVDIsIE9CSkVDVF9PRkZTRVRPRihTdHJ1Y3R1cmUsIG1fdHlwZUluZm8ubV90eXBlKSks IEltbTMyKE9iamVjdFR5cGUpKSk7CisgICAgICAgIGlzTm90T2JqZWN0LmFwcGVuZChicmFuY2g4 KE5vdEVxdWFsLCBBZGRyZXNzKHJlZ1QyLCBPQkpFQ1RfT0ZGU0VUT0YoU3RydWN0dXJlLCBtX3R5 cGVJbmZvLm1fdHlwZSkpLCBJbW0zMihPYmplY3RUeXBlKSkpOwogICAgIH0KIAogICAgIC8vIFdl IGNvdWxkIGlubGluZSB0aGUgY2FzZSB3aGVyZSB5b3UgaGF2ZSBhIHZhbGlkIGNhY2hlLCBidXQK QEAgLTI1OTAsNyArMjU5MCw3IEBAIHZvaWQgSklUOjplbWl0X29wX3RvX2pzbnVtYmVyKEluc3Ry dWN0aW9uKiBjdXJyZW50SW5zdHJ1Y3Rpb24pCiAKICAgICBlbWl0SnVtcFNsb3dDYXNlSWZOb3RK U0NlbGwocmVnVDAsIHNyY1ZSZWcpOwogICAgIGxvYWRQdHIoQWRkcmVzcyhyZWdUMCwgT0JKRUNU X09GRlNFVE9GKEpTQ2VsbCwgbV9zdHJ1Y3R1cmUpKSwgcmVnVDIpOwotICAgIGFkZFNsb3dDYXNl KGJyYW5jaDMyKE5vdEVxdWFsLCBBZGRyZXNzKHJlZ1QyLCBPQkpFQ1RfT0ZGU0VUT0YoU3RydWN0 dXJlLCBtX3R5cGVJbmZvLm1fdHlwZSkpLCBJbW0zMihOdW1iZXJUeXBlKSkpOworICAgIGFkZFNs b3dDYXNlKGJyYW5jaDgoTm90RXF1YWwsIEFkZHJlc3MocmVnVDIsIE9CSkVDVF9PRkZTRVRPRihT dHJ1Y3R1cmUsIG1fdHlwZUluZm8ubV90eXBlKSksIEltbTMyKE51bWJlclR5cGUpKSk7CiAgICAg CiAgICAgd2FzSW1tZWRpYXRlLmxpbmsodGhpcyk7CiAKQEAgLTI3MDEsNyArMjcwMSw3IEBAIHZv aWQgSklUOjplbWl0X29wX2VxX251bGwoSW5zdHJ1Y3Rpb24qIGN1cnJlbnRJbnN0cnVjdGlvbikK ICAgICBKdW1wIGlzSW1tZWRpYXRlID0gZW1pdEp1bXBJZk5vdEpTQ2VsbChyZWdUMCk7CiAKICAg ICBsb2FkUHRyKEFkZHJlc3MocmVnVDAsIE9CSkVDVF9PRkZTRVRPRihKU0NlbGwsIG1fc3RydWN0 dXJlKSksIHJlZ1QyKTsKLSAgICBzZXRUZXN0MzIoTm9uWmVybywgQWRkcmVzcyhyZWdUMiwgT0JK RUNUX09GRlNFVE9GKFN0cnVjdHVyZSwgbV90eXBlSW5mby5tX2ZsYWdzKSksIEltbTMyKE1hc3F1 ZXJhZGVzQXNVbmRlZmluZWQpLCByZWdUMCk7CisgICAgc2V0VGVzdDgoTm9uWmVybywgQWRkcmVz cyhyZWdUMiwgT0JKRUNUX09GRlNFVE9GKFN0cnVjdHVyZSwgbV90eXBlSW5mby5tX2ZsYWdzKSks IEltbTMyKE1hc3F1ZXJhZGVzQXNVbmRlZmluZWQpLCByZWdUMCk7CiAKICAgICBKdW1wIHdhc05v dEltbWVkaWF0ZSA9IGp1bXAoKTsKIApAQCAtMjcyNiw3ICsyNzI2LDcgQEAgdm9pZCBKSVQ6OmVt aXRfb3BfbmVxX251bGwoSW5zdHJ1Y3Rpb24qIGN1cnJlbnRJbnN0cnVjdGlvbikKICAgICBKdW1w IGlzSW1tZWRpYXRlID0gZW1pdEp1bXBJZk5vdEpTQ2VsbChyZWdUMCk7CiAKICAgICBsb2FkUHRy KEFkZHJlc3MocmVnVDAsIE9CSkVDVF9PRkZTRVRPRihKU0NlbGwsIG1fc3RydWN0dXJlKSksIHJl Z1QyKTsKLSAgICBzZXRUZXN0MzIoWmVybywgQWRkcmVzcyhyZWdUMiwgT0JKRUNUX09GRlNFVE9G KFN0cnVjdHVyZSwgbV90eXBlSW5mby5tX2ZsYWdzKSksIEltbTMyKE1hc3F1ZXJhZGVzQXNVbmRl ZmluZWQpLCByZWdUMCk7CisgICAgc2V0VGVzdDgoWmVybywgQWRkcmVzcyhyZWdUMiwgT0JKRUNU X09GRlNFVE9GKFN0cnVjdHVyZSwgbV90eXBlSW5mby5tX2ZsYWdzKSksIEltbTMyKE1hc3F1ZXJh ZGVzQXNVbmRlZmluZWQpLCByZWdUMCk7CiAKICAgICBKdW1wIHdhc05vdEltbWVkaWF0ZSA9IGp1 bXAoKTsKIApAQCAtMjc4Niw3ICsyNzg2LDcgQEAgdm9pZCBKSVQ6OmVtaXRfb3BfY29udmVydF90 aGlzKEluc3RydWN0aW9uKiBjdXJyZW50SW5zdHJ1Y3Rpb24pCiAKICAgICBlbWl0SnVtcFNsb3dD YXNlSWZOb3RKU0NlbGwocmVnVDApOwogICAgIGxvYWRQdHIoQWRkcmVzcyhyZWdUMCwgT0JKRUNU X09GRlNFVE9GKEpTQ2VsbCwgbV9zdHJ1Y3R1cmUpKSwgcmVnVDEpOwotICAgIGFkZFNsb3dDYXNl KGJyYW5jaFRlc3QzMihOb25aZXJvLCBBZGRyZXNzKHJlZ1QxLCBPQkpFQ1RfT0ZGU0VUT0YoU3Ry dWN0dXJlLCBtX3R5cGVJbmZvLm1fZmxhZ3MpKSwgSW1tMzIoTmVlZHNUaGlzQ29udmVyc2lvbikp KTsKKyAgICBhZGRTbG93Q2FzZShicmFuY2hUZXN0OChOb25aZXJvLCBBZGRyZXNzKHJlZ1QxLCBP QkpFQ1RfT0ZGU0VUT0YoU3RydWN0dXJlLCBtX3R5cGVJbmZvLm1fZmxhZ3MpKSwgSW1tMzIoTmVl ZHNUaGlzQ29udmVyc2lvbikpKTsKIAogfQogCmRpZmYgLS1naXQgYS9KYXZhU2NyaXB0Q29yZS9y dW50aW1lL0pTVHlwZUluZm8uaCBiL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNUeXBlSW5mby5o CmluZGV4IDdjODk2MDAuLmUyMjViYzcgMTAwNjQ0Ci0tLSBhL0phdmFTY3JpcHRDb3JlL3J1bnRp bWUvSlNUeXBlSW5mby5oCisrKyBiL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNUeXBlSW5mby5o CkBAIC01MCw2ICs1MCw4IEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICBUeXBlSW5mbyhKU1R5 cGUgdHlwZSwgdW5zaWduZWQgZmxhZ3MgPSAwKQogICAgICAgICAgICAgOiBtX3R5cGUodHlwZSkK ICAgICAgICAgeworICAgICAgICAgICAgQVNTRVJUKGZsYWdzIDw9IDB4RkYpOworICAgICAgICAg ICAgQVNTRVJUKHR5cGUgPD0gMHhGRik7CiAgICAgICAgICAgICAvLyBJbXBsZW1lbnRzRGVmYXVs dEhhc0luc3RhbmNlIG1lYW5zIChJbXBsZW1lbnRzSGFzSW5zdGFuY2UgJiAhT3ZlcnJpZGVzSGFz SW5zdGFuY2UpCiAgICAgICAgICAgICBpZiAoKGZsYWdzICYgKEltcGxlbWVudHNIYXNJbnN0YW5j ZSB8IE92ZXJyaWRlc0hhc0luc3RhbmNlKSkgPT0gSW1wbGVtZW50c0hhc0luc3RhbmNlKQogICAg ICAgICAgICAgICAgIG1fZmxhZ3MgPSBmbGFncyB8IEltcGxlbWVudHNEZWZhdWx0SGFzSW5zdGFu Y2U7CkBAIC01Nyw3ICs1OSw3IEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICAgICAgICAgIG1f ZmxhZ3MgPSBmbGFnczsKICAgICAgICAgfQogCi0gICAgICAgIEpTVHlwZSB0eXBlKCkgY29uc3Qg eyByZXR1cm4gbV90eXBlOyB9CisgICAgICAgIEpTVHlwZSB0eXBlKCkgY29uc3QgeyByZXR1cm4g KEpTVHlwZSltX3R5cGU7IH0KIAogICAgICAgICBib29sIG1hc3F1ZXJhZGVzQXNVbmRlZmluZWQo KSBjb25zdCB7IHJldHVybiBtX2ZsYWdzICYgTWFzcXVlcmFkZXNBc1VuZGVmaW5lZDsgfQogICAg ICAgICBib29sIGltcGxlbWVudHNIYXNJbnN0YW5jZSgpIGNvbnN0IHsgcmV0dXJuIG1fZmxhZ3Mg JiBJbXBsZW1lbnRzSGFzSW5zdGFuY2U7IH0KQEAgLTY5LDggKzcxLDggQEAgbmFtZXNwYWNlIEpT QyB7CiAgICAgICAgIHVuc2lnbmVkIGZsYWdzKCkgY29uc3QgeyByZXR1cm4gbV9mbGFnczsgfQog CiAgICAgcHJpdmF0ZToKLSAgICAgICAgSlNUeXBlIG1fdHlwZTsKLSAgICAgICAgdW5zaWduZWQg bV9mbGFnczsKKyAgICAgICAgdW5zaWduZWQgY2hhciBtX3R5cGU7CisgICAgICAgIHVuc2lnbmVk IGNoYXIgbV9mbGFnczsKICAgICB9OwogCiB9Cg==