Backed out changeset e94dceac8090 (bug 1385181) for causing bug 1386011 (CCov build bustage) a=bustage
authorWes Kocher <wkocher@mozilla.com>
Mon, 31 Jul 2017 22:12:03 -0700
changeset 423274 5588a5f33bbca0700cdf552518f5deb2853e6401
parent 423273 566c5e68903a11fb7ddfb297368f98f7ce4dc102
child 423275 6e7e4865a47763f853d672567b08d3fcf443ac15
push id1517
push userjlorenzo@mozilla.com
push dateThu, 14 Sep 2017 16:50:54 +0000
treeherdermozilla-release@3b41fd564418 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage
bugs1385181, 1386011
milestone56.0a1
backs oute94dceac80907abd4b579ddc8b7c202bbf461ec7
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 changeset e94dceac8090 (bug 1385181) for causing bug 1386011 (CCov build bustage) a=bustage MozReview-Commit-ID: BK2XP0pcoE8
js/public/HashTable.h
--- a/js/public/HashTable.h
+++ b/js/public/HashTable.h
@@ -1767,17 +1767,19 @@ class HashTable : private AllocPolicy
     }
 
     MOZ_ALWAYS_INLINE AddPtr lookupForAdd(const Lookup& l) const
     {
         mozilla::ReentrancyGuard g(*this);
         if (!EnsureHash<HashPolicy>(l))
             return AddPtr();
         HashNumber keyHash = prepareHash(l);
-        return AddPtr(lookup(l, keyHash, sCollisionBit), *this, keyHash);
+        Entry& entry = lookup(l, keyHash, sCollisionBit);
+        AddPtr p(entry, *this, keyHash);
+        return p;
     }
 
     template <typename... Args>
     MOZ_MUST_USE bool add(AddPtr& p, Args&&... args)
     {
         mozilla::ReentrancyGuard g(*this);
         MOZ_ASSERT(table);
         MOZ_ASSERT_IF(p.isValid(), p.table_ == this);