Add new relocation type WASM_MEMORY_SIZE_REFERENCE, use relocatable pointers to update wasm memory …

src/compiler/common-operator.cc

 // 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.
 
 #include "src/compiler/common-operator.h"
 
 #include "src/assembler.h"
 #include "src/base/lazy-instance.h"
 #include "src/compiler/linkage.h"
 #include "src/compiler/opcodes.h"
@@ skipping 131 matching lines @@
 
 
 std::ostream& operator<<(std::ostream& os, ParameterInfo const& i) {
   if (i.debug_name()) os << i.debug_name() << '#';
   os << i.index();
   return os;
 }
 
 bool operator==(RelocatablePtrConstantInfo const& lhs,
                 RelocatablePtrConstantInfo const& rhs) {
-  return lhs.rmode() == rhs.rmode() && lhs.value() == rhs.value();
+  return lhs.rmode() == rhs.rmode() && lhs.value() == rhs.value() &&
+         lhs.type() == rhs.type();
 }
 
 bool operator!=(RelocatablePtrConstantInfo const& lhs,
                 RelocatablePtrConstantInfo const& rhs) {
   return !(lhs == rhs);
 }
 
 size_t hash_value(RelocatablePtrConstantInfo const& p) {
-  return base::hash_combine(p.value(), p.rmode());
+  return base::hash_combine(p.value(), p.rmode(), p.type());
 }
 
 std::ostream& operator<<(std::ostream& os,
                          RelocatablePtrConstantInfo const& p) {
-  return os << p.value() << "|" << p.rmode();
+  return os << p.value() << "|" << p.rmode() << "|" << p.type();
 }
 
 #define CACHED_OP_LIST(V)                                    \
   V(Dead, Operator::kFoldable, 0, 0, 0, 1, 1, 1)             \
   V(DeoptimizeIf, Operator::kFoldable, 2, 1, 1, 0, 0, 1)     \
   V(DeoptimizeUnless, Operator::kFoldable, 2, 1, 1, 0, 0, 1) \
   V(IfTrue, Operator::kKontrol, 0, 0, 1, 0, 0, 1)            \
   V(IfFalse, Operator::kKontrol, 0, 0, 1, 0, 0, 1)           \
   V(IfSuccess, Operator::kKontrol, 0, 0, 1, 0, 0, 1)         \
   V(IfDefault, Operator::kKontrol, 0, 0, 1, 0, 0, 1)         \
@@ skipping 514 matching lines @@
       0, 0, 0, 1, 0, 0,                               // counts
       value);                                         // parameter
 }
 
 const Operator* CommonOperatorBuilder::RelocatableInt32Constant(
     int32_t value, RelocInfo::Mode rmode) {
   return new (zone()) Operator1<RelocatablePtrConstantInfo>(  // --
       IrOpcode::kRelocatableInt32Constant, Operator::kPure,   // opcode
       "RelocatableInt32Constant",                             // name
       0, 0, 0, 1, 0, 0,                                       // counts
-      RelocatablePtrConstantInfo(value, rmode));              // parameter
+      RelocatablePtrConstantInfo(static_cast<int32_t>(value),

[titzer, 2016/05/04 11:21:22]

AFAICT, the static_cast here is unnecessary.

[gdeepti, 2016/05/04 20:14:52]

Done.

+                                 rmode));  // parameter
 }
 
 const Operator* CommonOperatorBuilder::RelocatableInt64Constant(
     int64_t value, RelocInfo::Mode rmode) {
-  return new (zone()) Operator1<RelocatablePtrConstantInfo>(    // --
-      IrOpcode::kRelocatableInt64Constant, Operator::kPure,     // opcode
-      "RelocatableInt64Constant",                               // name
-      0, 0, 0, 1, 0, 0,                                         // counts
-      RelocatablePtrConstantInfo(static_cast<intptr_t>(value),  // parameter
-                                 rmode));
+  return new (zone()) Operator1<RelocatablePtrConstantInfo>(  // --
+      IrOpcode::kRelocatableInt64Constant, Operator::kPure,   // opcode
+      "RelocatableInt64Constant",                             // name
+      0, 0, 0, 1, 0, 0,                                       // counts
+      RelocatablePtrConstantInfo(static_cast<int64_t>(value),

[titzer, 2016/05/04 11:21:22]

Here as well.

[gdeepti, 2016/05/04 20:14:52]

Done.

+                                 rmode));  // parameter
 }
 
 const Operator* CommonOperatorBuilder::Select(MachineRepresentation rep,
                                               BranchHint hint) {
   return new (zone()) Operator1<SelectParameters>(  // --
       IrOpcode::kSelect, Operator::kPure,           // opcode
       "Select",                                     // name
       3, 0, 0, 1, 0, 0,                             // counts
       SelectParameters(rep, hint));                 // parameter
 }
@@ skipping 182 matching lines @@
 CommonOperatorBuilder::CreateFrameStateFunctionInfo(
     FrameStateType type, int parameter_count, int local_count,
     Handle<SharedFunctionInfo> shared_info) {
   return new (zone()->New(sizeof(FrameStateFunctionInfo)))
       FrameStateFunctionInfo(type, parameter_count, local_count, shared_info);
 }
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8