Fix a throw returning to a frame marked for lazy deopt that captures the stacktrace.

runtime/vm/object.h

 // 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.
 
 #ifndef VM_OBJECT_H_
 #define VM_OBJECT_H_
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "platform/utils.h"
@@ skipping 4904 matching lines @@
   int32_t GetPointerOffsetAt(int index) const {
     NoSafepointScope no_safepoint;
     return *PointerOffsetAddrAt(index);
   }
   TokenPosition GetTokenIndexOfPC(uword pc) const;
 
   enum {
     kInvalidPc = -1
   };
 
-  uword GetLazyDeoptPc() const;
+  uword GetLazyDeoptReturnPc() const;
+  uword GetLazyDeoptThrowPc() const;
 
   // Find pc, return 0 if not found.
   uword GetPcForDeoptId(intptr_t deopt_id, RawPcDescriptors::Kind kind) const;
   intptr_t GetDeoptIdForOsr(uword pc) const;
 
   const char* Name() const;
   const char* QualifiedName() const;
 
   int64_t compile_timestamp() const {
 #if defined(DART_PRECOMPILED_RUNTIME)
     return 0;
 #else
     return raw_ptr()->compile_timestamp_;
 #endif
   }
 
-  intptr_t lazy_deopt_pc_offset() const {
+  intptr_t lazy_deopt_return_pc_offset() const {
 #if defined(DART_PRECOMPILED_RUNTIME)
     return 0;
 #else
-    return raw_ptr()->lazy_deopt_pc_offset_;
+    return raw_ptr()->lazy_deopt_return_pc_offset_;
 #endif
   }
-  void set_lazy_deopt_pc_offset(intptr_t pc) const {
+  void set_lazy_deopt_return_pc_offset(intptr_t pc) const {
 #if defined(DART_PRECOMPILED_RUNTIME)
     UNREACHABLE();
 #else
-    StoreNonPointer(&raw_ptr()->lazy_deopt_pc_offset_, pc);
+    StoreNonPointer(&raw_ptr()->lazy_deopt_return_pc_offset_, pc);
+#endif
+  }
+  intptr_t lazy_deopt_throw_pc_offset() const {
+#if defined(DART_PRECOMPILED_RUNTIME)
+    return 0;
+#else
+    return raw_ptr()->lazy_deopt_throw_pc_offset_;
+#endif
+  }
+  void set_lazy_deopt_throw_pc_offset(intptr_t pc) const {
+#if defined(DART_PRECOMPILED_RUNTIME)
+    UNREACHABLE();
+#else
+    StoreNonPointer(&raw_ptr()->lazy_deopt_throw_pc_offset_, pc);
 #endif
   }
 
   bool IsAllocationStubCode() const;
   bool IsStubCode() const;
   bool IsFunctionCode() const;
 
   void DisableDartCode() const;
 
   void DisableStubCode() const;
@@ skipping 4035 matching lines @@
 
 inline void TypeArguments::SetHash(intptr_t value) const {
   // This is only safe because we create a new Smi, which does not cause
   // heap allocation.
   StoreSmi(&raw_ptr()->hash_, Smi::New(value));
 }
 
 }  // namespace dart
 
 #endif  // VM_OBJECT_H_