Fix Issue 12322: the analysis requires stored guarded_cid to be returned when requested; only when …

runtime/vm/object.h

Index: runtime/vm/object.h
===================================================================
--- runtime/vm/object.h	(revision 25934)
+++ runtime/vm/object.h	(working copy)
@@ -1961,14 +1961,8 @@
   // Return class id that any non-null value read from this field is guaranteed
   // to have or kDynamicCid if such class id is not known.
   // Stores to this field must update this information hence the name.
-  intptr_t guarded_cid() const {
-    const intptr_t cid = raw_ptr()->guarded_cid_;
-    if (IsExternalizableCid(cid)) {
-      return kDynamicCid;
-    } else {
-      return cid;
-    }
-  }
+  intptr_t guarded_cid() const { return raw_ptr()->guarded_cid_; }
+
   void set_guarded_cid(intptr_t cid) const {
     raw_ptr()->guarded_cid_ = cid;
   }