Backed out changeset 3e9d8536f7a8 (bug 943839) on the suspicion of having broken the PGO builds

js/src/Makefile.in

@@ -140,8 +140,6 @@ endif
 MOZILLA_DTRACE_SRC = $(srcdir)/devtools/javascript-trace.d
 endif
 
-NO_PROFILE_GUIDED_OPTIMIZE := jsanchor.cpp
-
 backend.RecursiveMakeBackend:
 	@echo "Build configuration changed. Regenerating backend."
 	$(PYTHON) config.status

js/src/jsanchor.cpp

@@ -1,19 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "jsapi.h"
-
-// This is compiled as a separate translation unit to make sure that this function
-// is never inlined.
-#ifdef MOZ_UNIFIED_BUILD
-#error "This file cannot be built in unified mode"
-#endif
-
-JS_NEVER_INLINE JS_PUBLIC_API(void)
-JS_AnchorPtr(void *p)
-{
-}
-

js/src/jsapi.cpp

@@ -1669,6 +1669,11 @@ JS_RemoveScriptRootRT(JSRuntime *rt, JSScript **rp)
     RemoveRoot(rt, (void *)rp);
 }
 
+JS_NEVER_INLINE JS_PUBLIC_API(void)
+JS_AnchorPtr(void *p)
+{
+}
+
 JS_PUBLIC_API(bool)
 JS_AddExtraGCRootsTracer(JSRuntime *rt, JSTraceDataOp traceOp, void *data)
 {

js/src/moz.build

@@ -197,15 +197,12 @@ UNIFIED_SOURCES += [
 # xpcshell is broken during packaging when compiled with gcc-4.8.2
 # frontend/Parser.cpp cannot be built in unified mode because of explicit
 # template instantiations.
-# jsanchor.cpp cannot be built in unified mode to ensure that JS_AnchorPtr is
-# not inlined.
 # jsmath.cpp cannot be built in unified mode because it needs to pull rand_s
 # from <stdlib.h> on Windows through a preprocessor define.
 # jsutil.cpp cannot be built in unified mode because it is needed for
 # check-vanilla-allocations.
 SOURCES += [
     'frontend/Parser.cpp',
-    'jsanchor.cpp',
     'jsarray.cpp',
     'jsatom.cpp',
     'jsmath.cpp',