Bug 246935

Summary:	Add missing undef MESSAGE_CHECK in cpp files
Product:	WebKit	Reporter:	Przemyslaw Gorszkowski <pgorszkowski>
Component:	New Bugs	Assignee:	Nobody <webkit-unassigned>
Status:	RESOLVED FIXED
Severity:	Normal	CC:	webkit-bug-importer
Priority:	P2	Keywords:	InRadar
Version:	WebKit Nightly Build
Hardware:	All
OS:	All

Przemyslaw Gorszkowski

Reported 2022-10-24 01:32:37 PDT

The problem with missing #undef MESSAGE_CHECK can appear when we add new file to Source/WebKit/Sources.txt and start new unified build. I have such situation in my pull request: https://github.com/WebKit/WebKit/pull/5581: CompileC /Users/igalia/pgorszkowski/WebKit/WebKitBuild/WebKit.build/Release/WebKit.build/Objects-normal/x86_64/UnifiedSource61.o /Users/igalia/pgorszkowski/WebKit/WebKitBuild/Release/DerivedSources/WebKit/unified-sources/UnifiedSource61.cpp normal x86_64 c++ com.apple.compilers.llvm.clang.1_0.compiler (in target 'WebKit' from project 'WebKit') cd /Users/igalia/pgorszkowski/WebKit/Source/WebKit export LANG\=en_US.US-ASCII /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x c++ -target x86_64-apple-macos12.3 -fmessage-length\=274 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -fcolor-diagnostics -std\=c++2a -stdlib\=libc++ -gmodules -Wno-trigraphs -fno-exceptions -fno-rtti -fno-sanitize\=vptr -fpascal-strings -Os -fno-common -Werror -Wno-missing-field-initializers -Wmissing-prototypes -Wunreachable-code -Wnon-virtual-dtor -Wno-overloaded-virtual -Wno-exit-time-destructors -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wsign-compare -Wno-shorten-64-to-32 -Wnewline-eof -Wno-c++11-extensions -DNDEBUG -DHAVE_CORE_PREDICTION -DENABLE_LOWER_FORMATREADERBUNDLE_CODESIGNING_REQUIREMENTS -DFRAMEWORK_NAME\=WebKit -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX12.3.sdk -fasm-blocks -fstrict-aliasing -Wdeprecated-declarations -Winvalid-offsetof -g -fvisibility\=hidden -fvisibility-inlines-hidden -fno-threadsafe-statics -Wno-sign-conversion -Winfinite-recursion -Wmove -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wrange-loop-analysis -Wno-semicolon-before-method-body -iquote /Users/igalia/pgorszkowski/WebKit/WebKitBuild/WebKit.build/Release/WebKit.build/WebKit-generated-files.hmap -I/Users/igalia/pgorszkowski/WebKit/WebKitBuild/WebKit.build/Release/WebKit.build/WebKit-own-target-headers.hmap -I/Users/igalia/pgorszkowski/WebKit/WebKitBuild/WebKit.build/Release/WebKit.build/WebKit-all-target-headers.hmap -iquote /Users/igalia/pgorszkowski/WebKit/WebKitBuild/WebKit.build/Release/WebKit.build/WebKit-project-headers.hmap -I/Users/igalia/pgorszkowski/WebKit/WebKitBuild/Release/include -I/Users/igalia/pgorszkowski/WebKit/WebKitBuild/Release/usr/local/include -I/Users/igalia/pgorszkowski/WebKit/WebKitBuild/Release/WebCore.framework/Versions/A/PrivateHeaders/ForwardingHeaders -I/Users/igalia/pgorszkowski/WebKit/WebKitBuild/Release/DerivedSources/WebKit -I/Users/igalia/pgorszkowski/WebKit/WebKitBuild/Release/usr/local/include/pal/graphics/WebGPU -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX12.3.sdk/usr/local/include/pal/graphics/WebGPU -I/Users/igalia/pgorszkowski/WebKit/WebKitBuild/Release/usr/local/include/WebKitAdditions -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX12.3.sdk/usr/local/include/WebKitAdditions -I/Users/igalia/pgorszkowski/WebKit/WebKitBuild/Release/usr/local/include/webrtc -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX12.3.sdk/usr/local/include/webrtc -I/Users/igalia/pgorszkowski/WebKit/Source/WebKit -isystem /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX12.3.sdk/usr/local/include -I/Users/igalia/pgorszkowski/WebKit/WebKitBuild/WebKit.build/Release/WebKit.build/DerivedSources-normal/x86_64 -I/Users/igalia/pgorszkowski/WebKit/WebKitBuild/WebKit.build/Release/WebKit.build/DerivedSources/x86_64 -I/Users/igalia/pgorszkowski/WebKit/WebKitBuild/WebKit.build/Release/WebKit.build/DerivedSources -Wall -Wextra -Wcast-qual -Wchar-subscripts -Wconditional-uninitialized -Wextra-tokens -Wformat\=2 -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wno-unused-parameter -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare -Wimplicit-fallthrough -Wvla -Wliteral-conversion -Wthread-safety -Wno-profile-instr-out-of-date -Wno-profile-instr-unprofiled -F/Users/igalia/pgorszkowski/WebKit/WebKitBuild/Release -F/Users/igalia/pgorszkowski/WebKit/WebKitBuild/Release -F/Users/igalia/pgorszkowski/WebKit/WebKitLibraries/WebKitPrivateFrameworkStubs/Mac/120000 -iframework /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX12.3.sdk/System/Library/PrivateFrameworks -iframework /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX12.3.sdk/System/Library/Frameworks -iframework /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX12.3.sdk/System/Library/PrivateFrameworks -D__STDC_WANT_LIB_EXT1__\=1 -fprofile-instr-use\=/Users/igalia/pgorszkowski/WebKit/WebKitBuild/Release/DerivedSources/WebKit/WebKit.profdata -isystem /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX12.3.sdk/System/Library/Frameworks/System.framework/PrivateHeaders -include /Users/igalia/pgorszkowski/WebKit/WebKitBuild/PrecompiledHeaders/SharedPrecompiledHeaders/3378413934688251879/WebKit2Prefix.h -MMD -MT dependencies -MF /Users/igalia/pgorszkowski/WebKit/WebKitBuild/WebKit.build/Release/WebKit.build/Objects-normal/x86_64/UnifiedSource61.d --serialize-diagnostics /Users/igalia/pgorszkowski/WebKit/WebKitBuild/WebKit.build/Release/WebKit.build/Objects-normal/x86_64/UnifiedSource61.dia -c /Users/igalia/pgorszkowski/WebKit/WebKitBuild/Release/DerivedSources/WebKit/unified-sources/UnifiedSource61.cpp -o /Users/igalia/pgorszkowski/WebKit/WebKitBuild/WebKit.build/Release/WebKit.build/Objects-normal/x86_64/UnifiedSource61.o In file included from /Users/igalia/pgorszkowski/WebKit/WebKitBuild/Release/DerivedSources/WebKit/unified-sources/UnifiedSource61.cpp:6: /Users/igalia/pgorszkowski/WebKit/Source/WebKit/UIProcess/SpeechRecognitionServer.cpp:35:9: error: 'MESSAGE_CHECK' macro redefined [-Werror,-Wmacro-redefined] #define MESSAGE_CHECK(assertion) MESSAGE_CHECK_BASE(assertion, messageSenderConnection()) ^ In file included from /Users/igalia/pgorszkowski/WebKit/WebKitBuild/Release/DerivedSources/WebKit/unified-sources/UnifiedSource61.cpp:1: /Users/igalia/pgorszkowski/WebKit/Source/WebKit/UIProcess/ProvisionalPageProxy.cpp:53:9: note: previous definition is here #define MESSAGE_CHECK(process, assertion) MESSAGE_CHECK_BASE(assertion, process->connection()) ^ 1 error generated. The missing undefs are in: Source/WebKit/UIProcess/ProvisionalPageProxy.cpp Source/WebKit/GPUProcess/graphics/RemoteRenderingBackend.cpp

Attachments
Add attachment proposed patch, testcase, etc.

Przemyslaw Gorszkowski

Comment 1 2022-10-24 01:47:26 PDT

Pull request: https://github.com/WebKit/WebKit/pull/5701

EWS

Comment 2 2022-10-24 03:41:35 PDT

Committed 255908@main (238827ce8406): <https://commits.webkit.org/255908@main> Reviewed commits have been landed. Closing PR #5701 and removing active labels.

Radar WebKit Bug Importer

Comment 3 2022-10-24 03:42:20 PDT

<rdar://problem/101494021>

Note You need to log in before you can comment on or make changes to this bug.