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

src/compiler/x64/code-generator-x64.cc

 // Copyright 2013 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.
 
 #include "src/compiler/code-generator.h"
 
 #include "src/ast/scopes.h"
 #include "src/compiler/code-generator-impl.h"
 #include "src/compiler/gap-resolver.h"
 #include "src/compiler/node-matchers.h"
@@ skipping 2057 matching lines @@
       Operand dst = g.ToOperand(destination);
       __ movq(tmp, src);
       __ movq(dst, tmp);
     }
   } else if (source->IsConstant()) {
     ConstantOperand* constant_source = ConstantOperand::cast(source);
     Constant src = g.ToConstant(constant_source);
     if (destination->IsRegister() || destination->IsStackSlot()) {
       Register dst = destination->IsRegister() ? g.ToRegister(destination)
                                                : kScratchRegister;
-      if (src.rmode() == RelocInfo::WASM_MEMORY_REFERENCE) {
-        __ movq(dst, src.ToInt64(), src.rmode());
-      } else {
-        switch (src.type()) {
-          case Constant::kInt32:
-            // TODO(dcarney): don't need scratch in this case.
-            __ Set(dst, src.ToInt32());
-            break;
-          case Constant::kInt64:
-            __ Set(dst, src.ToInt64());
-            break;
-          case Constant::kFloat32:
-            __ Move(dst,
-                    isolate()->factory()->NewNumber(src.ToFloat32(), TENURED));
-            break;
-          case Constant::kFloat64:
-            __ Move(dst,
-                    isolate()->factory()->NewNumber(src.ToFloat64(), TENURED));
-            break;
-          case Constant::kExternalReference:
-            __ Move(dst, src.ToExternalReference());
-            break;
-          case Constant::kHeapObject: {
-            Handle<HeapObject> src_object = src.ToHeapObject();
-            Heap::RootListIndex index;
-            int slot;
-            if (IsMaterializableFromFrame(src_object, &slot)) {
-              __ movp(dst, g.SlotToOperand(slot));
-            } else if (IsMaterializableFromRoot(src_object, &index)) {
-              __ LoadRoot(dst, index);
-            } else {
-              __ Move(dst, src_object);
-            }
-            break;
+      switch (src.type()) {
+        case Constant::kInt32:
+          // TODO(dcarney): don't need scratch in this case.
+          __ Set(dst, src.ToInt32());
+          break;
+        case Constant::kInt64:
+          __ Set(dst, src.ToInt64());
+          break;
+        case Constant::kFloat32:
+          __ Move(dst,
+                  isolate()->factory()->NewNumber(src.ToFloat32(), TENURED));
+          break;
+        case Constant::kFloat64:
+          __ Move(dst,
+                  isolate()->factory()->NewNumber(src.ToFloat64(), TENURED));
+          break;
+        case Constant::kExternalReference:
+          __ Move(dst, src.ToExternalReference());
+          break;
+        case Constant::kHeapObject: {
+          Handle<HeapObject> src_object = src.ToHeapObject();
+          Heap::RootListIndex index;
+          int slot;
+          if (IsMaterializableFromFrame(src_object, &slot)) {
+            __ movp(dst, g.SlotToOperand(slot));
+          } else if (IsMaterializableFromRoot(src_object, &index)) {
+            __ LoadRoot(dst, index);
+          } else {
+            __ Move(dst, src_object);
           }
-          case Constant::kRpoNumber:
-            UNREACHABLE();  // TODO(dcarney): load of labels on x64.
-            break;
+          break;
         }
+        case Constant::kRpoNumber:
+          UNREACHABLE();  // TODO(dcarney): load of labels on x64.
+          break;
       }
       if (destination->IsStackSlot()) {
         __ movq(g.ToOperand(destination), kScratchRegister);
       }
     } else if (src.type() == Constant::kFloat32) {
       // TODO(turbofan): Can we do better here?
       uint32_t src_const = bit_cast<uint32_t>(src.ToFloat32());
       if (destination->IsDoubleRegister()) {
         __ Move(g.ToDoubleRegister(destination), src_const);
       } else {
@@ skipping 122 matching lines @@
     int padding_size = last_lazy_deopt_pc_ + space_needed - current_pc;
     __ Nop(padding_size);
   }
 }
 
 #undef __
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8