[vm/compiler] Move more common code into type propagator

Rationale:
Since I was visiting the neighborhood anyway, I might
as well clean up a bit more code duplication. Now all
type propagation related code is in one file!
Change-Id: Idec49dd91a12b42c5371c132c571acca22d4b187
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/112046
Commit-Queue: Aart Bik <ajcbik@google.com>
Reviewed-by: Martin Kustermann <kustermann@google.com>
Reviewed-by: Alexander Markov <alexmarkov@google.com>

Author: aartbik

runtime/vm/compiler/backend/compile_type.h

@@ -129,6 +129,9 @@ class CompileType : public ZoneAllocated {
   // Create non-nullable Int type.
   static CompileType Int();
 
+  // Create non-nullable 32-bit Int type (arch dependent).
+  static CompileType Int32();
+
   // Create nullable Int type.
   static CompileType NullableInt();
 

runtime/vm/compiler/backend/il_arm.cc

@@ -6756,22 +6756,6 @@ void UnaryInt64OpInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
   }
 }
 
-CompileType BinaryUint32OpInstr::ComputeType() const {
-  return CompileType::Int();
-}
-
-CompileType ShiftUint32OpInstr::ComputeType() const {
-  return CompileType::Int();
-}
-
-CompileType SpeculativeShiftUint32OpInstr::ComputeType() const {
-  return CompileType::Int();
-}
-
-CompileType UnaryUint32OpInstr::ComputeType() const {
-  return CompileType::Int();
-}
-
 LocationSummary* BinaryUint32OpInstr::MakeLocationSummary(Zone* zone,
                                                           bool opt) const {
   const intptr_t kNumInputs = 2;

runtime/vm/compiler/backend/il_arm64.cc

@@ -5898,22 +5898,6 @@ void UnaryInt64OpInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
   }
 }
 
-CompileType BinaryUint32OpInstr::ComputeType() const {
-  return CompileType::FromCid(kSmiCid);
-}
-
-CompileType ShiftUint32OpInstr::ComputeType() const {
-  return CompileType::FromCid(kSmiCid);
-}
-
-CompileType SpeculativeShiftUint32OpInstr::ComputeType() const {
-  return CompileType::FromCid(kSmiCid);
-}
-
-CompileType UnaryUint32OpInstr::ComputeType() const {
-  return CompileType::FromCid(kSmiCid);
-}
-
 LocationSummary* BinaryUint32OpInstr::MakeLocationSummary(Zone* zone,
                                                           bool opt) const {
   const intptr_t kNumInputs = 2;

runtime/vm/compiler/backend/il_dbc.cc

@@ -1365,22 +1365,6 @@ LocationSummary* Instruction::MakeCallSummary(Zone* zone) {
   return result;
 }
 
-CompileType BinaryUint32OpInstr::ComputeType() const {
-  return CompileType::Int();
-}
-
-CompileType ShiftUint32OpInstr::ComputeType() const {
-  return CompileType::Int();
-}
-
-CompileType SpeculativeShiftUint32OpInstr::ComputeType() const {
-  return CompileType::Int();
-}
-
-CompileType UnaryUint32OpInstr::ComputeType() const {
-  return CompileType::Int();
-}
-
 Representation LoadIndexedInstr::representation() const {
   switch (class_id_) {
     case kArrayCid:

runtime/vm/compiler/backend/il_ia32.cc

@@ -6083,22 +6083,6 @@ void UnaryInt64OpInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
   }
 }
 
-CompileType BinaryUint32OpInstr::ComputeType() const {
-  return CompileType::Int();
-}
-
-CompileType ShiftUint32OpInstr::ComputeType() const {
-  return CompileType::Int();
-}
-
-CompileType SpeculativeShiftUint32OpInstr::ComputeType() const {
-  return CompileType::Int();
-}
-
-CompileType UnaryUint32OpInstr::ComputeType() const {
-  return CompileType::Int();
-}
-
 LocationSummary* UnaryUint32OpInstr::MakeLocationSummary(Zone* zone,
                                                          bool opt) const {
   const intptr_t kNumInputs = 1;

runtime/vm/compiler/backend/il_x64.cc

@@ -6212,22 +6212,6 @@ void SpeculativeShiftUint32OpInstr::EmitNativeCode(
   }
 }
 
-CompileType BinaryUint32OpInstr::ComputeType() const {
-  return CompileType::FromCid(kSmiCid);
-}
-
-CompileType ShiftUint32OpInstr::ComputeType() const {
-  return CompileType::FromCid(kSmiCid);
-}
-
-CompileType SpeculativeShiftUint32OpInstr::ComputeType() const {
-  return CompileType::FromCid(kSmiCid);
-}
-
-CompileType UnaryUint32OpInstr::ComputeType() const {
-  return CompileType::FromCid(kSmiCid);
-}
-
 LocationSummary* BinaryUint32OpInstr::MakeLocationSummary(Zone* zone,
                                                           bool opt) const {
   const intptr_t kNumInputs = 2;

runtime/vm/compiler/backend/type_propagator.cc

@@ -661,6 +661,14 @@ CompileType CompileType::Int() {
   return FromAbstractType(Type::ZoneHandle(Type::IntType()), kNonNullable);
 }
 
+CompileType CompileType::Int32() {
+#if defined(TARGET_ARCH_X64) || defined(TARGET_ARCH_ARM64)
+  return FromCid(kSmiCid);
+#else
+  return Int();
+#endif
+}
+
 CompileType CompileType::NullableInt() {
   return FromAbstractType(Type::ZoneHandle(Type::IntType()), kNullable);
 }
@@ -1431,6 +1439,22 @@ CompileType LoadCodeUnitsInstr::ComputeType() const {
   }
 }
 
+CompileType BinaryUint32OpInstr::ComputeType() const {
+  return CompileType::Int32();
+}
+
+CompileType ShiftUint32OpInstr::ComputeType() const {
+  return CompileType::Int32();
+}
+
+CompileType SpeculativeShiftUint32OpInstr::ComputeType() const {
+  return CompileType::Int32();
+}
+
+CompileType UnaryUint32OpInstr::ComputeType() const {
+  return CompileType::Int32();
+}
+
 CompileType BinaryInt32OpInstr::ComputeType() const {
   // TODO(vegorov): range analysis information shall be used here.
   return CompileType::Int();
@@ -1672,9 +1696,8 @@ CompileType LoadIndexedInstr::ComputeType() const {
 
     case kTypedDataInt32ArrayCid:
     case kTypedDataUint32ArrayCid:
-#if defined(TARGET_ARCH_X64) || defined(TARGET_ARCH_ARM64)
-      return CompileType::FromCid(kSmiCid);
-#endif
+      return CompileType::Int32();
+
     case kTypedDataInt64ArrayCid:
     case kTypedDataUint64ArrayCid:
       return CompileType::Int();