Index: lib/sanitizer_common/sanitizer_addrhashmap.h
===================================================================
--- lib/sanitizer_common/sanitizer_addrhashmap.h
+++ lib/sanitizer_common/sanitizer_addrhashmap.h
@@ -73,6 +73,8 @@
 
     ~Handle();
     T *operator->();
+    T &operator*();
+    const T &operator*() const;
     bool created() const;
     bool exists() const;
 
@@ -136,6 +138,16 @@
   return &cell_->val;
 }
 
+template <typename T, uptr kSize>
+const T &AddrHashMap<T, kSize>::Handle::operator*() const {
+  return cell_->val;
+}
+
+template <typename T, uptr kSize>
+T &AddrHashMap<T, kSize>::Handle::operator*() {
+  return cell_->val;
+}
+
 template<typename T, uptr kSize>
 bool AddrHashMap<T, kSize>::Handle::created() const {
   return created_;