Bug 1560064 - Barrier: Remove JS_BROKEN_GCC_ATTRIBUTE_WARNING guards. r=sfink, a=RyanVM
authorMarco Trevisan (Treviño) <mail@3v1n0.net>
Thu, 20 Jun 2019 19:19:58 +0200
changeset 537135 f3b929b28ab888967128bcd263bd03ff6645f701
parent 537134 3a892f49828e0d05ebd99969c81b5149873e4137
child 537136 828a590988ad2726fcf884fd3af84d1d20ffc141
push id2082
push userffxbld-merge
push dateMon, 01 Jul 2019 08:34:18 +0000
treeherdermozilla-release@2fb19d0466d2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssfink, RyanVM
bugs1560064
milestone68.0
Bug 1560064 - Barrier: Remove JS_BROKEN_GCC_ATTRIBUTE_WARNING guards. r=sfink, a=RyanVM
js/src/gc/Barrier.cpp
--- a/js/src/gc/Barrier.cpp
+++ b/js/src/gc/Barrier.cpp
@@ -166,36 +166,27 @@ 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
-
 #if !MOZ_IS_GCC
 template struct JS_PUBLIC_API MovableCellHasher<JSObject*>;
 #endif
 
 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);
 }