1105781 - js/src/jsfun.cpp:1905:67: error: reference to 'NullPtr' is ambiguous (JS::NullPtr vs. js::NullPtr) in unified build

Status: RESOLVED FIXED

(Core :: JavaScript Engine, defect)

Description

[Jan Beich]

--enable-unified-compilation on Aurora 35 fails with:

In file included from js/src/Unified_cpp_js_src7.cpp:137:
js/src/jsfun.cpp:1905:67: error: reference to 'NullPtr' is ambiguous
                                           /* enclosingScope = */ NullPtr());
                                                                  ^
dist/include/js/RootingAPI.h:135:8: note: candidate found by name lookup is 'js::NullPtr'
struct NullPtr
       ^
dist/include/js/RootingAPI.h:165:22: note: candidate found by name lookup is 'JS::NullPtr'
struct JS_PUBLIC_API(NullPtr)
                     ^
js/src/jstypes.h:70:30: note: expanded from macro 'JS_PUBLIC_API'
#  define JS_PUBLIC_API(t)   t
                             ^
1 error generated.

Comment 1

[Jan Beich]

Attachment: fix?

Comment 2

[Jan Beich]

Comment on attachment 8529845 [details] [diff] [review]
fix?

js::NullPtr() is already used in other places in the file.

Comment 3

[Jan Beich]

aurora: https://treeherder.mozilla.org/ui/#/jobs?repo=try&revision=43b017a40f47

Comment 4

[Boris Zbarsky [:bzbarsky]]

Comment on attachment 8529845 [details] [diff] [review]
fix?

Yeah, makes sense.

Comment 5

[Jan Beich]

central: https://treeherder.mozilla.org/ui/#/jobs?repo=try&revision=9b8bc51e4736

Comment 6

[Jan Beich]

Comment on attachment 8529845 [details] [diff] [review]
fix?

Approval Request Comment
[Feature/regressing bug #]: bug 1083648 regression
[User impact if declined]: --enable-unified-compilation broken in Firefox 35.0. Downstream consumers have to disable the option and experience slower build.
[Describe test coverage new/current, TBPL]: comment 3, comment 5 and inbound soon.
[Risks and why]: Low, unlikely to even break build.
[String/UUID change made/needed]:

Comment 7

[Jan Beich]

Comment on attachment 8529845 [details] [diff] [review]
fix?

Approval comment 6. Need on Beta because of recent uplift.

Comment 8

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/34ef51eca3bb

Comment 9

[Phil Ringnalda (:philor)]

https://hg.mozilla.org/mozilla-central/rev/34ef51eca3bb

Comment 10

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/releases/mozilla-aurora/rev/4fb4aec5a4e0
https://hg.mozilla.org/releases/mozilla-beta/rev/1caa74d0963e