[vm,compiler] Cleanup UnboxedConstantInstr::constant_address_

TEST=ci Change-Id: Idfedcef88b1f9c32c32cd1a483300204972e8de6 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/401900 Commit-Queue: Alexander Markov <[email protected]> Reviewed-by: Alexander Aprelev <[email protected]>
dart-lang · Dec 19, 2024 · d3ecb22 · d3ecb22
1 parent 5fd11d3
commit d3ecb22
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 37 deletions.
diff --git a/runtime/vm/compiler/backend/il.cc b/runtime/vm/compiler/backend/il.cc
@@ -1175,14 +1175,7 @@ bool ConstantInstr::AttributesEqual(const Instruction& other) const {
 
 UnboxedConstantInstr::UnboxedConstantInstr(const Object& value,
                                            Representation representation)
-    : ConstantInstr(value),
-      representation_(representation),
-      constant_address_(0) {
-  if (representation_ == kUnboxedDouble) {
-    ASSERT(value.IsDouble());
-    constant_address_ = FindDoubleConstant(Double::Cast(value).value());
-  }
-}
+    : ConstantInstr(value), representation_(representation) {}
 
 // Returns true if the value represents a constant.
 bool Value::BindsToConstant() const {

diff --git a/runtime/vm/compiler/backend/il.h b/runtime/vm/compiler/backend/il.h
@@ -4409,20 +4409,19 @@ class UnboxedConstantInstr : public ConstantInstr {
 
   virtual Representation representation() const { return representation_; }
 
-  // Either nullptr or the address of the unboxed constant.
-  uword constant_address() const { return constant_address_; }
-
   DECLARE_INSTRUCTION(UnboxedConstant)
-  DECLARE_CUSTOM_SERIALIZATION(UnboxedConstantInstr)
 
   DECLARE_ATTRIBUTES_NAMED(("value", "representation"),
                            (&value(), representation()))
 
- private:
-  const Representation representation_;
-  uword
-      constant_address_;  // Either nullptr or points to the untagged constant.
+#define FIELD_LIST(F) F(const Representation, representation_)
 
+  DECLARE_INSTRUCTION_SERIALIZABLE_FIELDS(UnboxedConstantInstr,
+                                          ConstantInstr,
+                                          FIELD_LIST)
+#undef FIELD_LIST
+
+ private:
   DISALLOW_COPY_AND_ASSIGN(UnboxedConstantInstr);
 };
 

diff --git a/runtime/vm/compiler/backend/il_ia32.cc b/runtime/vm/compiler/backend/il_ia32.cc
@@ -581,8 +581,7 @@ LocationSummary* UnboxedConstantInstr::MakeLocationSummary(Zone* zone,
   ASSERT(!is_unboxed_int || RepresentationUtils::ValueSize(representation()) <=
                                 compiler::target::kWordSize);
   const intptr_t kNumInputs = 0;
-  const intptr_t kNumTemps =
-      (constant_address() == 0) && !is_unboxed_int ? 1 : 0;
+  const intptr_t kNumTemps = 0;
   LocationSummary* locs = new (zone)
       LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
   if (representation() == kUnboxedDouble) {
@@ -591,9 +590,6 @@ LocationSummary* UnboxedConstantInstr::MakeLocationSummary(Zone* zone,
     ASSERT(is_unboxed_int);
     locs->set_out(0, Location::RequiresRegister());
   }
-  if (kNumTemps == 1) {
-    locs->set_temp(0, Location::RequiresRegister());
-  }
   return locs;
 }
 

diff --git a/runtime/vm/compiler/backend/il_serializer.cc b/runtime/vm/compiler/backend/il_serializer.cc
@@ -2636,22 +2636,6 @@ uint64_t FlowGraphDeserializer::ReadTrait<uint64_t>::Read(
   return static_cast<uint64_t>(d->stream()->Read<int64_t>());
 }
 
-void UnboxedConstantInstr::WriteTo(FlowGraphSerializer* s) {
-  ConstantInstr::WriteTo(s);
-  s->Write<Representation>(representation_);
-  // constant_address_ is not written - it is restored when reading.
-}
-
-UnboxedConstantInstr::UnboxedConstantInstr(FlowGraphDeserializer* d)
-    : ConstantInstr(d),
-      representation_(d->Read<Representation>()),
-      constant_address_(0) {
-  if (representation_ == kUnboxedDouble) {
-    ASSERT(value().IsDouble());
-    constant_address_ = FindDoubleConstant(Double::Cast(value()).value());
-  }
-}
-
 template <>
 void FlowGraphSerializer::WriteTrait<Value*>::Write(FlowGraphSerializer* s,
                                                     Value* x) {