VM: Enable collection of unoptimized code for optimized functions.

runtime/vm/code_generator.cc

Index: runtime/vm/code_generator.cc
===================================================================
--- runtime/vm/code_generator.cc	(revision 44996)
+++ runtime/vm/code_generator.cc	(working copy)
@@ -1242,8 +1242,10 @@
     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(),
@@ -1573,7 +1575,7 @@
     // 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