Revert "[vm, compiler] Fix incorrect derivation of a concrete cid from FutureOr."

This reverts commit 9faae80.

Reason for revert: Failures on JIT debug bots

Original change's description:
> [vm, compiler] Fix incorrect derivation of a concrete cid from FutureOr.
> 
> Bug: #34128
> Change-Id: I694b3b7556ee999de3c67c1cd4a8a98654365c24
> Reviewed-on: https://dart-review.googlesource.com/69480
> Commit-Queue: Ryan Macnak <[email protected]>
> Reviewed-by: Alexander Markov <[email protected]>
> Reviewed-by: Aart Bik <[email protected]>
> Reviewed-by: Vyacheslav Egorov <[email protected]>

[email protected],[email protected],[email protected],[email protected]

Change-Id: Id12351f5c231e6b5ebaa900bf0a1bca7d32cdad5
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: #34128
Reviewed-on: https://dart-review.googlesource.com/69780
Reviewed-by: Ryan Macnak <[email protected]>
Commit-Queue: Ryan Macnak <[email protected]>

Author: rmacnak-google

runtime/vm/compiler/assembler/assembler_arm.cc

@@ -1548,12 +1548,6 @@ void Assembler::StoreIntoObjectFilter(Register object,
     // And the result with the negated space bit of the object.
     bic(IP, IP, Operand(object));
   } else {
-#if defined(DEBUG)
-    Label okay;
-    BranchIfNotSmi(value, &okay);
-    Stop("Unexpected Smi!");
-    Bind(&okay);
-#endif
     bic(IP, value, Operand(object));
   }
   tst(IP, Operand(kNewObjectAlignmentOffset));

runtime/vm/compiler/assembler/assembler_arm64.cc

@@ -915,12 +915,6 @@ void Assembler::StoreIntoObjectFilter(Register object,
   // Write-barrier triggers if the value is in the new space (has bit set) and
   // the object is in the old space (has bit cleared).
   if (value_can_be_smi == kValueIsNotSmi) {
-#if defined(DEBUG)
-    Label okay;
-    BranchIfNotSmi(value, &okay);
-    Stop("Unexpected Smi!");
-    Bind(&okay);
-#endif
     // To check that, we compute value & ~object and skip the write barrier
     // if the bit is not set. We can't destroy the object.
     bic(TMP, value, Operand(object));
@@ -960,7 +954,7 @@ void Assembler::StoreIntoObject(Register object,
   ASSERT(object != value);
   str(value, dest);
   Label done;
-  StoreIntoObjectFilter(object, value, &done, can_be_smi, kJumpToNoUpdate);
+  StoreIntoObjectFilter(object, value, &done, kValueCanBeSmi, kJumpToNoUpdate);
   if (!lr_reserved) Push(LR);
   ldr(LR, Address(THR, Thread::update_store_buffer_wrappers_offset(object)));
   blr(LR);

runtime/vm/compiler/assembler/assembler_ia32.cc

@@ -1840,12 +1840,6 @@ void Assembler::StoreIntoObjectFilter(Register object,
                                       CanBeSmi can_be_smi,
                                       BarrierFilterMode how_to_jump) {
   if (can_be_smi == kValueIsNotSmi) {
-#if defined(DEBUG)
-    Label okay;
-    BranchIfNotSmi(value, &okay);
-    Stop("Unexpected Smi!");
-    Bind(&okay);
-#endif
     COMPILE_ASSERT((kNewObjectAlignmentOffset == kWordSize) &&
                    (kOldObjectAlignmentOffset == 0));
     // Write-barrier triggers if the value is in the new space (has bit set) and

runtime/vm/compiler/assembler/assembler_x64.cc

@@ -1224,12 +1224,6 @@ void Assembler::StoreIntoObjectFilter(Register object,
                  (kOldObjectAlignmentOffset == 0));
 
   if (can_be_smi == kValueIsNotSmi) {
-#if defined(DEBUG)
-    Label okay;
-    BranchIfNotSmi(value, &okay);
-    Stop("Unexpected Smi!");
-    Bind(&okay);
-#endif
     // Write-barrier triggers if the value is in the new space (has bit set) and
     // the object is in the old space (has bit cleared).
     // To check that we could compute value & ~object and skip the write barrier

runtime/vm/compiler/backend/type_propagator.cc

@@ -662,10 +662,6 @@ intptr_t CompileType::ToNullableCid() {
       cid_ = kClosureCid;
     } else if (type_->HasResolvedTypeClass()) {
       const Class& type_class = Class::Handle(type_->type_class());
-      if (type_class.IsFutureOrClass()) {
-        // FutureOr<T> may be Future<T> or T.
-        return cid_ = kDynamicCid;
-      }
       Thread* thread = Thread::Current();
       CHA* cha = thread->cha();
       // Don't infer a cid from an abstract type since there can be multiple