188680 2018-08-16 15:28:58 -0700 REGRESSION(r234930): Don't embed a #if in an ASSERT 2018-08-16 16:32:24 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=188464 InRadar P2 Normal --- 1 ross.kirsling ross.kirsling commit-queue pxlcoder thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1450904 0 ross.kirsling 2018-08-16 15:28:58 -0700 r234930 embeds a #if in an ASSERT, which is an error for MSVC: > Source\WebCore\page/EventHandler.cpp(3707): error C2121: '#': invalid character: possibly the result of a macro expansion > Source\WebCore\page/EventHandler.cpp(3699): error C2059: syntax error: 'if' > Source\WebCore\page/EventHandler.cpp(3707): error C2143: syntax error: missing ';' before '{' It is also a warning for Clang (-Wembedded-directive): > warning: embedding a directive within macro arguments has undefined behavior 1450906 1 347314 ross.kirsling 2018-08-16 15:32:10 -0700 Created attachment 347314 Patch 1450942 2 347314 commit-queue 2018-08-16 16:30:50 -0700 Comment on attachment 347314 Patch Clearing flags on attachment: 347314 Committed r234969: <https://trac.webkit.org/changeset/234969> 1450943 3 commit-queue 2018-08-16 16:30:51 -0700 All reviewed patches have been landed. Closing bug. 1450946 4 wenson_hsieh 2018-08-16 16:31:29 -0700 Thank you for fixing this, Ross! 1450947 5 webkit-bug-importer 2018-08-16 16:32:20 -0700 <rdar://problem/43401346> 1450948 6 webkit-bug-importer 2018-08-16 16:32:24 -0700 <rdar://problem/43401348> 347314 2018-08-16 15:32:10 -0700 2018-08-16 16:30:50 -0700 Patch bug-188680-20180816153210.patch text/plain 2117 ross.kirsling U3VidmVyc2lvbiBSZXZpc2lvbjogMjM0OTQ0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzI5MWJjZDAxNTFhZGUz ZTNhYTE2NDE3ODM0M2UxYWIyNjg2YzRjMy4uNjFhNTYyZTE3MmYxNjg4NDY2ZjYwMTkzNzllMDNl NzEyNmI2MTc2ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDE4LTA4LTE2ICBSb3Nz IEtpcnNsaW5nICA8cm9zcy5raXJzbGluZ0Bzb255LmNvbT4KKworICAgICAgICBSRUdSRVNTSU9O KHIyMzQ5MzApOiBEb24ndCBlbWJlZCBhICNpZiBpbiBhbiBBU1NFUlQKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4ODY4MAorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGFnZS9FdmVudEhhbmRsZXIuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6RXZlbnRIYW5kbGVyOjpoYW5kbGVEcmFnKToKKyAgICAgICAg U2ltcGxpZnkgdGhlIEFTU0VSVCAtLSBpdCBzZWVtcyB3ZSBqdXN0IHdhbnQgdG8ga25vdyB0aGF0 IERyYWdTb3VyY2VBY3Rpb25TZWxlY3Rpb24gYW5kIGV4YWN0bHkgb25lIG90aGVyIERyYWdTb3Vy Y2VBY3Rpb24gaXMgc2V0LiAKKwogMjAxOC0wOC0xNiAgUnlvc3VrZSBOaXdhICA8cm5pd2FAd2Vi a2l0Lm9yZz4KIAogICAgICAgICBQZXJmb3JtIGEgbWljcm90YXNrIGNoZWNrcG9pbnQgYmVmb3Jl IGNyZWF0aW5nIGEgY3VzdG9tIGVsZW1lbnQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvRXZlbnRIYW5kbGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmNw cAppbmRleCAyODYwNWVhNGQ4ZGNkYzg1ZDk4MWJmZjNkMDZlYzRlMmQ3NzI5YTA4Li5hOGRmNzcx OGZjODMzNzBiZDE0ZmFmYzIzNWNiYzIyMDlhOTRiOWMxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wYWdlL0V2ZW50SGFuZGxlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9FdmVu dEhhbmRsZXIuY3BwCkBAIC0zNjk1LDE2ICszNjk1LDggQEAgYm9vbCBFdmVudEhhbmRsZXI6Omhh bmRsZURyYWcoY29uc3QgTW91c2VFdmVudFdpdGhIaXRUZXN0UmVzdWx0cyYgZXZlbnQsIENoZWNr RHIKICAgICBBU1NFUlQoZHJhZ1N0YXRlKCkuc291cmNlKTsKIAogICAgIGlmICghRXhhY3RseU9u ZUJpdFNldChkcmFnU3RhdGUoKS50eXBlKSkgewotICAgICAgICBBU1NFUlQoKGRyYWdTdGF0ZSgp LnR5cGUgJiBEcmFnU291cmNlQWN0aW9uU2VsZWN0aW9uKSk7Ci0gICAgICAgIEFTU0VSVCgoZHJh Z1N0YXRlKCkudHlwZSAmIH5EcmFnU291cmNlQWN0aW9uU2VsZWN0aW9uKSA9PSBEcmFnU291cmNl QWN0aW9uREhUTUwKLSAgICAgICAgICAgIHx8IChkcmFnU3RhdGUoKS50eXBlICYgfkRyYWdTb3Vy Y2VBY3Rpb25TZWxlY3Rpb24pID09IERyYWdTb3VyY2VBY3Rpb25JbWFnZQotI2lmIEVOQUJMRShB VFRBQ0hNRU5UX0VMRU1FTlQpCi0gICAgICAgICAgICB8fCAoZHJhZ1N0YXRlKCkudHlwZSAmIH5E cmFnU291cmNlQWN0aW9uU2VsZWN0aW9uKSA9PSBEcmFnU291cmNlQWN0aW9uQXR0YWNobWVudAot I2VuZGlmCi0jaWYgRU5BQkxFKElOUFVUX1RZUEVfQ09MT1IpCi0gICAgICAgICAgICB8fCAoZHJh Z1N0YXRlKCkudHlwZSAmIH5EcmFnU291cmNlQWN0aW9uU2VsZWN0aW9uKSA9PSBEcmFnU291cmNl QWN0aW9uQ29sb3IKLSNlbmRpZgotICAgICAgICAgICAgfHwgKGRyYWdTdGF0ZSgpLnR5cGUgJiB+ RHJhZ1NvdXJjZUFjdGlvblNlbGVjdGlvbikgPT0gRHJhZ1NvdXJjZUFjdGlvbkxpbmspOworICAg ICAgICBBU1NFUlQoZHJhZ1N0YXRlKCkudHlwZSAmIERyYWdTb3VyY2VBY3Rpb25TZWxlY3Rpb24p OworICAgICAgICBBU1NFUlQoRXhhY3RseU9uZUJpdFNldChzdGF0aWNfY2FzdDxEcmFnU291cmNl QWN0aW9uPihkcmFnU3RhdGUoKS50eXBlICYgfkRyYWdTb3VyY2VBY3Rpb25TZWxlY3Rpb24pKSk7 CiAKICAgICAgICAgZHJhZ1N0YXRlKCkudHlwZSA9IERyYWdTb3VyY2VBY3Rpb25TZWxlY3Rpb247 CiAgICAgfQo=