Revert of [compiler] Add relocatable pointer constants for wasm memory references.

src/compiler/common-operator.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_OPERATOR_H_
 #define V8_COMPILER_COMMON_OPERATOR_H_
 
-#include "src/assembler.h"
 #include "src/compiler/frame-states.h"
 #include "src/machine-type.h"
 #include "src/zone-containers.h"
 
 namespace v8 {
 namespace internal {
 
 // Forward declarations.
+class ExternalReference;
 class Type;
 
 namespace compiler {
 
 // Forward declarations.
 class CallDescriptor;
 struct CommonOperatorGlobalCache;
 class Operator;
 
 
@@ skipping 80 matching lines @@
  private:
   int index_;
   const char* debug_name_;
 };
 
 std::ostream& operator<<(std::ostream&, ParameterInfo const&);
 
 int ParameterIndexOf(const Operator* const);
 const ParameterInfo& ParameterInfoOf(const Operator* const);
 
-class RelocatablePtrConstantInfo final {
- public:
-  RelocatablePtrConstantInfo(intptr_t value, RelocInfo::Mode rmode)
-      : value_(value), rmode_(rmode) {}
-
-  intptr_t value() const { return value_; }
-  RelocInfo::Mode rmode() const { return rmode_; }
-
- private:
-  intptr_t value_;
-  RelocInfo::Mode rmode_;
-};
-
-bool operator==(RelocatablePtrConstantInfo const& lhs,
-                RelocatablePtrConstantInfo const& rhs);
-bool operator!=(RelocatablePtrConstantInfo const& lhs,
-                RelocatablePtrConstantInfo const& rhs);
-std::ostream& operator<<(std::ostream&, RelocatablePtrConstantInfo const&);
-size_t hash_value(RelocatablePtrConstantInfo const& p);
 
 // Interface for building common operators that can be used at any level of IR,
 // including JavaScript, mid-level, and low-level.
 class CommonOperatorBuilder final : public ZoneObject {
  public:
   explicit CommonOperatorBuilder(Zone* zone);
 
   const Operator* Dead();
   const Operator* End(size_t control_input_count);
   const Operator* Branch(BranchHint = BranchHint::kNone);
@@ skipping 21 matching lines @@
   const Operator* OsrValue(int index);
 
   const Operator* Int32Constant(int32_t);
   const Operator* Int64Constant(int64_t);
   const Operator* Float32Constant(volatile float);
   const Operator* Float64Constant(volatile double);
   const Operator* ExternalConstant(const ExternalReference&);
   const Operator* NumberConstant(volatile double);
   const Operator* HeapConstant(const Handle<HeapObject>&);
 
-  const Operator* RelocatableInt32Constant(int32_t value,
-                                           RelocInfo::Mode rmode);
-  const Operator* RelocatableInt64Constant(int64_t value,
-                                           RelocInfo::Mode rmode);
-
   const Operator* Select(MachineRepresentation, BranchHint = BranchHint::kNone);
   const Operator* Phi(MachineRepresentation representation,
                       int value_input_count);
   const Operator* EffectPhi(int effect_input_count);
   const Operator* EffectSet(int arguments);
   const Operator* Guard(Type* type);
   const Operator* BeginRegion();
   const Operator* FinishRegion();
   const Operator* StateValues(int arguments);
   const Operator* ObjectState(int pointer_slots, int id);
@@ skipping 21 matching lines @@
   Zone* const zone_;
 
   DISALLOW_COPY_AND_ASSIGN(CommonOperatorBuilder);
 };
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_COMPILER_COMMON_OPERATOR_H_