1584009 - dictionary/union nesting check is too strict

Status: RESOLVED FIXED

(Core :: DOM: Core & HTML, task, P2)

Description

[Boris Zbarsky [:bzbarsky]]

Now that bug 1068740 is fixed, we can relax the check at https://searchfox.org/mozilla-central/rev/f43ae7e1c43a4a940b658381157a6ea6c5a185c1/dom/bindings/Codegen.py#13508-13522 to not apply to the simple case when both dictionaries and the union would all be in the same binding header, since there is no problem with that case.

Comment 1

[Boris Zbarsky [:bzbarsky]]

Attachment: Bug 1584009 part 1. Loosen up the check for dictionary-containing-union-containing-dictionary. r=peterv

Since unions can now end up a in binding header, it's only a problem when the
two dictionaries are in one header and the union is in a different one. If all
three are in the same header, for example, there is no issue.

Comment 2

[Boris Zbarsky [:bzbarsky]]

Attachment: Bug 1584009 part 2. Move some WebRTC dictionaries back into the file they should have lived in originally. r=jib

Comment 3

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/0932a7fdb46b
part 1.  Loosen up the check for dictionary-containing-union-containing-dictionary.  r=peterv
https://hg.mozilla.org/integration/autoland/rev/1693187dbddf
part 2.  Move some WebRTC dictionaries back into the file they should have lived in originally.  r=jib

Comment 4

[Raul Gurzau (:RaulG)]

Backed out 2 changesets (bug 1584009) for build bustages at MediaTrackConstraints.h on a CLOSED TREE.

Backout link: https://hg.mozilla.org/integration/autoland/rev/28fcea56b3a3ee186aa736c80e1f95b62c7bcf74

Push with failures: https://treeherder.mozilla.org/#/jobs?repo=autoland&resultStatus=testfailed%2Cbusted%2Cexception&revision=1693187dbddf1a1b09198fbb8d91c3eb4b44cb95&selectedJob=269440723

Log link: https://treeherder.mozilla.org/logviewer.html#/jobs?job_id=269440723&repo=autoland&lineNumber=16863

Log snippet:

