Support for mixed null/smi equality: do not deoptimize, emit same optimized code as if that was smi…

runtime/vm/object.h

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #ifndef VM_OBJECT_H_
 #define VM_OBJECT_H_
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "platform/utils.h"
@@ skipping 2717 matching lines @@
   }
 
   static intptr_t ic_data_offset() {
     return OFFSET_OF(RawICData, ic_data_);
   }
 
   static intptr_t function_offset() {
     return OFFSET_OF(RawICData, function_);
   }
 
+  // Adding checks.
+
   // Adds one more class test to ICData. Length of 'classes' must be equal to
   // the number of arguments tested. Use only for num_args_tested > 1.
   void AddCheck(const GrowableArray<intptr_t>& class_ids,
                 const Function& target) const;
   // Adds sorted so that Smi is the first class-id. Use only for
   // num_args_tested == 1.
   void AddReceiverCheck(intptr_t receiver_class_id,
                         const Function& target) const;
+
+  // Retrieving checks.
+
   void GetCheckAt(intptr_t index,
                   GrowableArray<intptr_t>* class_ids,
                   Function* target) const;
-  void GetOneClassCheckAt(
-      int index, intptr_t* class_id, Function* target) const;
+  void GetOneClassCheckAt(intptr_t index,
+                          intptr_t* class_id,
+                          Function* target) const;
+  intptr_t GetReceiverClassIdAt(intptr_t index) const;
+  intptr_t GetClassIdAt(intptr_t index, intptr_t arg_nr) const;
 
-  intptr_t GetReceiverClassIdAt(intptr_t index) const;
   RawFunction* GetTargetAt(intptr_t index) const;
   RawFunction* GetTargetForReceiverClassId(intptr_t class_id) const;
 
-  // Returns this->raw() if num_args_tested == 1, otherwise returns a new
-  // ICData object containing only unique arg0 checks.
-  RawICData* AsUnaryClassChecks() const;
+  // Returns this->raw() if num_args_tested == 1 and arg_nr == 1, otherwise
+  // returns a new ICData object containing only unique arg_nr checks.
+  RawICData* AsUnaryClassChecksForArgNr(intptr_t arg_nr) const;
+  RawICData* AsUnaryClassChecks() const {
+    return AsUnaryClassChecksForArgNr(0);
+  }
 
   bool AllTargetsHaveSameOwner(intptr_t owner_cid) const;
   bool AllReceiversAreNumbers() const;
   bool HasOneTarget() const;
 
   static RawICData* New(const Function& caller_function,
                         const String& target_name,
                         intptr_t deopt_id,
                         intptr_t num_args_tested);
 
  private:
   RawArray* ic_data() const {
     return raw_ptr()->ic_data_;
   }
 
   void set_function(const Function& value) const;
   void set_target_name(const String& value) const;
   void set_deopt_id(intptr_t value) const;
   void set_num_args_tested(intptr_t value) const;
   void set_ic_data(const Array& value) const;
 
+  // Used in asserts to verify that a check is not added twice.
+  bool HasCheck(const GrowableArray<intptr_t>& cids) const;
+
   intptr_t TestEntryLength() const;
   void WriteSentinel() const;
 
   HEAP_OBJECT_IMPLEMENTATION(ICData, Object);
   friend class Class;
 };
 
 
 class SubtypeTestCache : public Object {
  public:
@@ skipping 2923 matching lines @@
     if (this->CharAt(i) != str.CharAt(begin_index + i)) {
       return false;
     }
   }
   return true;
 }
 
 }  // namespace dart
 
 #endif  // VM_OBJECT_H_