Revert 23077 - "Use CommonNodeCache for heap constants in ChangeLowering."

src/compiler/common-node-cache.h

 // Copyright 2014 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef V8_COMPILER_COMMON_NODE_CACHE_H_
 #define V8_COMPILER_COMMON_NODE_CACHE_H_
 
 #include "src/assembler.h"
 #include "src/compiler/node-cache.h"
-#include "src/unique.h"
 
 namespace v8 {
 namespace internal {
 namespace compiler {
 
 // Bundles various caches for common nodes.
 class CommonNodeCache V8_FINAL : public ZoneObject {
  public:
   explicit CommonNodeCache(Zone* zone) : zone_(zone) {}
 
   Node** FindInt32Constant(int32_t value) {
     return int32_constants_.Find(zone_, value);
   }
 
   Node** FindFloat64Constant(double value) {
     // We canonicalize double constants at the bit representation level.
     return float64_constants_.Find(zone_, BitCast<int64_t>(value));
   }
 
   Node** FindExternalConstant(ExternalReference reference) {
-    return external_constants_.Find(
-        zone_, reinterpret_cast<intptr_t>(reference.address()));
+    return external_constants_.Find(zone_, reference.address());
   }
 
   Node** FindNumberConstant(double value) {
     // We canonicalize double constants at the bit representation level.
     return number_constants_.Find(zone_, BitCast<int64_t>(value));
   }
 
-  Node** FindHeapConstant(PrintableUnique<HeapObject> object) {
-    return heap_constants_.Find(zone_, object.Hashcode());
-  }
+  Zone* zone() const { return zone_; }
 
  private:
   Int32NodeCache int32_constants_;
   Int64NodeCache float64_constants_;
-  IntPtrNodeCache external_constants_;
+  PtrNodeCache external_constants_;
   Int64NodeCache number_constants_;
-  IntPtrNodeCache heap_constants_;
   Zone* zone_;
-
-  DISALLOW_COPY_AND_ASSIGN(CommonNodeCache);
 };
-
-}  // namespace compiler
-}  // namespace internal
-}  // namespace v8
+}
+}
+}  // namespace v8::internal::compiler
 
 #endif  // V8_COMPILER_COMMON_NODE_CACHE_H_