238384 2022-03-25 10:30:17 -0700 [Big Sur] WK2 failing to build with `error: reference to 'WebDocumentView' is ambiguous` 2022-03-25 21:46:58 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=238213 InRadar P2 Normal --- 1 emw emw ap webkit-bug-importer oldest_to_newest 1855153 0 emw 2022-03-25 10:30:17 -0700 Since r291809, it's possible to import the same header from two different paths: once from its original source location and once from the SDK or build products, causing build failures due to duplicate types. This is because of WebKit's autogenerated headermap. It resolves migrated headers to the source locations IF they are imported through the <WebKit/…> prefix. If they are imported from <WebKitLegacy/…>, the headermap has no entry and they are resolved using normal search paths. Prior to r291809, migrated headers were never added to any headermaps, because they were produced by Make and Xcode was unaware of them. 1855154 1 webkit-bug-importer 2022-03-25 10:31:01 -0700 <rdar://problem/90844690> 1855167 2 455783 emw 2022-03-25 10:48:04 -0700 Created attachment 455783 Patch 1855168 3 455783 emw 2022-03-25 10:51:19 -0700 Comment on attachment 455783 Patch Since the build rule script changes are hard to read, here they are expanded: +set -e if [ "${WK_PLATFORM_NAME}" != macosx ]; then echo "#import <WebKitLegacy/${INPUT_FILE_NAME}>" > "${SCRIPT_OUTPUT_FILE_0}" else "${SCRIPT_INPUT_FILE_0}" fi +echo "#import <WebKit/${INPUT_FILE_NAME}>" > "${SCRIPT_OUTPUT_FILE_1}" +echo "#import <WebKit/${INPUT_FILE_NAME}>" > "${SCRIPT_OUTPUT_FILE_2}" There are now two build rules, because any source file migrated from WebCore need special treatment. Since they've been migrated twice, they have two valid imports, <WebCore/foo> and <WebKitLegacy/foo>, that should be forwarded to <WebKit/foo>. 1855275 4 ews-feeder 2022-03-25 15:56:24 -0700 Committed r291900 (248893@main): <https://commits.webkit.org/248893@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 455783. 455783 2022-03-25 10:48:04 -0700 2022-03-25 15:56:26 -0700 Patch bug-238384-20220325104804.patch text/plain 6017 emw U3VidmVyc2lvbiBSZXZpc2lvbjogMjkxODE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDZkZTFiMTMyYmNiOTVjYjJi M2M5ODE2NDEwNzZmZTUwOThjZjU0ZDQuLmZhZjk1MDEzMmFiYjU1NmRiMDU0NTA1MmIxZWU5YjZi Y2FiOGM0NTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMjItMDMtMjUgIEVsbGlvdHQg V2lsbGlhbXMgIDxlbXdAYXBwbGUuY29tPgorCisgICAgICAgIFtCaWcgU3VyXSBXSzIgZmFpbGlu ZyB0byBidWlsZCB3aXRoIGBlcnJvcjogcmVmZXJlbmNlIHRvICdXZWJEb2N1bWVudFZpZXcnIGlz IGFtYmlndW91c2AKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTIzODM4NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIEJ1aWxkIGZpeCwgc2VlIHJkYXI6Ly85MDg0NDY5MC4KKworICAgICAgICBDcmVhdGUgZm9y d2FyZGluZyBoZWFkZXJzIGluIFdlYktpdCdzIHRlbXBvcmFyeSBkaXJlY3Rvcnkgd2hpY2ggY2F1 c2UgaW1wb3J0cyBvZiBhbnkKKyAgICAgICAgbWlncmF0ZWQgaGVhZGVyIHRvIGJlIGltcG9ydGVk IHVzaW5nIFdlYktpdCdzIGhlYWRlciBtYXAuIEZvciBleGFtcGxlLAorCisgICAgICAgICAgICAj aW1wb3J0IDxXZWJLaXQvV2ViRG9jdW1lbnQuaD4KKyAgICAgICAgICAgICNpbXBvcnQgPFdlYktp dExlZ2FjeS9XZWJEb2N1bWVudC5oPgorCisgICAgICAgIC4uLmJvdGggcmVzb2x2ZSB0byB0aGUg c2FtZSBoZWFkZXIuCisKKyAgICAgICAgQWxzbywgY2xlYW4gdXAgcHJvamVjdCBmaWxlIHJlZmVy ZW5jZXMgdG8gZmlsZXMgd2hpY2ggd2VyZSBkZWxldGVkIGluIHIyOTE4MDkuCisKKyAgICAgICAg KiBXZWJLaXQueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvajoKKwogMjAyMi0wMy0yNCAgTWljaGFl bCBTYWJvZmYgIDxtc2Fib2ZmQGFwcGxlLmNvbT4KIAogICAgICAgICBVcGRhdGUgU2FuZGJveCBw cm9maWxlcyBmb3Igc3lzdGVtIGNvbnRlbnQgcGF0aApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9XZWJLaXQueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvaiBiL1NvdXJjZS9XZWJLaXQvV2ViS2l0 Lnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKaW5kZXggYmQzNzVjNzQzMmVjM2FkOWNhM2JiZmVm MjU0YTZmNWEyMjg3YTNlMy4uZmFmZDJmMmMxMTllNDEyNGM2MzdlOTEzY2QyNGRlMzE0NWY2NjZm MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJLaXQueGNvZGVwcm9qL3Byb2plY3QucGJ4 cHJvagorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYktpdC54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9q CkBAIC0yMzc3LDE4ICsyMzc3LDM3IEBACiAJCUREQTBBMzg0MjdFNTYyMTMwMDVFMDg2RSAvKiBQ QlhCdWlsZFJ1bGUgKi8gPSB7CiAJCQlpc2EgPSBQQlhCdWlsZFJ1bGU7CiAJCQljb21waWxlclNw ZWMgPSBjb20uYXBwbGUuY29tcGlsZXJzLnByb3h5LnNjcmlwdDsKLQkJCWZpbGVQYXR0ZXJucyA9 ICIqL1dlYktpdExlZ2FjeS8qLmggKi9XZWJDb3JlLyouaCI7CisJCQlmaWxlUGF0dGVybnMgPSAi Ki9XZWJLaXRMZWdhY3kvKi5oIjsKIAkJCWZpbGVUeXBlID0gcGF0dGVybi5wcm94eTsKIAkJCWlu cHV0RmlsZXMgPSAoCiAJCQkJIiQoU1JDUk9PVCkvU2NyaXB0cy9wb3N0cHJvY2Vzcy1oZWFkZXIt cnVsZSIsCiAJCQkpOwogCQkJaXNFZGl0YWJsZSA9IDE7Ci0JCQluYW1lID0gIk1pZ3JhdGUgSGVh ZGVycyBmcm9tIFdlYkNvcmUgYW5kIFdlYktpdExlZ2FjeSI7CisJCQluYW1lID0gIk1pZ3JhdGUg SGVhZGVycyBmcm9tIFdlYktpdExlZ2FjeSI7CiAJCQlvdXRwdXRGaWxlcyA9ICgKIAkJCQkiJChX S19NSUdSQVRFRF9IRUFERVJfT1VUUFVUX0RJUikvJChJTlBVVF9GSUxFX05BTUUpIiwKKwkJCQki JChERVJJVkVEX0ZJTEVfRElSKS9XZWJLaXRMZWdhY3kvJChJTlBVVF9GSUxFX05BTUUpIiwKIAkJ CSk7CiAJCQlydW5PbmNlUGVyQXJjaGl0ZWN0dXJlID0gMDsKLQkJCXNjcmlwdCA9ICJpZiBbIFwi JHtXS19QTEFURk9STV9OQU1FfVwiICE9IG1hY29zeCBdOyB0aGVuXG4gICAgZWNobyBcIiNpbXBv cnQgPFdlYktpdExlZ2FjeS8ke0lOUFVUX0ZJTEVfTkFNRX0+XCIgPiBcIiR7U0NSSVBUX09VVFBV VF9GSUxFXzB9XCJcbmVsc2VcbiAgICBcIiR7U0NSSVBUX0lOUFVUX0ZJTEVfMH1cIlxuZmlcbiI7 CisJCQlzY3JpcHQgPSAic2V0IC1lXG5pZiBbIFwiJHtXS19QTEFURk9STV9OQU1FfVwiICE9IG1h Y29zeCBdOyB0aGVuXG4gICAgZWNobyBcIiNpbXBvcnQgPFdlYktpdExlZ2FjeS8ke0lOUFVUX0ZJ TEVfTkFNRX0+XCIgPiBcIiR7U0NSSVBUX09VVFBVVF9GSUxFXzB9XCJcbmVsc2VcbiAgICBcIiR7 U0NSSVBUX0lOUFVUX0ZJTEVfMH1cIlxuZmlcbmVjaG8gXCIjaW1wb3J0IDxXZWJLaXQvJHtJTlBV VF9GSUxFX05BTUV9PlwiID4gXCIke1NDUklQVF9PVVRQVVRfRklMRV8xfVwiXG4iOworCQl9Owor CQlEREY3NEM3ODI3RUUyMEM5MDAxMUY2MzMgLyogUEJYQnVpbGRSdWxlICovID0geworCQkJaXNh ID0gUEJYQnVpbGRSdWxlOworCQkJY29tcGlsZXJTcGVjID0gY29tLmFwcGxlLmNvbXBpbGVycy5w cm94eS5zY3JpcHQ7CisJCQlmaWxlUGF0dGVybnMgPSAiKi9XZWJDb3JlLyouaCI7CisJCQlmaWxl VHlwZSA9IHBhdHRlcm4ucHJveHk7CisJCQlpbnB1dEZpbGVzID0gKAorCQkJCSIkKFNSQ1JPT1Qp L1NjcmlwdHMvcG9zdHByb2Nlc3MtaGVhZGVyLXJ1bGUiLAorCQkJKTsKKwkJCWlzRWRpdGFibGUg PSAxOworCQkJbmFtZSA9ICJNaWdyYXRlIEhlYWRlcnMgZnJvbSBXZWJDb3JlIjsKKwkJCW91dHB1 dEZpbGVzID0gKAorCQkJCSIkKFdLX01JR1JBVEVEX0hFQURFUl9PVVRQVVRfRElSKS8kKElOUFVU X0ZJTEVfTkFNRSkiLAorCQkJCSIkKERFUklWRURfRklMRV9ESVIpL1dlYktpdExlZ2FjeS8kKElO UFVUX0ZJTEVfTkFNRSkiLAorCQkJCSIkKERFUklWRURfRklMRV9ESVIpL1dlYkNvcmUvJChJTlBV VF9GSUxFX05BTUUpIiwKKwkJCSk7CisJCQlydW5PbmNlUGVyQXJjaGl0ZWN0dXJlID0gMDsKKwkJ CXNjcmlwdCA9ICJzZXQgLWVcbmlmIFsgXCIke1dLX1BMQVRGT1JNX05BTUV9XCIgIT0gbWFjb3N4 IF07IHRoZW5cbiAgICBlY2hvIFwiI2ltcG9ydCA8V2ViS2l0TGVnYWN5LyR7SU5QVVRfRklMRV9O QU1FfT5cIiA+IFwiJHtTQ1JJUFRfT1VUUFVUX0ZJTEVfMH1cIlxuZWxzZVxuICAgIFwiJHtTQ1JJ UFRfSU5QVVRfRklMRV8wfVwiXG5maVxuZWNobyBcIiNpbXBvcnQgPFdlYktpdC8ke0lOUFVUX0ZJ TEVfTkFNRX0+XCIgPiBcIiR7U0NSSVBUX09VVFBVVF9GSUxFXzF9XCJcbmVjaG8gXCIjaW1wb3J0 IDxXZWJLaXQvJHtJTlBVVF9GSUxFX05BTUV9PlwiID4gXCIke1NDUklQVF9PVVRQVVRfRklMRV8y fVwiXG4iOwogCQl9OwogLyogRW5kIFBCWEJ1aWxkUnVsZSBzZWN0aW9uICovCiAKQEAgLTI5ODUs OCArMzAwNCw2IEBACiAJCTFBMUIwRUIzMThBNDI0OTUwMDM4NDgxQSAvKiBXS05hdmlnYXRpb25S ZXNwb25zZS5tbSAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0 OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLm9iamNwcDsgcGF0aCA9IFdLTmF2 aWdhdGlvblJlc3BvbnNlLm1tOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQkxQTFCMEVC NDE4QTQyNDk1MDAzODQ4MUEgLyogV0tOYXZpZ2F0aW9uUmVzcG9uc2UuaCAqLyA9IHtpc2EgPSBQ QlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNv dXJjZWNvZGUuYy5oOyBwYXRoID0gV0tOYXZpZ2F0aW9uUmVzcG9uc2UuaDsgc291cmNlVHJlZSA9 ICI8Z3JvdXA+IjsgfTsKIAkJMUExQjBFQjcxOEE0MjRDRDAwMzg0ODFBIC8qIFdLTmF2aWdhdGlv blJlc3BvbnNlSW50ZXJuYWwuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5j b2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gV0tO YXZpZ2F0aW9uUmVzcG9uc2VJbnRlcm5hbC5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9Owot CQkxQTFEMjExNjE5MUQ5OTVDMDAwMTYxOUYgLyogcG9zdHByb2Nlc3MtZnJhbWV3b3JrLWhlYWRl cnMuc2ggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgbGFzdEtub3duRmlsZVR5cGUgPSB0 ZXh0LnNjcmlwdC5zaDsgbmFtZSA9ICJwb3N0cHJvY2Vzcy1mcmFtZXdvcmstaGVhZGVycy5zaCI7 IHBhdGggPSAibWFjL3Bvc3Rwcm9jZXNzLWZyYW1ld29yay1oZWFkZXJzLnNoIjsgc291cmNlVHJl ZSA9ICI8Z3JvdXA+IjsgfTsKLQkJMUExRDIxMTcxOTFEOTk2QzAwMDE2MTlGIC8qIE1pZ3JhdGVI ZWFkZXJzRnJvbVdlYktpdExlZ2FjeS5tYWtlICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7 IGxhc3RLbm93bkZpbGVUeXBlID0gdGV4dDsgbmFtZSA9IE1pZ3JhdGVIZWFkZXJzRnJvbVdlYktp dExlZ2FjeS5tYWtlOyBwYXRoID0gbWFjL01pZ3JhdGVIZWFkZXJzRnJvbVdlYktpdExlZ2FjeS5t YWtlOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQkxQTFFMDkzMTE4ODYxRDM4MDBEMkRD NDkgLyogV2ViUHJvZ3Jlc3NUcmFja2VyQ2xpZW50LmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVm ZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUu Y3BwLmNwcDsgcGF0aCA9IFdlYlByb2dyZXNzVHJhY2tlckNsaWVudC5jcHA7IHNvdXJjZVRyZWUg PSAiPGdyb3VwPiI7IH07CiAJCTFBMUUwOTMyMTg4NjFEMzgwMEQyREM0OSAvKiBXZWJQcm9ncmVz c1RyYWNrZXJDbGllbnQuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2Rp bmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gV2ViUHJv Z3Jlc3NUcmFja2VyQ2xpZW50Lmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTFBMUVD NjlEMTg3MjA5MjEwMEI5NTFGMCAvKiBJbXBvcnRhbmNlQXNzZXJ0aW9uLmggKi8gPSB7aXNhID0g UEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBz b3VyY2Vjb2RlLmMuaDsgcGF0aCA9IEltcG9ydGFuY2VBc3NlcnRpb24uaDsgc291cmNlVHJlZSA9 ICI8Z3JvdXA+IjsgfTsKQEAgLTc1NDksOCArNzU2Niw2IEBACiAJCQkJMkQ3REVCRTEyMTI2OUQ1 RjAwQjlGNzNDIC8qIFNvdXJjZXNDb2NvYS50eHQgKi8sCiAJCQkJMzJEQkNGNUUwMzcwQURFRTAw QzkxNzgzIC8qIFdlYktpdDJQcmVmaXguaCAqLywKIAkJCQlDMENFNzJEQjEyNDdFOEY3MDBCQzBF QzQgLyogRGVyaXZlZFNvdXJjZXMubWFrZSAqLywKLQkJCQkxQTFEMjExNzE5MUQ5OTZDMDAwMTYx OUYgLyogTWlncmF0ZUhlYWRlcnNGcm9tV2ViS2l0TGVnYWN5Lm1ha2UgKi8sCi0JCQkJMUExRDIx MTYxOTFEOTk1QzAwMDE2MTlGIC8qIHBvc3Rwcm9jZXNzLWZyYW1ld29yay1oZWFkZXJzLnNoICov LAogCQkJCUExNkU2NjAxMjU4MTkzMDgwMEVFMTc0OSAvKiBNZWRpYUZvcm1hdFJlYWRlclBsdWdJ biAqLywKIAkJCQlCQzJFNkU3NDExNDE5NkYwMDBBNjNCMUUgLyogUGxhdGZvcm0gKi8sCiAJCQkJ MUFBRERGNEIxMEQ4MkFGMDAwRDNENjNEIC8qIFNoYXJlZCAqLywKQEAgLTE1NjkxLDYgKzE1NzA2 LDcgQEAKIAkJCQk2NTE3NTcxOTI3QzlCNDNBMDBEOUZFNDAgLyogQ29weSBGcmFtZXdvcmtzIHRv IFNlY29uZGFyeSBQYXRoICovLAogCQkJKTsKIAkJCWJ1aWxkUnVsZXMgPSAoCisJCQkJRERGNzRD NzgyN0VFMjBDOTAwMTFGNjMzIC8qIFBCWEJ1aWxkUnVsZSAqLywKIAkJCQlEREEwQTM4NDI3RTU2 MjEzMDA1RTA4NkUgLyogUEJYQnVpbGRSdWxlICovLAogCQkJCTUzNUUwOEM0MjI1NDVCNzIwMERG MDBDQSAvKiBQQlhCdWlsZFJ1bGUgKi8sCiAJCQkpOwo=