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

src/compiler/node-cache.h

Index: src/compiler/node-cache.h
diff --git a/src/compiler/node-cache.h b/src/compiler/node-cache.h
index 0a5f3ef6e94a1d11db89c390067e1888478c8be7..35352ea1eb1e19e93eabe1393a9eedefcb36c803 100644
--- a/src/compiler/node-cache.h
+++ b/src/compiler/node-cache.h
@@ -5,19 +5,14 @@
 #ifndef V8_COMPILER_NODE_CACHE_H_
 #define V8_COMPILER_NODE_CACHE_H_
 
-#include "src/base/macros.h"
+#include "src/v8.h"
+
+#include "src/compiler/node.h"
 
 namespace v8 {
 namespace internal {
-
-// Forward declarations.
-class Zone;
-
 namespace compiler {
 
-// Forward declarations.
-class Node;
-
 // A cache for nodes based on a key. Useful for implementing canonicalization of
 // nodes such as constants, parameters, etc.
 template <typename Key>
@@ -41,21 +36,18 @@ class NodeCache {
   };
 
   Entry* entries_;  // lazily-allocated hash entries.
-  int size_;
-  int max_;
+  int32_t size_;
+  int32_t max_;
 
   bool Resize(Zone* zone);
-
-  DISALLOW_COPY_AND_ASSIGN(NodeCache);
 };
 
 // Various default cache types.
-typedef NodeCache<int32_t> Int32NodeCache;
 typedef NodeCache<int64_t> Int64NodeCache;
-typedef NodeCache<intptr_t> IntPtrNodeCache;
-
-}  // namespace compiler
-}  // namespace internal
-}  // namespace v8
+typedef NodeCache<int32_t> Int32NodeCache;
+typedef NodeCache<void*> PtrNodeCache;
+}
+}
+}  // namespace v8::internal::compiler
 
 #endif  // V8_COMPILER_NODE_CACHE_H_