Revert "Revert "Upgrade to 5.0.71.48"" DO NOT MERGE
This reverts commit f2e3994fa5148cc3d9946666f0b0596290192b0e,
and updates the x64 makefile properly so it doesn't break that
build.
FPIIM-449
Change-Id: Ib83e35bfbae6af627451c926a9650ec57c045605
(cherry picked from commit 109988c7ccb6f3fd1a58574fa3dfb88beaef6632)
diff --git a/src/identity-map.cc b/src/identity-map.cc
index 723cdfa..97b70ae 100644
--- a/src/identity-map.cc
+++ b/src/identity-map.cc
@@ -4,7 +4,7 @@
#include "src/identity-map.h"
-#include "src/heap/heap.h"
+#include "src/base/functional.h"
#include "src/heap/heap-inl.h"
#include "src/zone-containers.h"
@@ -14,10 +14,17 @@
static const int kInitialIdentityMapSize = 4;
static const int kResizeFactor = 4;
-IdentityMapBase::~IdentityMapBase() {
- if (keys_) heap_->UnregisterStrongRoots(keys_);
-}
+IdentityMapBase::~IdentityMapBase() { Clear(); }
+void IdentityMapBase::Clear() {
+ if (keys_) {
+ heap_->UnregisterStrongRoots(keys_);
+ keys_ = nullptr;
+ values_ = nullptr;
+ size_ = 0;
+ mask_ = 0;
+ }
+}
IdentityMapBase::RawEntry IdentityMapBase::Lookup(Object* key) {
int index = LookupIndex(key);
@@ -35,8 +42,7 @@
int IdentityMapBase::Hash(Object* address) {
CHECK_NE(address, heap_->not_mapped_symbol());
uintptr_t raw_address = reinterpret_cast<uintptr_t>(address);
- // Xor some of the upper bits, since the lower 2 or 3 are usually aligned.
- return static_cast<int>((raw_address >> 11) ^ raw_address);
+ return static_cast<int>(hasher_(raw_address));
}