Version 1.5.0-dev.4.5

dart/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 2505 matching lines @@
       } else if (function.unoptimized_code() == code.raw()) {
         ReportSwitchingCode(code);
         // Remove the code object from the function. The next time the
         // function is invoked, it will be compiled again.
         function.ClearCode();
         // Invalidate the old code object so existing references to it
         // (from optimized code) will fail when invoked.
         if (!CodePatcher::IsEntryPatched(code)) {
           CodePatcher::PatchEntry(code);
         }
+      } else if (!function.HasCode() && (code.GetEntryPatchPc() != 0)) {
+        // The code has already been disconnected, make it invalid. Do not
+        // bother with OSR compiled code that has no valid entry-patch.
+        ReportSwitchingCode(code);
+        if (!CodePatcher::IsEntryPatched(code)) {
+          CodePatcher::PatchEntry(code);
+        }
       }
     }
   }
 
  private:
   const Array& array_;
   DISALLOW_COPY_AND_ASSIGN(WeakCodeReferences);
 };
 
 
@@ skipping 7586 matching lines @@
     result ^= raw;
     result.SetLength(num_descriptors);
   }
   return result.raw();
 }
 
 
 const char* PcDescriptors::KindAsStr(intptr_t index) const {
   switch (DescriptorKind(index)) {
     case PcDescriptors::kDeopt:           return "deopt        ";
-    case PcDescriptors::kEntryPatch:      return "entry-patch  ";
-    case PcDescriptors::kPatchCode:       return "patch        ";
-    case PcDescriptors::kLazyDeoptJump:   return "lazy-deopt   ";
     case PcDescriptors::kIcCall:          return "ic-call      ";
     case PcDescriptors::kOptStaticCall:   return "opt-call     ";
     case PcDescriptors::kUnoptStaticCall: return "unopt-call   ";
     case PcDescriptors::kClosureCall:     return "closure-call ";
     case PcDescriptors::kReturn:          return "return       ";
     case PcDescriptors::kRuntimeCall:     return "runtime-call ";
     case PcDescriptors::kOsrEntry:        return "osr-entry    ";
     case PcDescriptors::kOther:           return "other        ";
   }
   UNREACHABLE();
@@ skipping 1466 matching lines @@
   {
     uword size = Code::InstanceSize(pointer_offsets_length);
     RawObject* raw = Object::Allocate(Code::kClassId, size, Heap::kOld);
     NoGCScope no_gc;
     result ^= raw;
     result.set_pointer_offsets_length(pointer_offsets_length);
     result.set_is_optimized(false);
     result.set_is_alive(false);
     result.set_comments(Comments::New(0));
     result.set_compile_timestamp(0);
+    result.set_entry_patch_pc_offset(kInvalidPc);
+    result.set_patch_code_pc_offset(kInvalidPc);
+    result.set_lazy_deopt_pc_offset(kInvalidPc);
     result.set_pc_descriptors(Object::empty_descriptors());
   }
   return result.raw();
 }
 
 
 RawCode* Code::FinalizeCode(const char* name,
                             Assembler* assembler,
                             bool optimized) {
   ASSERT(assembler != NULL);
@@ skipping 259 matching lines @@
     }
   }
   const PcDescriptors& descriptors = PcDescriptors::Handle(pc_descriptors());
   if (!descriptors.IsNull()) {
     JSONObject desc(&jsobj, "descriptors");
     descriptors.PrintToJSONObject(&desc);
   }
 }
 
 
+uword Code::GetEntryPatchPc() const {
+  return (entry_patch_pc_offset() != kInvalidPc)
+      ? EntryPoint() + entry_patch_pc_offset() : 0;
+}
+
+
 uword Code::GetPatchCodePc() const {
-  const PcDescriptors& descriptors = PcDescriptors::Handle(pc_descriptors());
-  return descriptors.GetPcForKind(PcDescriptors::kPatchCode);
+  return (patch_code_pc_offset() != kInvalidPc)
+      ? EntryPoint() + patch_code_pc_offset() : 0;
 }
 
 
 uword Code::GetLazyDeoptPc() const {
-  const PcDescriptors& descriptors = PcDescriptors::Handle(pc_descriptors());
-  return descriptors.GetPcForKind(PcDescriptors::kLazyDeoptJump);
+  return (lazy_deopt_pc_offset() != kInvalidPc)
+      ? EntryPoint() + lazy_deopt_pc_offset() : 0;
 }
 
 
 bool Code::ObjectExistsInArea(intptr_t start_offset,
                               intptr_t end_offset) const {
   for (intptr_t i = 0; i < this->pointer_offsets_length(); i++) {
     const intptr_t offset = this->GetPointerOffsetAt(i);
     if ((start_offset <= offset) && (offset < end_offset)) {
       return false;
     }
@@ skipping 7064 matching lines @@
   return tag_label.ToCString();
 }
 
 
 void UserTag::PrintJSONImpl(JSONStream* stream, bool ref) const {
   Instance::PrintJSONImpl(stream, ref);
 }
 
 
 }  // namespace dart