Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(84)

Unified Diff: runtime/vm/object.h

Issue 2374273002: Fix a throw returning to a frame marked for lazy deopt that captures the stacktrace. (Closed)
Patch Set: . Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « runtime/vm/flow_graph_compiler_x64.cc ('k') | runtime/vm/object.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/object.h
diff --git a/runtime/vm/object.h b/runtime/vm/object.h
index a7b42bb3cd2b9ea37e01bb655e0a1c291f47cb69..3ce365b96662065012a4b1ecf914430e50fa86dd 100644
--- a/runtime/vm/object.h
+++ b/runtime/vm/object.h
@@ -4922,7 +4922,8 @@ class Code : public Object {
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;
@@ -4939,18 +4940,32 @@ class Code : public Object {
#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
}
« no previous file with comments | « runtime/vm/flow_graph_compiler_x64.cc ('k') | runtime/vm/object.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698