[task 2019-10-02T14:11:36.402Z] 14:11:36 INFO - config/external/icu/i18n/windtfmt.o
[task 2019-10-02T14:11:36.403Z] 14:11:36 INFO - make[4]: Leaving directory '/builds/worker/workspace/build/src/obj-firefox/config/external/icu/i18n'
[task 2019-10-02T14:11:36.559Z] 14:11:36 INFO - make[4]: Entering directory '/builds/worker/workspace/build/src/obj-firefox/xpcom/components'
[task 2019-10-02T14:11:36.559Z] 14:11:36 INFO - /builds/worker/fetches/sccache/sccache /builds/worker/fetches/clang/bin/clang++ -m32 -o StaticComponents.o -c -I/builds/worker/workspace/build/src/obj-firefox/dist/stl_wrappers -I/builds/worker/workspace/build/src/obj-firefox/dist/system_wrappers -include /builds/worker/workspace/build/src/config/gcc_hidden.h -DDEBUG=1 -DMOZ_LAYOUT_DEBUGGER -DOS_POSIX=1 -DOS_LINUX=1 -DSTATIC_EXPORTABLE_JS_API -DMOZ_HAS_MOZGLUE -DMOZILLA_INTERNAL_API -DIMPL_LIBXUL -I/builds/worker/workspace/build/src/xpcom/components -I/builds/worker/workspace/build/src/obj-firefox/xpcom/components -I/builds/worker/workspace/build/src/obj-firefox/xpcom -I/builds/worker/workspace/build/src/xpcom/base -I/builds/worker/workspace/build/src/xpcom/build -I/builds/worker/workspace/build/src/xpcom/ds -I/builds/worker/workspace/build/src/chrome -I/builds/worker/workspace/build/src/js/xpconnect/loader -I/builds/worker/workspace/build/src/layout/build -I/builds/worker/workspace/build/src/modules/libjar -I/builds/worker/workspace/build/src/obj-firefox/ipc/ipdl/_ipdlheaders -I/builds/worker/workspace/build/src/ipc/chromium/src -I/builds/worker/workspace/build/src/ipc/glue -I/builds/worker/workspace/build/src/obj-firefox/dist/include -I/builds/worker/workspace/build/src/obj-firefox/dist/include/nspr -I/builds/worker/workspace/build/src/obj-firefox/dist/include/nss -fPIC -DMOZILLA_CLIENT -include /builds/worker/workspace/build/src/obj-firefox/mozilla-config.h -Qunused-arguments -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fstack-protector-strong -Qunused-arguments -Wall -Wbitfield-enum-conversion -Wempty-body -Wignored-qualifiers -Woverloaded-virtual -Wpointer-arith -Wshadow-field-in-constructor-modified -Wsign-compare -Wtype-limits -Wunreachable-code -Wunreachable-code-return -Wwrite-strings -Wno-invalid-offsetof -Wclass-varargs -Wfloat-overflow-conversion -Wfloat-zero-conversion -Wloop-analysis -Wc++1z-compat -Wc++2a-compat -Wcomma -Wimplicit-fallthrough -Werror=non-literal-null-conversion -Wstring-conversion -Wtautological-overlap-compare -Wtautological-unsigned-enum-zero-compare -Wtautological-unsigned-zero-compare -Wno-error=tautological-type-limit-compare -Wno-inline-new-delete -Wno-error=deprecated-declarations -Wno-error=array-bounds -Wno-error=backend-plugin -Wno-error=return-std-move -Wno-error=atomic-alignment -Wformat -Wformat-security -Wno-gnu-zero-variadic-macro-arguments -Wno-unknown-warning-option -Wno-return-type-c-linkage -D_GLIBCXX_USE_CXX11_ABI=0 -fno-sized-deallocation -fno-aligned-new -fcrash-diagnostics-dir=/builds/worker/artifacts -march=pentium-m -msse -msse2 -mfpmath=sse -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fstack-protector-strong -fno-exceptions -fno-strict-aliasing -fno-rtti -ffunction-sections -fdata-sections -fno-exceptions -fno-math-errno -pthread -pipe -g -Xclang -load -Xclang /builds/worker/workspace/build/src/obj-firefox/build/clang-plugin/libclang-plugin.so -Xclang -add-plugin -Xclang moz-check -Os -fno-omit-frame-pointer -funwind-tables -Werror -I/builds/worker/workspace/build/src/widget/gtk/compat-gtk3 -pthread -I/usr/include/gtk-3.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/pango-1.0 -I/usr/include/gio-unix-2.0/ -I/usr/include/cairo -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/glib-2.0 -I/usr/lib/i386-linux-gnu/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/pixman-1 -I/usr/include/libpng12 -I/usr/include/gtk-3.0/unix-print -MD -MP -MF .deps/StaticComponents.o.pp StaticComponents.cpp
[task 2019-10-02T14:11:36.559Z] 14:11:36 INFO - In file included from StaticComponents.cpp:42:
[task 2019-10-02T14:11:36.559Z] 14:11:36 INFO - In file included from /builds/worker/workspace/build/src/obj-firefox/dist/include/mozilla/MediaManager.h:8:
[task 2019-10-02T14:11:36.559Z] 14:11:36 INFO - In file included from /builds/worker/workspace/build/src/obj-firefox/dist/include/MediaEngine.h:8:
[task 2019-10-02T14:11:36.559Z] 14:11:36 INFO - In file included from /builds/worker/workspace/build/src/obj-firefox/dist/include/DOMMediaStream.h:15:
[task 2019-10-02T14:11:36.559Z] 14:11:36 INFO - /builds/worker/workspace/build/src/obj-firefox/dist/include/MediaTrackConstraints.h:16:10: fatal error: 'mozilla/dom/MediaTrackConstraintSetBinding.h' file not found
[task 2019-10-02T14:11:36.559Z] 14:11:36 INFO - #include "mozilla/dom/MediaTrackConstraintSetBinding.h"
[task 2019-10-02T14:11:36.559Z] 14:11:36 INFO - ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
[task 2019-10-02T14:11:36.559Z] 14:11:36 INFO - 1 error generated.
[task 2019-10-02T14:11:36.559Z] 14:11:36 INFO - /builds/worker/workspace/build/src/config/rules.mk:785: recipe for target 'StaticComponents.o' failed
[task 2019-10-02T14:11:36.559Z] 14:11:36 ERROR - make[4]: *** [StaticComponents.o] Error 1
[task 2019-10-02T14:11:36.560Z] 14:11:36 INFO - make[4]: Leaving directory '/builds/worker/workspace/build/src/obj-firefox/xpcom/components'
[task 2019-10-02T14:11:36.560Z] 14:11:36 INFO - /builds/worker/workspace/build/src/config/recurse.mk:74: recipe for target 'xpcom/components/target-objects' failed
[task 2019-10-02T14:11:36.560Z] 14:11:36 ERROR - make[3]: *** [xpcom/components/target-objects] Error 2
[task 2019-10-02T14:11:36.560Z] 14:11:36 INFO - make[3]: *** Waiting for unfinished jobs....
[task 2019-10-02T14:11:36.560Z] 14:11:36 INFO - make[4]: Entering directory '/builds/worker/workspace/build/src/obj-firefox/config/external/icu/i18n'
[task 2019-10-02T14:11:36.560Z] 14:11:36 INFO - config/external/icu/i18n/winnmfmt.o

Comment 5

[Boris Zbarsky [:bzbarsky]]

Ugh. Looks like I missed removing that include...

Comment 6

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/86d33a025dd4
part 1.  Loosen up the check for dictionary-containing-union-containing-dictionary.  r=peterv
https://hg.mozilla.org/integration/autoland/rev/31bea2d0f0a6
part 2.  Move some WebRTC dictionaries back into the file they should have lived in originally.  r=jib

Comment 7

[Daniel Varga [:dvarga]]

https://hg.mozilla.org/mozilla-central/rev/86d33a025dd4
https://hg.mozilla.org/mozilla-central/rev/31bea2d0f0a6