Closed Bug 1641154 Opened 4 months ago Closed 4 months ago

Broken build in dom/media/mediasink/AudioSink.cpp if MOZ_GECKO_PROFILER is not defined

Categories

(Core :: Audio/Video: Playback, defect, P3)

Other
Linux
defect

Tracking

()

RESOLVED FIXED
mozilla78
Tracking Status
firefox78 --- fixed

People

(Reporter: dan, Assigned: alwu)

Details

Attachments

(1 file)

Seems another outcome from bug 1612557 similar to bug 1640826. Build fails (at least) on ppc64le with

 0:17.34 /usr/bin/g++ -std=gnu++17 -o Unified_cpp_dom_media_mediasink0.o -c  -I/mnt/dan/firefox.git/obj-powerpc64le-unknown-linux-gnu/dist/stl_wrappers -I/mnt/dan/firefox.git/obj-powerpc64le-unknown-linux-gnu/dist/system_wrappers -include /mnt/dan/firefox.git/config/gcc_hidden.h -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fstack-protector-strong -DDEBUG=1 -DOS_POSIX=1 -DOS_LINUX=1 -DMOZ_HAS_MOZGLUE -DMOZILLA_INTERNAL_API -DIMPL_LIBXUL -DSTATIC_EXPORTABLE_JS_API -I/mnt/dan/firefox.git/dom/media/mediasink -I/mnt/dan/firefox.git/obj-powerpc64le-unknown-linux-gnu/dom/media/mediasink -I/mnt/dan/firefox.git/obj-powerpc64le-unknown-linux-gnu/ipc/ipdl/_ipdlheaders -I/mnt/dan/firefox.git/ipc/chromium/src -I/mnt/dan/firefox.git/ipc/glue -I/mnt/dan/firefox.git/obj-powerpc64le-unknown-linux-gnu/dist/include -I/mnt/dan/firefox.git/obj-powerpc64le-unknown-linux-gnu/dist/include/nspr -I/mnt/dan/firefox.git/obj-powerpc64le-unknown-linux-gnu/dist/include/nss -fPIC -DMOZILLA_CLIENT -include /mnt/dan/firefox.git/obj-powerpc64le-unknown-linux-gnu/mozilla-config.h -Wall -Wempty-body -Wignored-qualifiers -Woverloaded-virtual -Wpointer-arith -Wsign-compare -Wtype-limits -Wunreachable-code -Wwrite-strings -Wno-invalid-offsetof -Wduplicated-cond -Wimplicit-fallthrough -Wunused-function -Wunused-variable -Wno-error=maybe-uninitialized -Wno-error=deprecated-declarations -Wno-error=array-bounds -Wno-error=coverage-mismatch -Wno-error=free-nonheap-object -Wno-multistatement-macros -Wno-error=class-memaccess -Wno-error=deprecated-copy -Wformat -Wformat-overflow=2 -fno-sized-deallocation -fno-aligned-new -fno-exceptions -fno-strict-aliasing -fno-rtti -fno-exceptions -fno-math-errno -pthread -pipe -g -Og -fno-omit-frame-pointer -funwind-tables -Wno-error=shadow  -MD -MP -MF .deps/Unified_cpp_dom_media_mediasink0.o.pp  -fdiagnostics-color  Unified_cpp_dom_media_mediasink0.cpp
 0:17.60 In file included from Unified_cpp_dom_media_mediasink0.cpp:2:
 0:17.60 /mnt/dan/firefox.git/dom/media/mediasink/AudioSink.cpp:288:44: error: macro "PROFILER_MARKER" passed 2 arguments, but takes just 1
 0:17.60   288 |   PROFILER_MARKER("PlayAudio", mCurrentData);
 0:17.60       |                                            ^
 0:17.60 /mnt/dan/firefox.git/dom/media/mediasink/AudioSink.cpp:33: note: macro "PROFILER_MARKER" defined here
 0:17.60    33 | #  define PROFILER_MARKER(sample)
 0:17.60       |
 0:19.17 In file included from Unified_cpp_dom_media_mediasink0.cpp:2:
 0:19.17 /mnt/dan/firefox.git/dom/media/mediasink/AudioSink.cpp: In member function ‘virtual mozilla::UniquePtr<mozilla::AudioStream::Chunk> mozilla::AudioSink::PopFrames(uint32_t)’:
 0:19.17 /mnt/dan/firefox.git/dom/media/mediasink/AudioSink.cpp:288:3: error: ‘PROFILER_MARKER’ was not declared in this scope
 0:19.17   288 |   PROFILER_MARKER("PlayAudio", mCurrentData);
 0:19.17       |   ^~~~~~~~~~~~~~~
 0:23.92 gmake[4]: *** [/mnt/dan/firefox.git/config/rules.mk:748: Unified_cpp_dom_media_mediasink0.o] Chyba 1
diff --git a/dom/media/mediasink/AudioSink.cpp b/dom/media/mediasink/AudioSink.cpp
index 78b6ac37d24..9097d7b485a 100644
--- a/dom/media/mediasink/AudioSink.cpp
+++ b/dom/media/mediasink/AudioSink.cpp
@@ -30,7 +30,7 @@
           }));                                                            \
     } while (0)
 #else
-#  define PROFILER_MARKER(sample)
+#  define PROFILER_MARKER(tag, sample)
 #endif
 
 namespace mozilla {

has been the fix

Assignee: nobody → alwu
Severity: -- → S4
Priority: -- → P3
Status: UNCONFIRMED → NEW
Ever confirmed: true
Status: NEW → RESOLVED
Closed: 4 months ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla78
You need to log in before you can comment on or make changes to this bug.