view/nsViewManager.cpp:408:5: error: unknown type name 'GeckoProfilerTracingRAII' GeckoProfilerTracingRAII tracer("Paint", "DisplayList"); ^ 1 error generated.

layout/base/nsRefreshDriver.cpp:314:5: error: unknown type name 'GeckoProfilerTracingRAII' GeckoProfilerTracingRAII tracer("Paint", "RD"); ^ layout/base/nsRefreshDriver.cpp:1684:5: error: unknown type name 'GeckoProfilerTracingRAII' GeckoProfilerTracingRAII tracer("Paint", "Scripts"); ^ layout/base/nsRefreshDriver.cpp:1812:15: error: use of undeclared identifier 'GeckoProfilerTracingRAII' Maybe<GeckoProfilerTracingRAII> tracingStyleFlush; ^ layout/base/nsRefreshDriver.cpp:1823:16: error: use of undeclared identifier 'tracingStyleFlush' if (!tracingStyleFlush) { ^ layout/base/nsRefreshDriver.cpp:1824:13: error: use of undeclared identifier 'tracingStyleFlush' tracingStyleFlush.emplace("Paint", "Styles", Move(mStyleCause)); ^ layout/base/nsRefreshDriver.cpp:1846:13: error: use of undeclared identifier 'GeckoProfilerTracingRAII' Maybe<GeckoProfilerTracingRAII> tracingLayoutFlush; ^ layout/base/nsRefreshDriver.cpp:1857:14: error: use of undeclared identifier 'tracingLayoutFlush' if (!tracingLayoutFlush) { ^ layout/base/nsRefreshDriver.cpp:1858:11: error: use of undeclared identifier 'tracingLayoutFlush' tracingLayoutFlush.emplace("Paint", "Reflow"); ^ layout/base/nsRefreshDriver.cpp:2094:5: error: unknown type name 'GeckoProfilerTracingRAII' GeckoProfilerTracingRAII tracer("Paint", "RD"); ^ 9 errors generated.

In file included from /tmp/gecko-dev/gfx/layers/Unified_cpp_gfx_layers6.cpp:83: gfx/layers/ipc/CompositorBridgeParent.cpp:873:3: error: unknown type name 'GeckoProfilerTracingRAII' GeckoProfilerTracingRAII tracer("Paint", "Composite"); ^ 1 error generated.

In file included from objdir/gfx/layers/Unified_cpp_gfx_layers7.cpp:20: gfx/layers/ipc/LayerTransactionParent.cpp:137:3: error: unknown type name 'GeckoProfilerTracingRAII' GeckoProfilerTracingRAII tracer("Paint", "LayerTransaction"); ^ 1 error generated.

In file included from objdir/ipc/ipdl/UnifiedProtocols1.cpp:2: objdir/ipc/ipdl/PAPZCTreeManagerChild.cpp:345:9: error: unknown type name 'GeckoProfilerTracingRAII' GeckoProfilerTracingRAII syncIPCTracer( ^ objdir/ipc/ipdl/PAPZCTreeManagerChild.cpp:426:9: error: unknown type name 'GeckoProfilerTracingRAII' GeckoProfilerTracingRAII syncIPCTracer( ^ objdir/ipc/ipdl/PAPZCTreeManagerChild.cpp:507:9: error: unknown type name 'GeckoProfilerTracingRAII' GeckoProfilerTracingRAII syncIPCTracer( ^ objdir/ipc/ipdl/PAPZCTreeManagerChild.cpp:588:9: error: unknown type name 'GeckoProfilerTracingRAII' GeckoProfilerTracingRAII syncIPCTracer( ^ objdir/ipc/ipdl/PAPZCTreeManagerChild.cpp:669:9: error: unknown type name 'GeckoProfilerTracingRAII' GeckoProfilerTracingRAII syncIPCTracer( ^ objdir/ipc/ipdl/PAPZCTreeManagerChild.cpp:750:9: error: unknown type name 'GeckoProfilerTracingRAII' GeckoProfilerTracingRAII syncIPCTracer( ^ objdir/ipc/ipdl/PAPZCTreeManagerChild.cpp:855:9: error: unknown type name 'GeckoProfilerTracingRAII' GeckoProfilerTracingRAII syncIPCTracer( ^ 7 errors generated.

Not sure how to unbreak IPDL without either stubbing GeckoProfilerTracingRAII or backing out bug 1151829.

Comment on attachment 8825180 [details] Bug 1329467 - Revert bug 1151829 to unbreak non-SPS build after bug 1322553. https://reviewboard.mozilla.org/r/103384/#review104000 ::: tools/profiler/public/GeckoProfilerImpl.h (Diff revision 1) > - MOZ_GUARD_OBJECT_NOTIFIER_PARAM) > - : mCategory(aCategory) > - , mInfo(aInfo) > - { > - MOZ_GUARD_OBJECT_NOTIFIER_INIT; > - profiler_tracing(mCategory, mInfo, TRACING_INTERVAL_START); This line originates from bug 1329634 i.e., preemptive rebase.

Can someone restart the following job? Level 1 access isn't enough. https://treeherder.mozilla.org/logviewer.html#?job_id=67414790&repo=try

Tier1 platforms built without SPS profiler (i.e. NPOTB config) fails due to false positives: https://treeherder.mozilla.org/#/jobs?repo=try&revision=e4ac100d7ad97a7ccc81d747b46d744042de5716 https://treeherder.mozilla.org/#/jobs?repo=try&revision=1017f37004246bb23f93ac7a9aaa843e7feef571

Merge date is scheduled in 10 days, so let's block. [Tracking Requested - why for this release]: Aurora currently builds fine on non-SPS platforms. FreeBSD and OpenBSD are known green[1] but Linux/PPC may need[2] workarounds at least for bug 1283898 and bug 1295937. [1] http://buildbot.rhaalovely.net/one_line_per_build [2] http://mozillaproject.osuosl.org:8010/one_line_per_build

Comment on attachment 8825180 [details] Bug 1329467 - Revert bug 1151829 to unbreak non-SPS build after bug 1322553. https://reviewboard.mozilla.org/r/103384/#review105098

Comment on attachment 8825181 [details] Bug 1329467 - Move remaining *RAII classes from GeckoProfiler under mozilla namespace. https://reviewboard.mozilla.org/r/103386/#review105100

Comment on attachment 8825199 [details] Bug 1329467 - Drop non-SPS version of AutoProfilerRegister. https://reviewboard.mozilla.org/r/103388/#review105102

Thank you!

Pushed by mstange@themasta.com: https://hg.mozilla.org/integration/autoland/rev/997b7726f2e4 Revert bug 1151829 to unbreak non-SPS build after bug 1322553. r=mstange https://hg.mozilla.org/integration/autoland/rev/7b26a0681fca Move remaining *RAII classes from GeckoProfiler under mozilla namespace. r=mstange https://hg.mozilla.org/integration/autoland/rev/c5d6b1d405a8 Drop non-SPS version of AutoProfilerRegister. r=mstange

Per Comment 12, Tracking 53+.

https://hg.mozilla.org/mozilla-central/rev/7b26a0681fca https://hg.mozilla.org/mozilla-central/rev/c5d6b1d405a8

The first commit merged too, but the merge marking tool didn't like the phrase "revert bug XXXX", so didn't include it. https://hg.mozilla.org/mozilla-central/rev/997b7726f2e4