Backed out 2 changesets (bug 1560064) for causing build bustages. CLOSED TREE

Backed out changeset ca7d45d235a6 (bug 1560064)
Backed out changeset 75d71e4211bb (bug 1560064)
This commit is contained in:
Mihai Alexandru Michis 2019-06-19 11:18:56 +03:00
parent 536ab790bf
commit ab05e6b60b
2 changed files with 10 additions and 2 deletions

View File

@ -170,6 +170,12 @@ template <typename T>
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*>;
@ -177,6 +183,10 @@ 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,

View File

@ -863,8 +863,6 @@ class ImmutableTenuredPtr {
const T* address() { return &value; }
};
template struct JS_PUBLIC_API MovableCellHasher<JSObject*>;
template <typename T>
struct MovableCellHasher<PreBarriered<T>> {
using Key = PreBarriered<T>;