1349618 - dom/base/nsJSUtils.h:72:14: error: 'SamplerStackFrameRAII' in namespace 'mozilla' does not name a type

Status: RESOLVED FIXED

(Core :: General, defect)

Description

[Jan Beich]

GeckoProfiler isn't available on most Tier3 platforms: iOS, Android aarch64, Linux powerpc*/sparc64, BSDs, Solaris, etc.

In file included from objdir/dom/xslt/xpath/Unified_cpp_dom_xslt_xpath0.cpp:2:
In file included from dom/xslt/xpath/XPathEvaluator.cpp:24:
In file included from objdir/dist/include/mozilla/dom/BindingUtils.h:36:
objdir/dist/include/nsJSUtils.h:72:14: error: no type named 'SamplerStackFrameRAII' in
      namespace 'mozilla'
    mozilla::SamplerStackFrameRAII mSamplerRAII;
    ~~~~~~~~~^
1 error generated.

Comment 1

[Nicolas B. Pierron [:nbp]]

Attachment: Guard ExecutionContext::mSamplerRAII with the MOZ_GECKO_PROFILER macro.

This patch does exactly what the title say.
This fix an issue introduced in Bug 1331662.

Comment 2

[Jan Beich]

Comment on attachment 8850085 [details] [diff] [review]
Guard ExecutionContext::mSamplerRAII with the MOZ_GECKO_PROFILER macro.

I confirm, the patch is enough to unbreak build on FreeBSD.

Comment 3

[Nicholas Nethercote [inactive]]

Comment on attachment 8850085 [details] [diff] [review]
Guard ExecutionContext::mSamplerRAII with the MOZ_GECKO_PROFILER macro.

Review of attachment 8850085 [details] [diff] [review]:
-----------------------------------------------------------------

::: dom/base/nsJSUtils.cpp
@@ +138,5 @@
>    : mSamplerRAII("nsJSUtils::ExecutionContext", /* PROFILER_LABEL */
>                   js::ProfileEntry::Category::JS, __LINE__)
>    , mCx(aCx)
> +#else
> +  : mCx(aCx)

You can avoid the duplication of |mCx(aCx)| like so:

>  :
> #ifdef MOZ_GECKO_PROFILER
>    mSamplerRAII(...),
> #endif
>    mCx(aCx)
>  , mCompartment(...)

r=me with that. Thanks!

Comment 4

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/mozilla-inbound/rev/7dee6ff041fe
Guard ExecutionContext::mSamplerRAII with the MOZ_GECKO_PROFILER macro. r=njn

Comment 5

[Wes Kocher (:KWierso) (Not reading bugmail; email directly if needed)]

https://hg.mozilla.org/mozilla-central/rev/7dee6ff041fe