Finish implementing lazy deoptimization (ia32, x64). Ran tests with --deoptimize-alot.

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/bigint_operations.h"
@@ skipping 6855 matching lines @@
     NoGCScope no_gc;
     result ^= raw;
     result.SetLength(num_descriptors);
   }
   return result.raw();
 }
 
 
 const char* PcDescriptors::KindAsStr(intptr_t index) const {
   switch (DescriptorKind(index)) {
-    case PcDescriptors::kDeoptBefore: return "deopt-before ";
-    case PcDescriptors::kDeoptAfter:  return "deopt-after  ";
-    case PcDescriptors::kDeoptIndex:  return "deopt-ix     ";
-    case PcDescriptors::kPatchCode:   return "patch        ";
-    case PcDescriptors::kIcCall:      return "ic-call      ";
-    case PcDescriptors::kFuncCall:    return "fn-call      ";
-    case PcDescriptors::kReturn:      return "return       ";
-    case PcDescriptors::kOther:       return "other        ";
+    case PcDescriptors::kDeoptBefore:   return "deopt-before ";
+    case PcDescriptors::kDeoptAfter:    return "deopt-after  ";
+    case PcDescriptors::kDeoptIndex:    return "deopt-ix     ";
+    case PcDescriptors::kPatchCode:     return "patch        ";
+    case PcDescriptors::kLazyDeoptJump: return "lazy         ";

[siva, 2012/09/07 23:16:17]

why not make it "lazy-deopt"
would be more explicit than just "lazy"

[srdjan, 2012/09/12 06:15:26]

Done.

+    case PcDescriptors::kIcCall:        return "ic-call      ";
+    case PcDescriptors::kFuncCall:      return "fn-call      ";
+    case PcDescriptors::kReturn:        return "return       ";
+    case PcDescriptors::kOther:         return "other        ";
   }
   UNREACHABLE();
   return "";
 }
 
 
 void PcDescriptors::PrintHeaderString() {
   // 4 bits per hex digit + 2 for "0x".
   const int addr_width = (kBitsPerWord / 4) + 2;
   // "*" in a printf format specifier tells it to read the field width from
@@ skipping 77 matching lines @@
         if (deopt_id != Isolate::kNoDeoptId) {
           ASSERT(DeoptId(k) != deopt_id);
         }
       }
     }
   }
 #endif  // DEBUG
 }
 
 
+uword PcDescriptors::GetPcForKind(Kind kind) const {
+  for (intptr_t i = 0; i < Length(); i++) {
+    if (DescriptorKind(i) == kind) {
+      return PC(i);
+    }
+  }
+  return 0;
+}
+
+
 void Stackmap::SetCode(const dart::Code& code) const {
   StorePointer(&raw_ptr()->code_, code.raw());
 }
 
 
 bool Stackmap::GetBit(intptr_t bit_index) const {
   ASSERT(InRange(bit_index));
   int byte_index = bit_index >> kBitsPerByteLog2;
   int bit_remainder = bit_index & (kBitsPerByte - 1);
   uint8_t byte_mask = 1U << bit_remainder;
@@ skipping 548 matching lines @@
   const char* kFormat = "Code entry:0x%d";
   intptr_t len = OS::SNPrint(NULL, 0, kFormat, EntryPoint()) + 1;
   char* chars = Isolate::Current()->current_zone()->Alloc<char>(len);
   OS::SNPrint(chars, len, kFormat, EntryPoint());
   return chars;
 }
 
 
 uword Code::GetPatchCodePc() const {
   const PcDescriptors& descriptors = PcDescriptors::Handle(pc_descriptors());
-  for (intptr_t i = 0; i < descriptors.Length(); i++) {
-    if (descriptors.DescriptorKind(i) == PcDescriptors::kPatchCode) {
-      return descriptors.PC(i);
-    }
-  }
-  return 0;
+  return descriptors.GetPcForKind(PcDescriptors::kPatchCode);
+}
+
+
+uword Code::GetLazyDeoptPc() const {
+  const PcDescriptors& descriptors = PcDescriptors::Handle(pc_descriptors());
+  return descriptors.GetPcForKind(PcDescriptors::kLazyDeoptJump);
 }
 
 
 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 3849 matching lines @@
   }
   return result.raw();
 }
 
 
 const char* WeakProperty::ToCString() const {
   return "_WeakProperty";
 }
 
 }  // namespace dart