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

Unified Diff: runtime/vm/intermediate_language.h

Issue 16020013: Do not emit duplicate deoptimization entries for GotoInstr. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 7 years, 7 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/intermediate_language.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/intermediate_language.h
diff --git a/runtime/vm/intermediate_language.h b/runtime/vm/intermediate_language.h
index 683642f1a4b0614a40c7abd58378525f9ad248bb..19976f637e38d844dcaf72b05f3b35eea2b97ea8 100644
--- a/runtime/vm/intermediate_language.h
+++ b/runtime/vm/intermediate_language.h
@@ -642,7 +642,7 @@ class Instruction : public ZoneAllocated {
virtual Tag tag() const = 0;
intptr_t deopt_id() const {
- ASSERT(CanDeoptimize() || CanBeDeoptimizationTarget());
+ ASSERT(CanDeoptimize() || CanBecomeDeoptimizationTarget());
return deopt_id_;
}
@@ -846,10 +846,10 @@ FOR_EACH_INSTRUCTION(INSTRUCTION_TYPE_CHECK)
virtual void InheritDeoptTarget(Instruction* other);
bool NeedsEnvironment() const {
- return CanDeoptimize() || CanBeDeoptimizationTarget();
+ return CanDeoptimize() || CanBecomeDeoptimizationTarget();
}
- virtual bool CanBeDeoptimizationTarget() const {
+ virtual bool CanBecomeDeoptimizationTarget() const {
return false;
}
@@ -1152,7 +1152,7 @@ class BlockEntryInstr : public Instruction {
virtual intptr_t ArgumentCount() const { return 0; }
- virtual bool CanBeDeoptimizationTarget() const {
+ virtual bool CanBecomeDeoptimizationTarget() const {
// BlockEntry environment is copied to Goto and Branch instructions
// when we insert new blocks targeting this block.
return true;
@@ -1860,7 +1860,7 @@ class ReturnInstr : public TemplateInstruction<1> {
intptr_t token_pos() const { return token_pos_; }
Value* value() const { return inputs_[0]; }
- virtual bool CanBeDeoptimizationTarget() const {
+ virtual bool CanBecomeDeoptimizationTarget() const {
// Return instruction might turn into a Goto instruction after inlining.
// Every Goto must have an environment.
return true;
@@ -1940,7 +1940,7 @@ class GotoInstr : public TemplateInstruction<0> {
virtual intptr_t SuccessorCount() const;
virtual BlockEntryInstr* SuccessorAt(intptr_t index) const;
- virtual bool CanBeDeoptimizationTarget() const {
+ virtual bool CanBecomeDeoptimizationTarget() const {
// Goto instruction can be used as a deoptimization target when LICM
// hoists instructions out of the loop.
return true;
@@ -2016,7 +2016,7 @@ class BranchInstr : public ControlInstruction {
intptr_t InputCount() const;
Value* InputAt(intptr_t i) const;
virtual bool CanDeoptimize() const;
- virtual bool CanBeDeoptimizationTarget() const;
+ virtual bool CanBecomeDeoptimizationTarget() const;
virtual EffectSet Effects() const;
@@ -2762,8 +2762,8 @@ inline bool BranchInstr::CanDeoptimize() const {
}
-inline bool BranchInstr::CanBeDeoptimizationTarget() const {
- return comparison()->CanBeDeoptimizationTarget();
+inline bool BranchInstr::CanBecomeDeoptimizationTarget() const {
+ return comparison()->CanBecomeDeoptimizationTarget();
}
@@ -2811,7 +2811,7 @@ class StrictCompareInstr : public ComparisonInstr {
virtual void PrintOperandsTo(BufferFormatter* f) const;
- virtual bool CanBeDeoptimizationTarget() const {
+ virtual bool CanBecomeDeoptimizationTarget() const {
// StrictCompare can be merged into Branch and thus needs an environment.
return true;
}
« no previous file with comments | « runtime/vm/flow_graph_compiler_x64.cc ('k') | runtime/vm/intermediate_language.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698