188180 2018-07-30 14:06:47 -0700 watchOS engineering build is broken after r234227 2018-07-30 17:49:18 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 wenson_hsieh wenson_hsieh aestes commit-queue ews-watchlist keith_miller mark.lam msaboff saam thorton webkit-bug-importer oldest_to_newest 1446349 0 wenson_hsieh 2018-07-30 14:06:47 -0700 In file included from /Volumes/main/Users/whsieh/Build/Release-watchos/DerivedSources/WebCore/unified-sources/UnifiedSource1-mm.mm:1: In file included from ./Modules/plugins/QuickTimePluginReplacement.mm:55: In file included from /Volumes/main/Users/whsieh/Build/Release-watchos/JavaScriptCore.framework/Headers/JavaScriptCore.h:35: /Volumes/main/Users/whsieh/Build/Release-watchos/JavaScriptCore.framework/Headers/JSValue.h:50:189: error: 'JSC_IOS_VERSION_TBA' is not defined, evaluates to 0 [-Werror,-Wundef] #if (defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED < JSC_MAC_VERSION_TBA) || (defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED < JSC_IOS_VERSION_TBA) CompileC UnifiedSource1.o CompileC UnifiedSource2-mm.o CompileC UnifiedSource2.o CompileC UnifiedSource3-mm.o CompileC UnifiedSource3.o CompileC UnifiedSource4-mm.o CompileC UnifiedSource4.o CompileC UnifiedSource5-mm.o CompileC UnifiedSource5.o CompileC UnifiedSource6-mm.o In file included from /Volumes/main/Users/whsieh/Build/Release-watchos/DerivedSources/WebCore/unified-sources/UnifiedSource6-mm.mm:1: In file included from ./bindings/js/ScriptControllerMac.mm:44: In file included from /Volumes/main/Users/whsieh/Build/Release-watchos/JavaScriptCore.framework/PrivateHeaders/JSContextInternal.h:26: In file included from /Volumes/main/Users/whsieh/Build/Release-watchos/JavaScriptCore.framework/Headers/JavaScriptCore.h:35: /Volumes/main/Users/whsieh/Build/Release-watchos/JavaScriptCore.framework/Headers/JSValue.h:50:189: error: 'JSC_IOS_VERSION_TBA' is not defined, evaluates to 0 [-Werror,-Wundef] #if (defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED < JSC_MAC_VERSION_TBA) || (defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED < JSC_IOS_VERSION_TBA) 1 error generated. 1446357 1 wenson_hsieh 2018-07-30 14:33:59 -0700 It seems that this snippet in postprocess-headers.sh: function rewrite_headers () { if [[ "${PLATFORM_NAME}" == "macosx" ]]; then [[ -n ${OSX_VERSION} ]] || OSX_VERSION=${MACOSX_DEPLOYMENT_TARGET} [[ -n ${IOS_VERSION} ]] || IOS_VERSION="NA" [[ -n ${OSX_VERSION_NUMBER} ]] || OSX_VERSION_NUMBER=${TARGET_MAC_OS_X_VERSION_MAJOR} [[ -n ${IOS_VERSION_NUMBER} ]] || IOS_VERSION_NUMBER="0" elif [[ "${PLATFORM_NAME}" =~ "iphone" ]]; then [[ -n ${IOS_VERSION} ]] || IOS_VERSION=${IPHONEOS_DEPLOYMENT_TARGET} [[ -n ${OSX_VERSION} ]] || OSX_VERSION="NA" [[ -n ${OSX_VERSION_NUMBER} ]] || OSX_VERSION_NUMBER="0" [[ -n ${IOS_VERSION_NUMBER} ]] || IOS_VERSION_NUMBER=${SDK_VERSION_MAJOR} fi … } ...doesn't take watchOS into account, since PLATFORM_NAME starts with "watch" rather than "iphone". 1446366 2 wenson_hsieh 2018-07-30 14:53:45 -0700 Hmm, I see now that this is modeled closely after rewrite_headers() in postprocess-framework-headers.sh in WebKit, and we also miss setting OSX_VERSION and IOS_VERSION there too, because WK_PLATFORM_NAME is "watch(os|simulator)". 1446401 3 wenson_hsieh 2018-07-30 16:11:29 -0700 (In reply to Wenson Hsieh from comment #2) > Hmm, I see now that this is modeled closely after rewrite_headers() in > postprocess-framework-headers.sh in WebKit, and we also miss setting > OSX_VERSION and IOS_VERSION there too, because WK_PLATFORM_NAME is > "watch(os|simulator)". So in the case where this happens, we end up in a fallback path: if [[ -n "$OSX_VERSION" && -n "$IOS_VERSION" ]]; then SED_OPTIONS+=( -e s/JSC_MAC_TBA/${OSX_VERSION}/g -e s/JSC_IOS_TBA/${IOS_VERSION}/g -e s/JSC_MAC_VERSION_TBA/${OSX_VERSION_NUMBER}/g -e s/JSC_IOS_VERSION_TBA/${IOS_VERSION_NUMBER}/g -e s/JSC_API_AVAILABLE/API_AVAILABLE/ -e s/JSC_API_DEPRECATED/API_DEPRECATED/ -e "s/^JSC_CLASS_AVAILABLE/JSC_EXTERN API_AVAILABLE/" -e "s/^JSC_CLASS_DEPRECATED/JSC_EXTERN API_DEPRECATED/" ) else SED_OPTIONS+=( -e 's/JSC_(API_|CLASS_)AVAILABLE\(.*\)\s*\)//g' -e 's/JSC_(API_|CLASS_)DEPRECATED(_WITH_REPLACEMENT)?\(.*\)\s*\)//g' ) fi ...which effectively removes all uses of the JSC availability macro. Perhaps this should replace JSC_IOS_VERSION_TBA and JSC_MAC_VERSION_TBA as well with a fallback value of 0? 1446419 4 346122 wenson_hsieh 2018-07-30 16:34:33 -0700 Created attachment 346122 Patch 1446432 5 346122 keith_miller 2018-07-30 16:54:46 -0700 Comment on attachment 346122 Patch r=me. 1446440 6 346122 commit-queue 2018-07-30 17:48:56 -0700 Comment on attachment 346122 Patch Clearing flags on attachment: 346122 Committed r234401: <https://trac.webkit.org/changeset/234401> 1446441 7 commit-queue 2018-07-30 17:48:58 -0700 All reviewed patches have been landed. Closing bug. 1446442 8 webkit-bug-importer 2018-07-30 17:49:18 -0700 <rdar://problem/42754208> 346122 2018-07-30 16:34:33 -0700 2018-07-30 17:48:56 -0700 Patch bug-188180-20180730163432.patch text/plain 2083 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjM0Mzg0CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA1 NWM5OGYyZmU0YzgwOTMyOWFiNzQ4MzllYzA5MWZiOTMyMjY4NmE1Li42M2I2ZWRhZjM3YTgxNjE5 ZGUyNjc5M2M3ZDFmNGEyYjI1ZDdiMzlkIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMCBAQAorMjAxOC0wNy0zMCAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFwcGxl LmNvbT4KKworICAgICAgICB3YXRjaE9TIGVuZ2luZWVyaW5nIGJ1aWxkIGlzIGJyb2tlbiBhZnRl ciByMjM0MjI3CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xODgxODAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBJbiB0aGUgY2FzZSB3aGVyZSB3ZSdyZSBidWlsZGluZyB3aXRoIGEgYFBMQVRGT1JNX05BTUVg IG9mIG5laXRoZXIgIm1hY29zeCIgbm9yICJpcGhvbmUqIiwKKyAgICAgICAgcG9zdHByb2Nlc3Mt aGVhZGVycy5zaCBhdHRlbXB0cyB0byBkZWxldGUgYW55IHVzYWdlIG9mIHRoZSBKU0MgYXZhaWxh YmlsaXR5IG1hY3Jvcy4gSG93ZXZlciwKKyAgICAgICAgYEpTQ19NQUNfVkVSU0lPTl9UQkFgIGFu ZCBgSlNDX0lPU19WRVJTSU9OX1RCQWAgc3RpbGwgcmVtYWluLCBhbmQgSlNWYWx1ZS5oJ3MgdXNh Z2Ugb2YKKyAgICAgICAgYEpTQ19JT1NfVkVSU0lPTl9UQkFgIGNhdXNlcyBlbmdpbmVlcmluZyB3 YXRjaE9TIGJ1aWxkcyB0byBmYWlsLgorCisgICAgICAgIFRvIGZpeCB0aGlzLCBzaW1wbHkgYWxs b3cgdGhlIGZhbGxiYWNrIHBhdGggdG8gcmVtb3ZlIHRoZXNlIG1hY3JvcyBmcm9tIEphdmFTY3Jp cHRDb3JlIGhlYWRlcnMKKyAgICAgICAgZW50aXJlbHksIHNpbmNlIHRoZXJlJ3Mgbm8gcmVsZXZh bnQgdmVyc2lvbiB0byByZXBsYWNlIHRoZW0gd2l0aC4KKworICAgICAgICAqIHBvc3Rwcm9jZXNz LWhlYWRlcnMuc2g6CisKIDIwMTgtMDctMzAgIEtlaXRoIE1pbGxlciAgPGtlaXRoX21pbGxlckBh cHBsZS5jb20+CiAKICAgICAgICAgQ2xhcmlmeSBjb252ZXJzaW9uIHJ1bGVzIGZvciBKU1ZhbHVl IHByb3BlcnR5IGFjY2VzcyBBUEkKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9w b3N0cHJvY2Vzcy1oZWFkZXJzLnNoIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3Bvc3Rwcm9jZXNz LWhlYWRlcnMuc2gKaW5kZXggZmNkZThhMTM3MTFhNGJiZDExYzhhMGEyMTMwZjZjMTIyN2ExNzFm OC4uZmQyODgzNmRjOGJkZjFlNWY0OTM5ZjQyNTk5YTFjMDdmNGY5YmZjOSAxMDA3NTUKLS0tIGEv U291cmNlL0phdmFTY3JpcHRDb3JlL3Bvc3Rwcm9jZXNzLWhlYWRlcnMuc2gKKysrIGIvU291cmNl L0phdmFTY3JpcHRDb3JlL3Bvc3Rwcm9jZXNzLWhlYWRlcnMuc2gKQEAgLTc2LDcgKzc2LDExIEBA IGZ1bmN0aW9uIHJld3JpdGVfaGVhZGVycyAoKSB7CiAgICAgICAgICAgICAtZSAicy9eSlNDX0NM QVNTX0RFUFJFQ0FURUQvSlNDX0VYVEVSTiBBUElfREVQUkVDQVRFRC8iCiAgICAgICAgICkKICAg ICBlbHNlCi0gICAgICAgIFNFRF9PUFRJT05TKz0oLWUgJ3MvSlNDXyhBUElffENMQVNTXylBVkFJ TEFCTEVcKC4qXClccypcKS8vZycgLWUgJ3MvSlNDXyhBUElffENMQVNTXylERVBSRUNBVEVEKF9X SVRIX1JFUExBQ0VNRU5UKT9cKC4qXClccypcKS8vZycpCisgICAgICAgIFNFRF9PUFRJT05TKz0o CisgICAgICAgICAgICAtZSAncy9KU0NfKEFQSV98Q0xBU1NfKUFWQUlMQUJMRVwoLipcKVxzKlwp Ly9nJworICAgICAgICAgICAgLWUgJ3MvSlNDXyhBUElffENMQVNTXylERVBSRUNBVEVEKF9XSVRI X1JFUExBQ0VNRU5UKT9cKC4qXClccypcKS8vZycKKyAgICAgICAgICAgIC1lICdzL0pTQ18oTUFD fElPUylfVkVSU0lPTl9UQkEvMC9nJworICAgICAgICApCiAgICAgZmkKIAogICAgIFNFRF9PUFRJ T05TKz0oJHtPVEhFUl9TRURfT1BUSU9OU1sqXX0pCg==