Backed out 2 changesets (bug 1560064) for causing build bustages. CLOSED TREE
authorMihai Alexandru Michis <malexandru@mozilla.com>
Wed, 19 Jun 2019 11:18:56 +0300
changeset 479208 ea5d71035f64e954a6718cb9e84b51b41a4f21f4
parent 479207 e2062faea394e3adb601cf6dd5e9737a98e0b5fa
child 479209 b9243653712dc004a6d1dfa625edec6c5709e992
push id88143
push usermalexandru@mozilla.com
push dateWed, 19 Jun 2019 08:19:27 +0000
treeherderautoland@ea5d71035f64 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1560064
milestone69.0a1
backs outca7d45d235a61397589e68d0dc62a2bc82f9ea8c
75d71e4211bbf927435b0c843ba9fec15085774b
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out 2 changesets (bug 1560064) for causing build bustages. CLOSED TREE Backed out changeset ca7d45d235a6 (bug 1560064) Backed out changeset 75d71e4211bb (bug 1560064)
js/src/gc/Barrier.cpp
js/src/gc/Barrier.h
--- a/js/src/gc/Barrier.cpp
+++ b/js/src/gc/Barrier.cpp
@@ -165,23 +165,33 @@ template <typename T>
   if (!zone->maybeGetUniqueId(k, &keyId)) {
     // Key is dead and cannot match lookup which must be live.
     return false;
   }
 
   return keyId == zone->getUniqueIdInfallible(l);
 }
 
+#ifdef JS_BROKEN_GCC_ATTRIBUTE_WARNING
+#  pragma GCC diagnostic push
+#  pragma GCC diagnostic ignored "-Wattributes"
+#endif  // JS_BROKEN_GCC_ATTRIBUTE_WARNING
+
+template struct JS_PUBLIC_API MovableCellHasher<JSObject*>;
 template struct JS_PUBLIC_API MovableCellHasher<GlobalObject*>;
 template struct JS_PUBLIC_API MovableCellHasher<SavedFrame*>;
 template struct JS_PUBLIC_API MovableCellHasher<EnvironmentObject*>;
 template struct JS_PUBLIC_API MovableCellHasher<WasmInstanceObject*>;
 template struct JS_PUBLIC_API MovableCellHasher<JSScript*>;
 template struct JS_PUBLIC_API MovableCellHasher<LazyScript*>;
 
+#ifdef JS_BROKEN_GCC_ATTRIBUTE_WARNING
+#  pragma GCC diagnostic pop
+#endif  // JS_BROKEN_GCC_ATTRIBUTE_WARNING
+
 }  // namespace js
 
 JS_PUBLIC_API void JS::HeapObjectWriteBarriers(JSObject** objp, JSObject* prev,
                                                JSObject* next) {
   MOZ_ASSERT(objp);
   js::InternalBarrierMethods<JSObject*>::preBarrier(prev);
   js::InternalBarrierMethods<JSObject*>::postBarrier(objp, prev, next);
 }
--- a/js/src/gc/Barrier.h
+++ b/js/src/gc/Barrier.h
@@ -858,18 +858,16 @@ class ImmutableTenuredPtr {
     AssertTargetIsNotGray(ptr);
     value = ptr;
   }
 
   T get() const { return value; }
   const T* address() { return &value; }
 };
 
-template struct JS_PUBLIC_API MovableCellHasher<JSObject*>;
-
 template <typename T>
 struct MovableCellHasher<PreBarriered<T>> {
   using Key = PreBarriered<T>;
   using Lookup = T;
 
   static bool hasHash(const Lookup& l) {
     return MovableCellHasher<T>::hasHash(l);
   }