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

Unified Diff: runtime/vm/intermediate_language.h

Issue 12049039: Fix source position for stack traces with optimized top function. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: avoid default arguments by using pending_deoptimization_env_ Created 7 years, 11 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
Index: runtime/vm/intermediate_language.h
===================================================================
--- runtime/vm/intermediate_language.h (revision 17448)
+++ runtime/vm/intermediate_language.h (working copy)
@@ -518,6 +518,7 @@
friend class DoubleToSmiInstr;
friend class DoubleToDoubleInstr;
friend class InvokeMathCFunctionInstr;
+ friend class FlowGraphOptimizer;
intptr_t deopt_id_;
intptr_t lifetime_position_; // Position used by register allocator.
@@ -1397,7 +1398,7 @@
intptr_t token_pos() const { return token_pos_; }
- virtual bool CanDeoptimize() const { return false; }
+ virtual bool CanDeoptimize() const { return true; }
virtual bool HasSideEffect() const { return true; }
@@ -1418,7 +1419,7 @@
intptr_t token_pos() const { return token_pos_; }
- virtual bool CanDeoptimize() const { return false; }
+ virtual bool CanDeoptimize() const { return true; }
virtual bool HasSideEffect() const { return true; }
@@ -1895,7 +1896,7 @@
virtual void PrintOperandsTo(BufferFormatter* f) const;
- virtual bool CanDeoptimize() const { return false; }
+ virtual bool CanDeoptimize() const { return true; }
virtual bool HasSideEffect() const { return false; }
@@ -1942,7 +1943,7 @@
virtual void PrintOperandsTo(BufferFormatter* f) const;
- virtual bool CanDeoptimize() const { return false; }
+ virtual bool CanDeoptimize() const { return true; }
virtual bool HasSideEffect() const { return false; }
@@ -1984,7 +1985,7 @@
virtual void PrintOperandsTo(BufferFormatter* f) const;
- virtual bool CanDeoptimize() const { return false; }
+ virtual bool CanDeoptimize() const { return true; }
virtual bool HasSideEffect() const { return true; }
@@ -2214,7 +2215,9 @@
inline bool BranchInstr::CanDeoptimize() const {
- return comparison()->CanDeoptimize();
+ // Branches need a deoptimization info in checked mode if they
+ // can throw a type check error.
+ return comparison()->CanDeoptimize() || is_checked();
}
@@ -2862,7 +2865,7 @@
virtual void PrintOperandsTo(BufferFormatter* f) const;
- virtual bool CanDeoptimize() const { return false; }
+ virtual bool CanDeoptimize() const { return true; }
virtual bool HasSideEffect() const { return true; }
@@ -2939,7 +2942,7 @@
virtual void PrintOperandsTo(BufferFormatter* f) const;
- virtual bool CanDeoptimize() const { return false; }
+ virtual bool CanDeoptimize() const { return true; }
virtual bool HasSideEffect() const { return true; }
@@ -3156,7 +3159,7 @@
virtual void PrintOperandsTo(BufferFormatter* f) const;
- virtual bool CanDeoptimize() const { return false; }
+ virtual bool CanDeoptimize() const { return true; }
virtual bool HasSideEffect() const { return true; }
@@ -3305,7 +3308,7 @@
DECLARE_INSTRUCTION(CloneContext)
virtual RawAbstractType* CompileType() const;
- virtual bool CanDeoptimize() const { return false; }
+ virtual bool CanDeoptimize() const { return true; }
virtual bool HasSideEffect() const { return false; }
@@ -3905,7 +3908,7 @@
virtual intptr_t ArgumentCount() const { return 0; }
- virtual bool CanDeoptimize() const { return false; }
+ virtual bool CanDeoptimize() const { return true; }
virtual bool HasSideEffect() const { return false; }

Powered by Google App Engine
This is Rietveld 408576698