VM: Enable collection of unoptimized code for optimized functions.

runtime/vm/code_generator.cc

 // Copyright (c) 2013, 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/code_generator.h"
 
 #include "vm/assembler.h"
 #include "vm/ast.h"
 #include "vm/code_patcher.h"
 #include "vm/compiler.h"
@@ skipping 1224 matching lines @@
     const Function& function = Function::Handle(code.function());
     ASSERT(!function.IsNull());
     // Since the code is referenced from the frame and the ZoneHandle,
     // it cannot have been removed from the function.
     ASSERT(function.HasCode());
     // Don't do OSR on intrinsified functions: The intrinsic code expects to be
     // called like a regular function and can't be entered via OSR.
     if (!CanOptimizeFunction(function, isolate) || function.is_intrinsic()) {
       return;
     }
+    ASSERT(function.unoptimized_code() != Object::null());
     intptr_t osr_id =
         Code::Handle(function.unoptimized_code()).GetDeoptIdForOsr(frame->pc());
+    ASSERT(osr_id != Isolate::kNoDeoptId);
     if (FLAG_trace_osr) {
       OS::Print("Attempting OSR for %s at id=%" Pd ", count=%" Pd "\n",
                 function.ToFullyQualifiedCString(),
                 osr_id,
                 function.usage_counter());
     }
 
     const Code& original_code = Code::Handle(function.CurrentCode());
     // Since the code is referenced from the frame and the ZoneHandle,
     // it cannot have been removed from the function.
@@ skipping 309 matching lines @@
     const Code& code = Code::Handle(deopt_context->code());
 
     // The code from our frame.
     const Code& optimized_code = Code::Handle(caller_frame->LookupDartCode());
     const Function& function = Function::Handle(optimized_code.function());
     ASSERT(!function.IsNull());
 
     // The code will be the same as before.
     ASSERT(code.raw() == optimized_code.raw());
 
-    // Some sanity checking of the optimized/unoptimized code.
+    // Some sanity checking of the optimized code.
     ASSERT(!optimized_code.IsNull() && optimized_code.is_optimized());
   }
 #endif
 
   // TODO(turnidge): Compute the start of the dest frame in the
   // DeoptContext instead of passing it in here.
   intptr_t* start = reinterpret_cast<intptr_t*>(
       caller_frame->sp() - (kDartFrameFixedSize * kWordSize));
   deopt_context->set_dest_frame(start);
   deopt_context->FillDestFrame();
@@ skipping 85 matching lines @@
   const intptr_t elm_size = old_data.ElementSizeInBytes();
   const TypedData& new_data =
       TypedData::Handle(TypedData::New(cid, new_size, Heap::kOld));
   TypedData::Copy(new_data, 0, old_data, 0, old_size * elm_size);
   typed_data_cell.SetAt(0, new_data);
   arguments.SetReturn(new_data);
 }
 
 
 }  // namespace dart