228876 2021-08-06 14:33:20 -0700 Fix ODR violations in JSC 2021-11-11 11:31:31 -0800 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build PC Linux RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=229867 InRadar P2 Normal --- 1 mcatanzaro mcatanzaro ews-watchlist keith_miller mark.lam mcatanzaro msaboff saam tzagallo webkit-bug-importer ysuzuki oldest_to_newest 1782570 0 mcatanzaro 2021-08-06 14:33:20 -0700 When built with LTO enabled, GCC will warn about violations of C++'s one-definition rule. JSC currently has two violations. The first is JSC::SpeciesConstructResult, which has two different declarations: runtime/ArrayPrototype.cpp:enum class SpeciesConstructResult { runtime/JSArrayBufferPrototype.cpp:enum class SpeciesConstructResult : uint8_t { There are usually several different ways to fix any particular ODR violation, starting with renaming one or the other use. I decided to add : uint8_t to the version in ArrayPrototype.cpp to make the declarations match. I could alternatively have placed them in anonymous namespaces to restrict them to file scope. The next problem is JSC::SignalContext. We have two different versions of this struct, one in VMTraps.cpp and the other in SigillCrashAnalyzer.cpp. In this case, I decided the simplest approach would be to change the one in VMTraps.cpp from JSC::SignalContext to JSC::VMTraps::SignalContext. 1782571 1 435090 mcatanzaro 2021-08-06 14:36:54 -0700 Created attachment 435090 Patch 1782735 2 435090 ysuzuki 2021-08-07 15:13:23 -0700 Comment on attachment 435090 Patch r=me 1782736 3 ews-feeder 2021-08-07 15:40:32 -0700 Committed r280761 (240346@main): <https://commits.webkit.org/240346@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 435090. 1782737 4 webkit-bug-importer 2021-08-07 15:41:17 -0700 <rdar://problem/81658888> 435090 2021-08-06 14:36:54 -0700 2021-08-07 15:40:33 -0700 Patch bug-228876-20210806163653.patch text/plain 3858 mcatanzaro U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwNzI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAw NmIyMWUzNTE4MDM3NDFiYTkzZmIyYzEzYWNjZTliNWNhMDdlZGNmLi5kODU0MjhhN2I2Y2M1MTVk MzU0MjFmMzUwYjMyZmQ4NGY4MjUzMWViIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNSBAQAorMjAyMS0wOC0wNiAgTWljaGFlbCBDYXRhbnphcm8gIDxtY2F0YW56YXJvQGdu b21lLm9yZz4KKworICAgICAgICBGaXggT0RSIHZpb2xhdGlvbnMgaW4gSlNDCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjg4NzYKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXaGVuIGJ1aWx0IHdpdGggTFRP IGVuYWJsZWQsIEdDQyB3aWxsIHdhcm4gYWJvdXQgdmlvbGF0aW9ucyBvZiBDKysncyBvbmUtZGVm aW5pdGlvbiBydWxlLgorICAgICAgICBKU0MgY3VycmVudGx5IGhhcyB0d28gdmlvbGF0aW9ucy4g VGhlIGZpcnN0IGlzIEpTQzo6U3BlY2llc0NvbnN0cnVjdFJlc3VsdCwgd2hpY2ggaGFzIHR3bwor ICAgICAgICBkaWZmZXJlbnQgZGVjbGFyYXRpb25zLCBvbmUgaW4gQXJyYXlQcm90b3R5cGUuY3Bw IGFuZCB0aGUgb3RoZXIgaW4KKyAgICAgICAgSlNBcnJheUJ1ZmZlclByb3RvdHlwZS5jcHAuIEkg ZGVjaWRlZCB0byBjaGFuZ2UgdGhlIHZlcnNpb24gaW4gQXJyYXlQcm90b3R5cGUuY3BwIHRvIG1h a2UKKyAgICAgICAgdGhlIGRlY2xhcmF0aW9ucyBtYXRjaC4KKworICAgICAgICBUaGUgbmV4dCBw cm9ibGVtIGlzIEpTQzo6U2lnbmFsQ29udGV4dC4gV2UgaGF2ZSB0d28gZGlmZmVyZW50IHZlcnNp b25zIG9mIHRoaXMgc3RydWN0LCBvbmUKKyAgICAgICAgaW4gVk1UcmFwcy5jcHAgYW5kIHRoZSBv dGhlciBpbiBTaWdpbGxDcmFzaEFuYWx5emVyLmNwcC4gSW4gdGhpcyBjYXNlLCBJIGRlY2lkZWQg dG8gY2hhbmdlCisgICAgICAgIHRoZSBvbmUgaW4gVk1UcmFwcy5jcHAgZnJvbSBKU0M6OlNpZ25h bENvbnRleHQgdG8gSlNDOjpWTVRyYXBzOjpTaWduYWxDb250ZXh0LgorCisgICAgICAgICogcnVu dGltZS9BcnJheVByb3RvdHlwZS5jcHA6CisgICAgICAgICogcnVudGltZS9WTVRyYXBzLmNwcDoK KyAgICAgICAgKEpTQzo6Vk1UcmFwczo6dHJ5SW5zdGFsbFRyYXBCcmVha3BvaW50cyk6CisgICAg ICAgICogcnVudGltZS9WTVRyYXBzLmg6CisKIDIwMjEtMDgtMDUgIE1pa2hhaWwgUi4gR2FkZWxo YSAgPG1pa2hhaWxAaWdhbGlhLmNvbT4KIAogICAgICAgICBBc3NlcnRpb24gZmFpbHVyZSB3aGVu IGNoZWNraW5nIGFycmF5IGluIERGRyAoMzIgYml0cykKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9ydW50aW1lL0FycmF5UHJvdG90eXBlLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9ydW50aW1lL0FycmF5UHJvdG90eXBlLmNwcAppbmRleCBiM2U0MzllMmRkNGJlNzkyNzBi NWQxNWRjNDE0YmI2MDMyNmY2NGQwLi5iNTI1YzViMTMwZTdmMGI2MGM3YjgzYmQyMjZhZmNhOGE1 MjA0YmYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9BcnJheVBy b3RvdHlwZS5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvQXJyYXlQcm90 b3R5cGUuY3BwCkBAIC0xOTgsNyArMTk4LDcgQEAgc3RhdGljIEFMV0FZU19JTkxJTkUgYm9vbCBz cGVjaWVzV2F0Y2hwb2ludElzVmFsaWQoVk0mIHZtLCBKU09iamVjdCogdGhpc09iamVjdCkKICAg ICAgICAgJiYgZ2xvYmFsT2JqZWN0LT5hcnJheVNwZWNpZXNXYXRjaHBvaW50U2V0KCkuc3RhdGVP bkpTVGhyZWFkKCkgPT0gSXNXYXRjaGVkOwogfQogCi1lbnVtIGNsYXNzIFNwZWNpZXNDb25zdHJ1 Y3RSZXN1bHQgeworZW51bSBjbGFzcyBTcGVjaWVzQ29uc3RydWN0UmVzdWx0IDogdWludDhfdCB7 CiAgICAgRmFzdFBhdGgsCiAgICAgRXhjZXB0aW9uLAogICAgIENyZWF0ZWRPYmplY3QKZGlmZiAt LWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1ZNVHJhcHMuY3BwIGIvU291cmNl L0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvVk1UcmFwcy5jcHAKaW5kZXggOWZlZGM1MWE2ZDZjZTEx YWNjOGFlODc0YWVlNWFhMTgyMzRiZmJkYS4uNGNkMTk1MzY3NmRjYzdkYWMwNjJjM2VkYTMyMDBj NzFkM2NhNDUyZSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvVk1U cmFwcy5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvVk1UcmFwcy5jcHAK QEAgLTQ3LDcgKzQ3LDcgQEAgbmFtZXNwYWNlIEpTQyB7CiAKICNpZiBFTkFCTEUoU0lHTkFMX0JB U0VEX1ZNX1RSQVBTKQogCi1zdHJ1Y3QgU2lnbmFsQ29udGV4dCB7CitzdHJ1Y3QgVk1UcmFwczo6 U2lnbmFsQ29udGV4dCB7CiBwcml2YXRlOgogICAgIFNpZ25hbENvbnRleHQoUGxhdGZvcm1SZWdp c3RlcnMmIHJlZ2lzdGVycywgTWFjcm9Bc3NlbWJsZXJDb2RlUHRyPFBsYXRmb3JtUmVnaXN0ZXJz UENQdHJUYWc+IHRyYXBQQykKICAgICAgICAgOiByZWdpc3RlcnMocmVnaXN0ZXJzKQpAQCAtODQs OCArODQsOCBAQCBzdGF0aWMgYm9vbCBpc1NhbmVGcmFtZShDYWxsRnJhbWUqIGZyYW1lLCBDYWxs RnJhbWUqIGNhbGxlZUZyYW1lLCBFbnRyeUZyYW1lKiBlbgogICAgICAgICByZXR1cm4gZmFsc2U7 CiAgICAgcmV0dXJuIHN0YWNrQm91bmRzLmNvbnRhaW5zKGZyYW1lKTsKIH0KLSAgICAKLXZvaWQg Vk1UcmFwczo6dHJ5SW5zdGFsbFRyYXBCcmVha3BvaW50cyhTaWduYWxDb250ZXh0JiBjb250ZXh0 LCBTdGFja0JvdW5kcyBzdGFja0JvdW5kcykKKwordm9pZCBWTVRyYXBzOjp0cnlJbnN0YWxsVHJh cEJyZWFrcG9pbnRzKFZNVHJhcHM6OlNpZ25hbENvbnRleHQmIGNvbnRleHQsIFN0YWNrQm91bmRz IHN0YWNrQm91bmRzKQogewogICAgIC8vIFRoaXMgbXVzdCBiZSB0aGUgaW5pdGlhbCBzaWduYWwg dG8gZ2V0IHRoZSBtdXRhdG9yIHRocmVhZCdzIGF0dGVudGlvbi4KICAgICAvLyBMZXQncyBnZXQg dGhlIHRocmVhZCB0byBicmVhayBhdCBpbnZhbGlkYXRpb24gcG9pbnRzIGlmIG5lZWRlZC4KZGlm ZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1ZNVHJhcHMuaCBiL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1ZNVHJhcHMuaAppbmRleCAwYWY1OWJjOTVjMTZmOTJk MzRlNTRhNjIyYjI0MmI4N2M1ODRmZDY1Li44YTdmMjgwMjNjN2QxYjM3NjdmMGU3OTEwMDZiOGQw MjBhNjU3NmVkIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9WTVRy YXBzLmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvVk1UcmFwcy5oCkBAIC0y MjEsNyArMjIxLDEwIEBAIHB1YmxpYzoKICAgICBKU19FWFBPUlRfUFJJVkFURSB2b2lkIGZpcmVU cmFwKEV2ZW50KTsKICAgICB2b2lkIGhhbmRsZVRyYXBzKEJpdEZpZWxkIG1hc2sgPSBBc3luY0V2 ZW50cyk7CiAKLSAgICB2b2lkIHRyeUluc3RhbGxUcmFwQnJlYWtwb2ludHMoc3RydWN0IFNpZ25h bENvbnRleHQmLCBTdGFja0JvdW5kcyk7CisjaWYgRU5BQkxFKFNJR05BTF9CQVNFRF9WTV9UUkFQ UykKKyAgICBzdHJ1Y3QgU2lnbmFsQ29udGV4dDsKKyAgICB2b2lkIHRyeUluc3RhbGxUcmFwQnJl YWtwb2ludHMoc3RydWN0IFZNVHJhcHM6OlNpZ25hbENvbnRleHQmLCBTdGFja0JvdW5kcyk7Cisj ZW5kaWYKIAogcHJpdmF0ZToKICAgICBWTSYgdm0oKSBjb25zdDsK