Fix code invalidation for deferred code

runtime/vm/object.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/object.h"
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "vm/assembler.h"
 #include "vm/cpu.h"
@@ skipping 2430 matching lines @@
     for (intptr_t i = 0; i < code_objects.Length(); i++) {
       weak_property ^= code_objects.At(i);
       code ^= weak_property.key();
       if (code.IsNull()) {
         // Code was garbage collected already.
         continue;
       }
 
       function ^= code.function();
       // If function uses dependent code switch it to unoptimized.
-      if (function.CurrentCode() == code.raw()) {
+      if (code.is_optimized() && (function.CurrentCode() == code.raw())) {
         ReportSwitchingCode(code);
-        if (code.is_optimized()) {
-          function.SwitchToUnoptimizedCode();
-        } else {
-          function.ClearCode();
-        }
+        function.SwitchToUnoptimizedCode();
+      } else if (function.unoptimized_code() == code.raw()) {
+        ReportSwitchingCode(code);
+        function.ClearCode();
       }
     }
   }
 
  private:
   const Array& array_;
   DISALLOW_COPY_AND_ASSIGN(WeakCodeReferences);
 };
 
 
@@ skipping 6812 matching lines @@
   virtual void ReportDeoptimization(const Code& code) {
     // This gets called when the code object is on the stack
     // while nuking code that depends on a prefix. We don't expect
     // this to happen, so make sure we die loudly if we find
     // ourselves here.
     UNIMPLEMENTED();
   }
 
   virtual void ReportSwitchingCode(const Code& code) {
     if (FLAG_trace_deoptimization || FLAG_trace_deoptimization_verbose) {
-      OS::PrintErr("Prefix '%s': deleting code for function '%s'\n",
+      OS::PrintErr("Prefix '%s': deleting %s code for function '%s'\n",
         String::Handle(prefix_.name()).ToCString(),
+        code.is_optimized() ? "optimized" : "unoptimized",
         Function::Handle(code.function()).ToCString());
     }
   }
 
  private:
   const LibraryPrefix& prefix_;
   DISALLOW_COPY_AND_ASSIGN(PrefixDependentArray);
 };
 
 
@@ skipping 8915 matching lines @@
   return "_MirrorReference";
 }
 
 
 void MirrorReference::PrintToJSONStream(JSONStream* stream, bool ref) const {
   Instance::PrintToJSONStream(stream, ref);
 }
 
 
 }  // namespace dart