154484 2016-02-19 17:10:58 -0800 Support building LocaleICU with light ICU (UCONFIG_NO_FORMATTING) 2016-02-29 01:46:14 -0800 1 1 1 Unclassified WebKit Platform WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 olivier.blin webkit-unassigned annulen commit-queue darin ewmailing mcatanzaro zan oldest_to_newest 1166632 0 olivier.blin 2016-02-19 17:10:58 -0800 LocaleICU should be buildable with a light ICU build, with the UCONFIG_NO_FORMATTING flag. In this mode, this makes LocaleICU with UCONFIG_NO_FORMATTING essentially the same as LocaleNone, but allows to keep using ICU for other features. 1166633 1 271831 olivier.blin 2016-02-19 17:12:16 -0800 Created attachment 271831 Patch 1166896 2 271831 darin 2016-02-21 17:17:04 -0800 Comment on attachment 271831 Patch Patch doesn’t apply. Please upload a new patch that applies. 1166912 3 mcatanzaro 2016-02-21 18:48:22 -0800 It depended on other patches that were not in trunk when this patch was uploaded and when EWS ran, but which are now in trunk. So it *probably* applies. Bugzilla needs some way to trigger EWS to run again; a workaround is to reupload the same patch again. I often delay marking patches r? until dependent patches have landed to avoid this problem. 1167203 4 271958 olivier.blin 2016-02-22 14:54:03 -0800 Created attachment 271958 Patch 1167204 5 olivier.blin 2016-02-22 14:54:52 -0800 That's the same patch again, it should apply now that other patches got merged, as Michael explained. 1167690 6 271958 darin 2016-02-23 22:29:27 -0800 Comment on attachment 271958 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=271958&action=review > Source/WebCore/platform/text/LocaleICU.h:86 > +#if !UCONFIG_NO_FORMATTING > UNumberFormat* m_numberFormat; > bool m_didCreateDecimalFormat; > +#endif Would be better to initialize these data members here. Then we would not need the conditional initialization lines in the constructor. 1167721 7 271958 commit-queue 2016-02-23 23:20:25 -0800 Comment on attachment 271958 Patch Clearing flags on attachment: 271958 Committed r197018: <http://trac.webkit.org/changeset/197018> 1167722 8 commit-queue 2016-02-23 23:20:29 -0800 All reviewed patches have been landed. Closing bug. 1167772 9 olivier.blin 2016-02-24 04:15:33 -0800 (In reply to comment #6) > Comment on attachment 271958 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=271958&action=review > > > Source/WebCore/platform/text/LocaleICU.h:86 > > +#if !UCONFIG_NO_FORMATTING > > UNumberFormat* m_numberFormat; > > bool m_didCreateDecimalFormat; > > +#endif > > Would be better to initialize these data members here. Then we would not > need the conditional initialization lines in the constructor. But the UNumberFormat type would be unknown, and we would have to forward-declare it to allow using a pointer on it. Is it worth doing this? If so, I can resend a patch. 1167809 10 271958 darin 2016-02-24 09:40:01 -0800 Comment on attachment 271958 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=271958&action=review >>> Source/WebCore/platform/text/LocaleICU.h:86 >>> +#endif >> >> Would be better to initialize these data members here. Then we would not need the conditional initialization lines in the constructor. > > But the UNumberFormat type would be unknown, and we would have to forward-declare it to allow using a pointer on it. > > Is it worth doing this? > If so, I can resend a patch. We can initialize to null without any other changes: #if !UCONFIG_NO_FORMATTING UNumberFormat* m_numberFormat { nullptr }; bool m_didCreateDecimalFormat { false }; #endif I don’t know what you mean by “we would have to forward-declare it”. And yes, I do think it’s worth doing this so we can remove the four lines of code in the constructor that conditionally initialize these data members. 1168094 11 olivier.blin 2016-02-25 08:38:06 -0800 (In reply to comment #10) > Comment on attachment 271958 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=271958&action=review > > >>> Source/WebCore/platform/text/LocaleICU.h:86 > >>> +#endif > >> > >> Would be better to initialize these data members here. Then we would not need the conditional initialization lines in the constructor. > > > > But the UNumberFormat type would be unknown, and we would have to forward-declare it to allow using a pointer on it. > > > > Is it worth doing this? > > If so, I can resend a patch. > > We can initialize to null without any other changes: > > #if !UCONFIG_NO_FORMATTING > UNumberFormat* m_numberFormat { nullptr }; > bool m_didCreateDecimalFormat { false }; > #endif > > I don’t know what you mean by “we would have to forward-declare it”. Ok, looks good this way. Sorry, I misinterpreted your initial comment. > And yes, I do think it’s worth doing this so we can remove the four lines of > code in the constructor that conditionally initialize these data members. Then, I should do the same for the other LocalICU fields that have been made conditional in bug 154483, right? 1168106 12 darin 2016-02-25 09:14:08 -0800 (In reply to comment #11) > Then, I should do the same for the other LocalICU fields that have been made > conditional in bug 154483, right? It’s helpful to do this for all data members of pointer or scalar types with obvious, simple initial values such as nullptr, zero, and false, or even in some cases with slightly less obvious values in *all* classes and structs, everywhere in WebKit. Patches that do bits of that are always welcome. And, yes, especially helpful for data members inside conditionals. 1169090 13 olivier.blin 2016-02-29 01:46:14 -0800 (In reply to comment #12) > (In reply to comment #11) > > Then, I should do the same for the other LocalICU fields that have been made > > conditional in bug 154483, right? > > It’s helpful to do this for all data members of pointer or scalar types with > obvious, simple initial values such as nullptr, zero, and false, or even in > some cases with slightly less obvious values in *all* classes and structs, > everywhere in WebKit. Patches that do bits of that are always welcome. > > And, yes, especially helpful for data members inside conditionals. Done in bug 154731, thanks for your guidance Darin! 271831 2016-02-19 17:12:16 -0800 2016-02-22 14:53:55 -0800 Patch bug-154484-20160220021156.patch text/plain 3791 olivier.blin U3VidmVyc2lvbiBSZXZpc2lvbjogMTk2ODE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzYzMTZhYmQ1NTlmNzU2 NGUxZmE4YzVjOTQzNDVlNDQyMDg3ZTQ3YS4uYzg1OWUyNjZkNDc1YjYyNzZhYTA4OTUzZjU4MmZj NTQ5Y2FjZDcyZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIyIEBACiAyMDE2LTAyLTE5ICBPbGl2 aWVyIEJsaW4gIDxvbGl2aWVyLmJsaW5Ac29mdGF0aG9tZS5jb20+CiAKKyAgICAgICAgU3VwcG9y dCBidWlsZGluZyBMb2NhbGVJQ1Ugd2l0aCBsaWdodCBJQ1UgKFVDT05GSUdfTk9fRk9STUFUVElO RykKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1NDQ4 NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEluIHRo aXMgbW9kZSwgdGhpcyBtYWtlcyBMb2NhbGVJQ1Ugd2l0aCBVQ09ORklHX05PX0ZPUk1BVFRJTkcK KyAgICAgICAgZXNzZW50aWFsbHkgdGhlIHNhbWUgYXMgTG9jYWxlTm9uZSwgYnV0IGFsbG93cyB0 byBrZWVwIHVzaW5nIElDVSBmb3IKKyAgICAgICAgb3RoZXIgZmVhdHVyZXMuCisKKyAgICAgICAg KiBwbGF0Zm9ybS90ZXh0L0xvY2FsZUlDVS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMb2NhbGVJ Q1U6OkxvY2FsZUlDVSk6CisgICAgICAgIChXZWJDb3JlOjpMb2NhbGVJQ1U6On5Mb2NhbGVJQ1Up OgorICAgICAgICAoV2ViQ29yZTo6TG9jYWxlSUNVOjppbml0aWFsaXplTG9jYWxlRGF0YSk6Cisg ICAgICAgICogcGxhdGZvcm0vdGV4dC9Mb2NhbGVJQ1UuaDoKKworMjAxNi0wMi0xOSAgT2xpdmll ciBCbGluICA8b2xpdmllci5ibGluQHNvZnRhdGhvbWUuY29tPgorCiAgICAgICAgIERvIG5vdCBy ZXF1aXJlIFVEYXRlIGluIExvY2FsZUlDVSB3aXRoICFFTkFCTEVfREFURV9BTkRfVElNRV9JTlBV VF9UWVBFUwogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTU0NDgzCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvTG9jYWxl SUNVLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvTG9jYWxlSUNVLmNwcAppbmRl eCA4MWVlZGRjNTEzNDZlMzQ4MmM2YzEyMjA1NjZmNzk0YWViOGI0Mjk0Li5kZmE2ODhjYTNmNjZm MThiZjhkN2VjODBhN2NhNjljZGZmOWEwOTBiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS90ZXh0L0xvY2FsZUlDVS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v dGV4dC9Mb2NhbGVJQ1UuY3BwCkBAIC01MCw4ICs1MCwxMCBAQCBzdGQ6OnVuaXF1ZV9wdHI8TG9j YWxlPiBMb2NhbGU6OmNyZWF0ZShjb25zdCBBdG9taWNTdHJpbmcmIGxvY2FsZSkKIAogTG9jYWxl SUNVOjpMb2NhbGVJQ1UoY29uc3QgY2hhciogbG9jYWxlKQogICAgIDogbV9sb2NhbGUobG9jYWxl KQorI2lmICFVQ09ORklHX05PX0ZPUk1BVFRJTkcKICAgICAsIG1fbnVtYmVyRm9ybWF0KDApCiAg ICAgLCBtX2RpZENyZWF0ZURlY2ltYWxGb3JtYXQoZmFsc2UpCisjZW5kaWYKICNpZiBFTkFCTEUo REFURV9BTkRfVElNRV9JTlBVVF9UWVBFUykKICAgICAsIG1fc2hvcnREYXRlRm9ybWF0KDApCiAg ICAgLCBtX21lZGl1bVRpbWVGb3JtYXQoMCkKQEAgLTY0LDcgKzY2LDkgQEAgTG9jYWxlSUNVOjpM b2NhbGVJQ1UoY29uc3QgY2hhciogbG9jYWxlKQogCiBMb2NhbGVJQ1U6On5Mb2NhbGVJQ1UoKQog eworI2lmICFVQ09ORklHX05PX0ZPUk1BVFRJTkcKICAgICB1bnVtX2Nsb3NlKG1fbnVtYmVyRm9y bWF0KTsKKyNlbmRpZgogI2lmIEVOQUJMRShEQVRFX0FORF9USU1FX0lOUFVUX1RZUEVTKQogICAg IHVkYXRfY2xvc2UobV9zaG9ydERhdGVGb3JtYXQpOwogICAgIHVkYXRfY2xvc2UobV9tZWRpdW1U aW1lRm9ybWF0KTsKQEAgLTcyLDYgKzc2LDcgQEAgTG9jYWxlSUNVOjp+TG9jYWxlSUNVKCkKICNl bmRpZgogfQogCisjaWYgIVVDT05GSUdfTk9fRk9STUFUVElORwogU3RyaW5nIExvY2FsZUlDVTo6 ZGVjaW1hbFN5bWJvbChVTnVtYmVyRm9ybWF0U3ltYm9sIHN5bWJvbCkKIHsKICAgICBVRXJyb3JD b2RlIHN0YXR1cyA9IFVfWkVST19FUlJPUjsKQEAgLTEwMiw5ICsxMDcsMTEgQEAgU3RyaW5nIExv Y2FsZUlDVTo6ZGVjaW1hbFRleHRBdHRyaWJ1dGUoVU51bWJlckZvcm1hdFRleHRBdHRyaWJ1dGUg dGFnKQogICAgICAgICByZXR1cm4gU3RyaW5nKCk7CiAgICAgcmV0dXJuIFN0cmluZzo6YWRvcHQo YnVmZmVyKTsKIH0KKyNlbmRpZgogCiB2b2lkIExvY2FsZUlDVTo6aW5pdGlhbGl6ZUxvY2FsZURh dGEoKQogeworI2lmICFVQ09ORklHX05PX0ZPUk1BVFRJTkcKICAgICBpZiAobV9kaWRDcmVhdGVE ZWNpbWFsRm9ybWF0KQogICAgICAgICByZXR1cm47CiAgICAgbV9kaWRDcmVhdGVEZWNpbWFsRm9y bWF0ID0gdHJ1ZTsKQEAgLTEyOCw2ICsxMzUsNyBAQCB2b2lkIExvY2FsZUlDVTo6aW5pdGlhbGl6 ZUxvY2FsZURhdGEoKQogICAgIHN5bWJvbHMuYXBwZW5kKGRlY2ltYWxTeW1ib2woVU5VTV9HUk9V UElOR19TRVBBUkFUT1JfU1lNQk9MKSk7CiAgICAgQVNTRVJUKHN5bWJvbHMuc2l6ZSgpID09IERl Y2ltYWxTeW1ib2xzU2l6ZSk7CiAgICAgc2V0TG9jYWxlRGF0YShzeW1ib2xzLCBkZWNpbWFsVGV4 dEF0dHJpYnV0ZShVTlVNX1BPU0lUSVZFX1BSRUZJWCksIGRlY2ltYWxUZXh0QXR0cmlidXRlKFVO VU1fUE9TSVRJVkVfU1VGRklYKSwgZGVjaW1hbFRleHRBdHRyaWJ1dGUoVU5VTV9ORUdBVElWRV9Q UkVGSVgpLCBkZWNpbWFsVGV4dEF0dHJpYnV0ZShVTlVNX05FR0FUSVZFX1NVRkZJWCkpOworI2Vu ZGlmCiB9CiAKICNpZiBFTkFCTEUoREFURV9BTkRfVElNRV9JTlBVVF9UWVBFUykKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvTG9jYWxlSUNVLmggYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS90ZXh0L0xvY2FsZUlDVS5oCmluZGV4IDQ0YmIxODgwZjA0NjI4N2Y5MGMy ODkwOWRiNjU4ZDM4M2U4N2Y2MzAuLmFjZWYxNTI5OTQ0NTM2MTg1MWJkNjQ0NWI5YWM0OWRhNzFk OTJlNjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvTG9jYWxlSUNV LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vdGV4dC9Mb2NhbGVJQ1UuaApAQCAtNjQs OCArNjQsMTAgQEAgcHVibGljOgogI2VuZGlmCiAKIHByaXZhdGU6CisjaWYgIVVDT05GSUdfTk9f Rk9STUFUVElORwogICAgIFN0cmluZyBkZWNpbWFsU3ltYm9sKFVOdW1iZXJGb3JtYXRTeW1ib2wp OwogICAgIFN0cmluZyBkZWNpbWFsVGV4dEF0dHJpYnV0ZShVTnVtYmVyRm9ybWF0VGV4dEF0dHJp YnV0ZSk7CisjZW5kaWYKICAgICB2aXJ0dWFsIHZvaWQgaW5pdGlhbGl6ZUxvY2FsZURhdGEoKSBv dmVycmlkZTsKIAogI2lmIEVOQUJMRShEQVRFX0FORF9USU1FX0lOUFVUX1RZUEVTKQpAQCAtNzcs OCArNzksMTEgQEAgcHJpdmF0ZToKICNlbmRpZgogCiAgICAgQ1N0cmluZyBtX2xvY2FsZTsKKwor I2lmICFVQ09ORklHX05PX0ZPUk1BVFRJTkcKICAgICBVTnVtYmVyRm9ybWF0KiBtX251bWJlckZv cm1hdDsKICAgICBib29sIG1fZGlkQ3JlYXRlRGVjaW1hbEZvcm1hdDsKKyNlbmRpZgogCiAjaWYg RU5BQkxFKERBVEVfQU5EX1RJTUVfSU5QVVRfVFlQRVMpCiAgICAgc3RkOjp1bmlxdWVfcHRyPFZl Y3RvcjxTdHJpbmc+PiBtX21vbnRoTGFiZWxzOwo= 271958 2016-02-22 14:54:03 -0800 2016-02-23 23:20:25 -0800 Patch bug-154484-20160222235344.patch text/plain 3791 olivier.blin U3VidmVyc2lvbiBSZXZpc2lvbjogMTk2ODE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzYzMTZhYmQ1NTlmNzU2 NGUxZmE4YzVjOTQzNDVlNDQyMDg3ZTQ3YS4uYzg1OWUyNjZkNDc1YjYyNzZhYTA4OTUzZjU4MmZj NTQ5Y2FjZDcyZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIyIEBACiAyMDE2LTAyLTE5ICBPbGl2 aWVyIEJsaW4gIDxvbGl2aWVyLmJsaW5Ac29mdGF0aG9tZS5jb20+CiAKKyAgICAgICAgU3VwcG9y dCBidWlsZGluZyBMb2NhbGVJQ1Ugd2l0aCBsaWdodCBJQ1UgKFVDT05GSUdfTk9fRk9STUFUVElO RykKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1NDQ4 NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEluIHRo aXMgbW9kZSwgdGhpcyBtYWtlcyBMb2NhbGVJQ1Ugd2l0aCBVQ09ORklHX05PX0ZPUk1BVFRJTkcK KyAgICAgICAgZXNzZW50aWFsbHkgdGhlIHNhbWUgYXMgTG9jYWxlTm9uZSwgYnV0IGFsbG93cyB0 byBrZWVwIHVzaW5nIElDVSBmb3IKKyAgICAgICAgb3RoZXIgZmVhdHVyZXMuCisKKyAgICAgICAg KiBwbGF0Zm9ybS90ZXh0L0xvY2FsZUlDVS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMb2NhbGVJ Q1U6OkxvY2FsZUlDVSk6CisgICAgICAgIChXZWJDb3JlOjpMb2NhbGVJQ1U6On5Mb2NhbGVJQ1Up OgorICAgICAgICAoV2ViQ29yZTo6TG9jYWxlSUNVOjppbml0aWFsaXplTG9jYWxlRGF0YSk6Cisg ICAgICAgICogcGxhdGZvcm0vdGV4dC9Mb2NhbGVJQ1UuaDoKKworMjAxNi0wMi0xOSAgT2xpdmll ciBCbGluICA8b2xpdmllci5ibGluQHNvZnRhdGhvbWUuY29tPgorCiAgICAgICAgIERvIG5vdCBy ZXF1aXJlIFVEYXRlIGluIExvY2FsZUlDVSB3aXRoICFFTkFCTEVfREFURV9BTkRfVElNRV9JTlBV VF9UWVBFUwogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTU0NDgzCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvTG9jYWxl SUNVLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvTG9jYWxlSUNVLmNwcAppbmRl eCA4MWVlZGRjNTEzNDZlMzQ4MmM2YzEyMjA1NjZmNzk0YWViOGI0Mjk0Li5kZmE2ODhjYTNmNjZm MThiZjhkN2VjODBhN2NhNjljZGZmOWEwOTBiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS90ZXh0L0xvY2FsZUlDVS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v dGV4dC9Mb2NhbGVJQ1UuY3BwCkBAIC01MCw4ICs1MCwxMCBAQCBzdGQ6OnVuaXF1ZV9wdHI8TG9j YWxlPiBMb2NhbGU6OmNyZWF0ZShjb25zdCBBdG9taWNTdHJpbmcmIGxvY2FsZSkKIAogTG9jYWxl SUNVOjpMb2NhbGVJQ1UoY29uc3QgY2hhciogbG9jYWxlKQogICAgIDogbV9sb2NhbGUobG9jYWxl KQorI2lmICFVQ09ORklHX05PX0ZPUk1BVFRJTkcKICAgICAsIG1fbnVtYmVyRm9ybWF0KDApCiAg ICAgLCBtX2RpZENyZWF0ZURlY2ltYWxGb3JtYXQoZmFsc2UpCisjZW5kaWYKICNpZiBFTkFCTEUo REFURV9BTkRfVElNRV9JTlBVVF9UWVBFUykKICAgICAsIG1fc2hvcnREYXRlRm9ybWF0KDApCiAg ICAgLCBtX21lZGl1bVRpbWVGb3JtYXQoMCkKQEAgLTY0LDcgKzY2LDkgQEAgTG9jYWxlSUNVOjpM b2NhbGVJQ1UoY29uc3QgY2hhciogbG9jYWxlKQogCiBMb2NhbGVJQ1U6On5Mb2NhbGVJQ1UoKQog eworI2lmICFVQ09ORklHX05PX0ZPUk1BVFRJTkcKICAgICB1bnVtX2Nsb3NlKG1fbnVtYmVyRm9y bWF0KTsKKyNlbmRpZgogI2lmIEVOQUJMRShEQVRFX0FORF9USU1FX0lOUFVUX1RZUEVTKQogICAg IHVkYXRfY2xvc2UobV9zaG9ydERhdGVGb3JtYXQpOwogICAgIHVkYXRfY2xvc2UobV9tZWRpdW1U aW1lRm9ybWF0KTsKQEAgLTcyLDYgKzc2LDcgQEAgTG9jYWxlSUNVOjp+TG9jYWxlSUNVKCkKICNl bmRpZgogfQogCisjaWYgIVVDT05GSUdfTk9fRk9STUFUVElORwogU3RyaW5nIExvY2FsZUlDVTo6 ZGVjaW1hbFN5bWJvbChVTnVtYmVyRm9ybWF0U3ltYm9sIHN5bWJvbCkKIHsKICAgICBVRXJyb3JD b2RlIHN0YXR1cyA9IFVfWkVST19FUlJPUjsKQEAgLTEwMiw5ICsxMDcsMTEgQEAgU3RyaW5nIExv Y2FsZUlDVTo6ZGVjaW1hbFRleHRBdHRyaWJ1dGUoVU51bWJlckZvcm1hdFRleHRBdHRyaWJ1dGUg dGFnKQogICAgICAgICByZXR1cm4gU3RyaW5nKCk7CiAgICAgcmV0dXJuIFN0cmluZzo6YWRvcHQo YnVmZmVyKTsKIH0KKyNlbmRpZgogCiB2b2lkIExvY2FsZUlDVTo6aW5pdGlhbGl6ZUxvY2FsZURh dGEoKQogeworI2lmICFVQ09ORklHX05PX0ZPUk1BVFRJTkcKICAgICBpZiAobV9kaWRDcmVhdGVE ZWNpbWFsRm9ybWF0KQogICAgICAgICByZXR1cm47CiAgICAgbV9kaWRDcmVhdGVEZWNpbWFsRm9y bWF0ID0gdHJ1ZTsKQEAgLTEyOCw2ICsxMzUsNyBAQCB2b2lkIExvY2FsZUlDVTo6aW5pdGlhbGl6 ZUxvY2FsZURhdGEoKQogICAgIHN5bWJvbHMuYXBwZW5kKGRlY2ltYWxTeW1ib2woVU5VTV9HUk9V UElOR19TRVBBUkFUT1JfU1lNQk9MKSk7CiAgICAgQVNTRVJUKHN5bWJvbHMuc2l6ZSgpID09IERl Y2ltYWxTeW1ib2xzU2l6ZSk7CiAgICAgc2V0TG9jYWxlRGF0YShzeW1ib2xzLCBkZWNpbWFsVGV4 dEF0dHJpYnV0ZShVTlVNX1BPU0lUSVZFX1BSRUZJWCksIGRlY2ltYWxUZXh0QXR0cmlidXRlKFVO VU1fUE9TSVRJVkVfU1VGRklYKSwgZGVjaW1hbFRleHRBdHRyaWJ1dGUoVU5VTV9ORUdBVElWRV9Q UkVGSVgpLCBkZWNpbWFsVGV4dEF0dHJpYnV0ZShVTlVNX05FR0FUSVZFX1NVRkZJWCkpOworI2Vu ZGlmCiB9CiAKICNpZiBFTkFCTEUoREFURV9BTkRfVElNRV9JTlBVVF9UWVBFUykKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvTG9jYWxlSUNVLmggYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS90ZXh0L0xvY2FsZUlDVS5oCmluZGV4IDQ0YmIxODgwZjA0NjI4N2Y5MGMy ODkwOWRiNjU4ZDM4M2U4N2Y2MzAuLmFjZWYxNTI5OTQ0NTM2MTg1MWJkNjQ0NWI5YWM0OWRhNzFk OTJlNjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvTG9jYWxlSUNV LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vdGV4dC9Mb2NhbGVJQ1UuaApAQCAtNjQs OCArNjQsMTAgQEAgcHVibGljOgogI2VuZGlmCiAKIHByaXZhdGU6CisjaWYgIVVDT05GSUdfTk9f Rk9STUFUVElORwogICAgIFN0cmluZyBkZWNpbWFsU3ltYm9sKFVOdW1iZXJGb3JtYXRTeW1ib2wp OwogICAgIFN0cmluZyBkZWNpbWFsVGV4dEF0dHJpYnV0ZShVTnVtYmVyRm9ybWF0VGV4dEF0dHJp YnV0ZSk7CisjZW5kaWYKICAgICB2aXJ0dWFsIHZvaWQgaW5pdGlhbGl6ZUxvY2FsZURhdGEoKSBv dmVycmlkZTsKIAogI2lmIEVOQUJMRShEQVRFX0FORF9USU1FX0lOUFVUX1RZUEVTKQpAQCAtNzcs OCArNzksMTEgQEAgcHJpdmF0ZToKICNlbmRpZgogCiAgICAgQ1N0cmluZyBtX2xvY2FsZTsKKwor I2lmICFVQ09ORklHX05PX0ZPUk1BVFRJTkcKICAgICBVTnVtYmVyRm9ybWF0KiBtX251bWJlckZv cm1hdDsKICAgICBib29sIG1fZGlkQ3JlYXRlRGVjaW1hbEZvcm1hdDsKKyNlbmRpZgogCiAjaWYg RU5BQkxFKERBVEVfQU5EX1RJTUVfSU5QVVRfVFlQRVMpCiAgICAgc3RkOjp1bmlxdWVfcHRyPFZl Y3RvcjxTdHJpbmc+PiBtX21vbnRoTGFiZWxzOwo=