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

src/compiler/common-operator.cc

Index: src/compiler/common-operator.cc
diff --git a/src/compiler/common-operator.cc b/src/compiler/common-operator.cc
index 573e4661638a8f3811beefbe28a63c8a47c1d81f..c53448453d576a3a7330d242e8720147181a82ae 100644
--- a/src/compiler/common-operator.cc
+++ b/src/compiler/common-operator.cc
@@ -149,7 +149,8 @@ std::ostream& operator<<(std::ostream& os, ParameterInfo const& i) {
 
 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,
@@ -158,12 +159,12 @@ bool operator!=(RelocatablePtrConstantInfo const& lhs,
 }
 
 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)                                    \
@@ -698,17 +699,18 @@ const Operator* CommonOperatorBuilder::RelocatableInt32Constant(
       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,