Propagate ICData from unoptimized code to instance calls in optimized code.

runtime/vm/isolate.cc

 // 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.
 
 #include "vm/isolate.h"
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "lib/mirrors.h"
 #include "vm/compiler_stats.h"
@@ skipping 293 matching lines @@
     return 0;  // No interrupt was requested.
   }
   uword interrupt_bits = stack_limit_ & kInterruptsMask;
   stack_limit_ = saved_stack_limit_;
   return interrupt_bits;
 }
 
 
 ICData* Isolate::GetICDataForDeoptId(intptr_t deopt_id) const {
   if (ic_data_array() == Array::null()) {
-    return NULL;
+    return &ICData::ZoneHandle();
   }
   const Array& array_handle = Array::Handle(ic_data_array());
   if (deopt_id >= array_handle.Length()) {
     // For computations being added in the optimizing compiler.
-    return NULL;
+    return &ICData::ZoneHandle();
   }
   ICData& ic_data_handle = ICData::ZoneHandle();
   ic_data_handle ^= array_handle.At(deopt_id);
   return &ic_data_handle;
 }
 
 
 static int MostUsedFunctionFirst(const Function* const* a,
                                  const Function* const* b) {
   if ((*a)->usage_counter() > (*b)->usage_counter()) {
@@ skipping 163 matching lines @@
 
 
 void Isolate::VisitWeakPersistentHandles(HandleVisitor* visitor,
                                          bool visit_prologue_weak_handles) {
   if (api_state() != NULL) {
     api_state()->VisitWeakHandles(visitor, visit_prologue_weak_handles);
   }
 }
 
 }  // namespace dart