Chromium Code Reviews Chromium Code Reviews
Issue 661783003:
IR refactoring: reduce duplication related to MayThrow/AllowsCSE. (Closed)
Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart| Index: runtime/vm/intermediate_language.h |
| diff --git a/runtime/vm/intermediate_language.h b/runtime/vm/intermediate_language.h |
| index d312a8e171e51991a6ce3491c9fa3a284caee022..38c385f7e82cd8b8cf4ffcbce29484a74970dbf3 100644 |
| --- a/runtime/vm/intermediate_language.h |
| +++ b/runtime/vm/intermediate_language.h |
| @@ -876,15 +876,55 @@ FOR_EACH_ABSTRACT_INSTRUCTION(INSTRUCTION_TYPE_CHECK) |
| }; |
| -template<intptr_t N> |
| -class TemplateInstruction: public Instruction { |
| +class PureInstruction : public Instruction { |
| public: |
| - explicit TemplateInstruction<N>(intptr_t deopt_id = Isolate::kNoDeoptId) |
| - : Instruction(deopt_id), inputs_() { } |
| + explicit PureInstruction(intptr_t deopt_id) |
| + : Instruction(deopt_id) { } |
| + |
| + virtual bool AllowsCSE() const { return true; } |
| + virtual EffectSet Dependencies() const { return EffectSet::None(); } |
| + |
| + virtual EffectSet Effects() const { return EffectSet::None(); } |
| +}; |
| + |
| + |
| +// Types to be used as ThrowsTrait for TemplateInstruction/TemplateDefinition. |
| +struct Throws { |
| + static const bool kCanThrow = true; |
| +}; |
| + |
| + |
| +struct NoThrow { |
| + static const bool kCanThrow = false; |
| +}; |
| + |
| + |
| +// Types to be used as CSETrait for TemplateInstruction/TemplateDefinition. |
| +template<typename DefaultBase, typename PureBase> |
|
Florian Schneider
2014/10/24 14:35:06
I'd add a comment here what Pure means in this con
Vyacheslav Egorov (Google)
2014/10/24 14:59:54
Done.
|
| +struct Pure { |
| + typedef PureBase Base; |
| +}; |
| + |
| + |
| +template<typename DefaultBase, typename PureBase> |
| +struct NoCSE { |
| + typedef DefaultBase Base; |
| +}; |
| + |
| + |
| +template<intptr_t N, |
| + typename ThrowsTrait, |
| + template<typename Default, typename Pure> class CSETrait = NoCSE> |
| +class TemplateInstruction: public CSETrait<Instruction, PureInstruction>::Base { |
| + public: |
| + explicit TemplateInstruction(intptr_t deopt_id = Isolate::kNoDeoptId) |
| + : CSETrait<Instruction, PureInstruction>::Base(deopt_id), inputs_() { } |
| virtual intptr_t InputCount() const { return N; } |
| virtual Value* InputAt(intptr_t i) const { return inputs_[i]; } |
| + virtual bool MayThrow() const { return ThrowsTrait::kCanThrow; } |
| + |
| protected: |
| EmbeddedArray<Value*, N> inputs_; |
| @@ -953,7 +993,7 @@ class MoveOperands : public ZoneAllocated { |
| }; |
| -class ParallelMoveInstr : public TemplateInstruction<0> { |
| +class ParallelMoveInstr : public TemplateInstruction<0, NoThrow> { |
| public: |
| ParallelMoveInstr() : moves_(4) { } |
| @@ -987,8 +1027,6 @@ class ParallelMoveInstr : public TemplateInstruction<0> { |
| virtual void PrintTo(BufferFormatter* f) const; |
| - virtual bool MayThrow() const { return false; } |
| - |
| private: |
| GrowableArray<MoveOperands*> moves_; // Elements cannot be null. |
| @@ -1742,15 +1780,31 @@ inline void Value::BindToEnvironment(Definition* def) { |
| } |
| -template<intptr_t N> |
| -class TemplateDefinition : public Definition { |
| +class PureDefinition : public Definition { |
| + public: |
| + explicit PureDefinition(intptr_t deopt_id) |
| + : Definition(deopt_id) { } |
| + |
| + virtual bool AllowsCSE() const { return true; } |
| + virtual EffectSet Dependencies() const { return EffectSet::None(); } |
| + |
| + virtual EffectSet Effects() const { return EffectSet::None(); } |
| +}; |
| + |
| + |
| +template<intptr_t N, |
| + typename ThrowsTrait, |
| + template<typename Impure, typename Pure> class CSETrait = NoCSE> |
| +class TemplateDefinition : public CSETrait<Definition, PureDefinition>::Base { |
| public: |
| - explicit TemplateDefinition<N>(intptr_t deopt_id = Isolate::kNoDeoptId) |
| - : Definition(deopt_id), inputs_() { } |
| + explicit TemplateDefinition(intptr_t deopt_id = Isolate::kNoDeoptId) |
| + : CSETrait<Definition, PureDefinition>::Base(deopt_id), inputs_() { } |
| virtual intptr_t InputCount() const { return N; } |
| virtual Value* InputAt(intptr_t i) const { return inputs_[i]; } |
| + virtual bool MayThrow() const { return ThrowsTrait::kCanThrow; } |
| + |
| protected: |
| EmbeddedArray<Value*, N> inputs_; |
| @@ -1923,7 +1977,7 @@ class ParameterInstr : public Definition { |
| }; |
| -class PushArgumentInstr : public TemplateDefinition<1> { |
| +class PushArgumentInstr : public TemplateDefinition<1, NoThrow> { |
| public: |
| explicit PushArgumentInstr(Value* value) { |
| SetInputAt(0, value); |
| @@ -1943,8 +1997,6 @@ class PushArgumentInstr : public TemplateDefinition<1> { |
| virtual void PrintOperandsTo(BufferFormatter* f) const; |
| - virtual bool MayThrow() const { return false; } |
| - |
| private: |
| DISALLOW_COPY_AND_ASSIGN(PushArgumentInstr); |
| }; |
| @@ -1955,10 +2007,10 @@ inline Definition* Instruction::ArgumentAt(intptr_t index) const { |
| } |
| -class ReturnInstr : public TemplateInstruction<1> { |
| +class ReturnInstr : public TemplateInstruction<1, NoThrow> { |
| public: |
| ReturnInstr(intptr_t token_pos, Value* value) |
| - : TemplateInstruction<1>(Isolate::Current()->GetNextDeoptId()), |
| + : TemplateInstruction(Isolate::Current()->GetNextDeoptId()), |
| token_pos_(token_pos) { |
| SetInputAt(0, value); |
| } |
| @@ -1980,8 +2032,6 @@ class ReturnInstr : public TemplateInstruction<1> { |
| virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual bool MayThrow() const { return false; } |
| - |
| private: |
| const intptr_t token_pos_; |
| @@ -1989,10 +2039,10 @@ class ReturnInstr : public TemplateInstruction<1> { |
| }; |
| -class ThrowInstr : public TemplateInstruction<0> { |
| +class ThrowInstr : public TemplateInstruction<0, Throws> { |
| public: |
| explicit ThrowInstr(intptr_t token_pos) |
| - : TemplateInstruction<0>(Isolate::Current()->GetNextDeoptId()), |
| + : TemplateInstruction(Isolate::Current()->GetNextDeoptId()), |
| token_pos_(token_pos) { |
| } |
| @@ -2006,8 +2056,6 @@ class ThrowInstr : public TemplateInstruction<0> { |
| virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual bool MayThrow() const { return true; } |
| - |
| private: |
| const intptr_t token_pos_; |
| @@ -2015,12 +2063,12 @@ class ThrowInstr : public TemplateInstruction<0> { |
| }; |
| -class ReThrowInstr : public TemplateInstruction<0> { |
| +class ReThrowInstr : public TemplateInstruction<0, Throws> { |
| public: |
| // 'catch_try_index' can be CatchClauseNode::kInvalidTryIndex if the |
| // rethrow has been artifically generated by the parser. |
| ReThrowInstr(intptr_t token_pos, intptr_t catch_try_index) |
| - : TemplateInstruction<0>(Isolate::Current()->GetNextDeoptId()), |
| + : TemplateInstruction(Isolate::Current()->GetNextDeoptId()), |
| token_pos_(token_pos), |
| catch_try_index_(catch_try_index) { |
| } |
| @@ -2036,8 +2084,6 @@ class ReThrowInstr : public TemplateInstruction<0> { |
| virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual bool MayThrow() const { return true; } |
| - |
| private: |
| const intptr_t token_pos_; |
| const intptr_t catch_try_index_; |
| @@ -2046,10 +2092,10 @@ class ReThrowInstr : public TemplateInstruction<0> { |
| }; |
| -class GotoInstr : public TemplateInstruction<0> { |
| +class GotoInstr : public TemplateInstruction<0, NoThrow> { |
| public: |
| explicit GotoInstr(JoinEntryInstr* entry) |
| - : TemplateInstruction<0>(Isolate::Current()->GetNextDeoptId()), |
| + : TemplateInstruction(Isolate::Current()->GetNextDeoptId()), |
| successor_(entry), |
| edge_weight_(0.0), |
| parallel_move_(NULL) { |
| @@ -2099,8 +2145,6 @@ class GotoInstr : public TemplateInstruction<0> { |
| virtual void PrintTo(BufferFormatter* f) const; |
| - virtual bool MayThrow() const { return false; } |
| - |
| private: |
| JoinEntryInstr* successor_; |
| double edge_weight_; |
| @@ -2111,7 +2155,7 @@ class GotoInstr : public TemplateInstruction<0> { |
| }; |
| -class ComparisonInstr : public TemplateDefinition<2> { |
| +class ComparisonInstr : public TemplateDefinition<2, NoThrow, Pure> { |
| public: |
| Value* left() const { return inputs_[0]; } |
| Value* right() const { return inputs_[1]; } |
| @@ -2142,6 +2186,12 @@ class ComparisonInstr : public TemplateDefinition<2> { |
| virtual bool CanBecomeDeoptimizationTarget() const { return true; } |
| virtual intptr_t DeoptimizationTarget() const { return GetDeoptId(); } |
| + virtual bool AttributesEqual(Instruction* other) const { |
| + ComparisonInstr* other_comparison = other->AsComparison(); |
| + return kind() == other_comparison->kind() && |
| + (operation_cid() == other_comparison->operation_cid()); |
| + } |
| + |
| DEFINE_INSTRUCTION_TYPE_CHECK(Comparison) |
| protected: |
| @@ -2150,7 +2200,7 @@ class ComparisonInstr : public TemplateDefinition<2> { |
| Value* left, |
| Value* right, |
| intptr_t deopt_id = Isolate::kNoDeoptId) |
| - : TemplateDefinition<2>(deopt_id), |
| + : TemplateDefinition(deopt_id), |
| token_pos_(token_pos), |
| kind_(kind), |
| operation_cid_(kIllegalCid) { |
| @@ -2278,7 +2328,7 @@ class BranchInstr : public Instruction { |
| }; |
| -class StoreContextInstr : public TemplateInstruction<1> { |
| +class StoreContextInstr : public TemplateInstruction<1, NoThrow> { |
| public: |
| explicit StoreContextInstr(Value* value) { |
| SetInputAt(kValuePos, value); |
| @@ -2298,17 +2348,15 @@ class StoreContextInstr : public TemplateInstruction<1> { |
| virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual bool MayThrow() const { return false; } |
| - |
| private: |
| DISALLOW_COPY_AND_ASSIGN(StoreContextInstr); |
| }; |
| -class DeoptimizeInstr : public TemplateInstruction<0> { |
| +class DeoptimizeInstr : public TemplateInstruction<0, NoThrow, Pure> { |
| public: |
| DeoptimizeInstr(ICData::DeoptReasonId deopt_reason, intptr_t deopt_id) |
| - : TemplateInstruction<0>(deopt_id), |
| + : TemplateInstruction(deopt_id), |
| deopt_reason_(deopt_reason) { |
| } |
| @@ -2316,15 +2364,10 @@ class DeoptimizeInstr : public TemplateInstruction<0> { |
| virtual bool CanDeoptimize() const { return true; } |
| - virtual bool AllowsCSE() const { return true; } |
| - virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual EffectSet Dependencies() const { return EffectSet::None(); } |
| virtual bool AttributesEqual(Instruction* other) const { |
| return true; |
| } |
| - virtual bool MayThrow() const { return false; } |
| - |
| DECLARE_INSTRUCTION(Deoptimize) |
| private: |
| @@ -2334,7 +2377,7 @@ class DeoptimizeInstr : public TemplateInstruction<0> { |
| }; |
| -class RedefinitionInstr : public TemplateDefinition<1> { |
| +class RedefinitionInstr : public TemplateDefinition<1, NoThrow> { |
| public: |
| explicit RedefinitionInstr(Value* value) { |
| SetInputAt(0, value); |
| @@ -2351,14 +2394,12 @@ class RedefinitionInstr : public TemplateDefinition<1> { |
| virtual EffectSet Dependencies() const { return EffectSet::None(); } |
| virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual bool MayThrow() const { return false; } |
| - |
| private: |
| DISALLOW_COPY_AND_ASSIGN(RedefinitionInstr); |
| }; |
| -class ConstraintInstr : public TemplateDefinition<1> { |
| +class ConstraintInstr : public TemplateDefinition<1, NoThrow> { |
| public: |
| ConstraintInstr(Value* value, Range* constraint) |
| : constraint_(constraint), |
| @@ -2379,8 +2420,6 @@ class ConstraintInstr : public TemplateDefinition<1> { |
| return false; |
| } |
| - virtual bool MayThrow() const { return false; } |
| - |
| virtual void PrintOperandsTo(BufferFormatter* f) const; |
| Value* value() const { return inputs_[0]; } |
| @@ -2406,7 +2445,7 @@ class ConstraintInstr : public TemplateDefinition<1> { |
| }; |
| -class ConstantInstr : public TemplateDefinition<0> { |
| +class ConstantInstr : public TemplateDefinition<0, NoThrow, Pure> { |
| public: |
| explicit ConstantInstr(const Object& value); |
| @@ -2423,13 +2462,8 @@ class ConstantInstr : public TemplateDefinition<0> { |
| virtual void InferRange(RangeAnalysis* analysis, Range* range); |
| - virtual bool AllowsCSE() const { return true; } |
| - virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual EffectSet Dependencies() const { return EffectSet::None(); } |
| virtual bool AttributesEqual(Instruction* other) const; |
| - virtual bool MayThrow() const { return false; } |
| - |
| private: |
| const Object& value_; |
| @@ -2462,7 +2496,7 @@ class UnboxedConstantInstr : public ConstantInstr { |
| }; |
| -class AssertAssignableInstr : public TemplateDefinition<3> { |
| +class AssertAssignableInstr : public TemplateDefinition<3, Throws, Pure> { |
| public: |
| AssertAssignableInstr(intptr_t token_pos, |
| Value* value, |
| @@ -2471,7 +2505,7 @@ class AssertAssignableInstr : public TemplateDefinition<3> { |
| const AbstractType& dst_type, |
| const String& dst_name, |
| intptr_t deopt_id) |
| - : TemplateDefinition<3>(deopt_id), |
| + : TemplateDefinition(deopt_id), |
| token_pos_(token_pos), |
| dst_type_(AbstractType::ZoneHandle(dst_type.raw())), |
| dst_name_(dst_name) { |
| @@ -2509,13 +2543,8 @@ class AssertAssignableInstr : public TemplateDefinition<3> { |
| virtual Definition* Canonicalize(FlowGraph* flow_graph); |
| - virtual bool AllowsCSE() const { return true; } |
| - virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual EffectSet Dependencies() const { return EffectSet::None(); } |
| virtual bool AttributesEqual(Instruction* other) const; |
| - virtual bool MayThrow() const { return true; } |
| - |
| private: |
| const intptr_t token_pos_; |
| AbstractType& dst_type_; |
| @@ -2525,10 +2554,10 @@ class AssertAssignableInstr : public TemplateDefinition<3> { |
| }; |
| -class AssertBooleanInstr : public TemplateDefinition<1> { |
| +class AssertBooleanInstr : public TemplateDefinition<1, Throws, Pure> { |
| public: |
| AssertBooleanInstr(intptr_t token_pos, Value* value) |
| - : TemplateDefinition<1>(Isolate::Current()->GetNextDeoptId()), |
| + : TemplateDefinition(Isolate::Current()->GetNextDeoptId()), |
| token_pos_(token_pos) { |
| SetInputAt(0, value); |
| } |
| @@ -2545,13 +2574,8 @@ class AssertBooleanInstr : public TemplateDefinition<1> { |
| virtual Definition* Canonicalize(FlowGraph* flow_graph); |
| - virtual bool AllowsCSE() const { return true; } |
| - virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual EffectSet Dependencies() const { return EffectSet::None(); } |
| virtual bool AttributesEqual(Instruction* other) const { return true; } |
| - virtual bool MayThrow() const { return true; } |
| - |
| private: |
| const intptr_t token_pos_; |
| @@ -2561,10 +2585,10 @@ class AssertBooleanInstr : public TemplateDefinition<1> { |
| // Denotes the current context, normally held in a register. This is |
| // a computation, not a value, because it's mutable. |
| -class CurrentContextInstr : public TemplateDefinition<0> { |
| +class CurrentContextInstr : public TemplateDefinition<0, NoThrow> { |
| public: |
| CurrentContextInstr() |
| - : TemplateDefinition<0>(Isolate::Current()->GetNextDeoptId()) { |
| + : TemplateDefinition(Isolate::Current()->GetNextDeoptId()) { |
| } |
| DECLARE_INSTRUCTION(CurrentContext) |
| @@ -2576,19 +2600,17 @@ class CurrentContextInstr : public TemplateDefinition<0> { |
| virtual EffectSet Dependencies() const { return EffectSet::None(); } |
| virtual bool AttributesEqual(Instruction* other) const { return true; } |
| - virtual bool MayThrow() const { return false; } |
| - |
| private: |
| DISALLOW_COPY_AND_ASSIGN(CurrentContextInstr); |
| }; |
| -class ClosureCallInstr : public TemplateDefinition<1> { |
| +class ClosureCallInstr : public TemplateDefinition<1, Throws> { |
| public: |
| ClosureCallInstr(Value* function, |
| ClosureCallNode* node, |
| ZoneGrowableArray<PushArgumentInstr*>* arguments) |
| - : TemplateDefinition<1>(Isolate::Current()->GetNextDeoptId()), |
| + : TemplateDefinition(Isolate::Current()->GetNextDeoptId()), |
| ast_node_(*node), |
| arguments_(arguments) { |
| SetInputAt(0, function); |
| @@ -2613,8 +2635,6 @@ class ClosureCallInstr : public TemplateDefinition<1> { |
| virtual EffectSet Effects() const { return EffectSet::All(); } |
| - virtual bool MayThrow() const { return true; } |
| - |
| private: |
| const ClosureCallNode& ast_node_; |
| ZoneGrowableArray<PushArgumentInstr*>* arguments_; |
| @@ -2623,7 +2643,7 @@ class ClosureCallInstr : public TemplateDefinition<1> { |
| }; |
| -class InstanceCallInstr : public TemplateDefinition<0> { |
| +class InstanceCallInstr : public TemplateDefinition<0, Throws> { |
| public: |
| InstanceCallInstr(intptr_t token_pos, |
| const String& function_name, |
| @@ -2632,7 +2652,7 @@ class InstanceCallInstr : public TemplateDefinition<0> { |
| const Array& argument_names, |
| intptr_t checked_argument_count, |
| const ZoneGrowableArray<const ICData*>& ic_data_array) |
| - : TemplateDefinition<0>(Isolate::Current()->GetNextDeoptId()), |
| + : TemplateDefinition(Isolate::Current()->GetNextDeoptId()), |
| ic_data_(NULL), |
| token_pos_(token_pos), |
| function_name_(function_name), |
| @@ -2688,8 +2708,6 @@ class InstanceCallInstr : public TemplateDefinition<0> { |
| virtual EffectSet Effects() const { return EffectSet::All(); } |
| - virtual bool MayThrow() const { return true; } |
| - |
| protected: |
| friend class FlowGraphOptimizer; |
| void set_ic_data(ICData* value) { ic_data_ = value; } |
| @@ -2707,12 +2725,12 @@ class InstanceCallInstr : public TemplateDefinition<0> { |
| }; |
| -class PolymorphicInstanceCallInstr : public TemplateDefinition<0> { |
| +class PolymorphicInstanceCallInstr : public TemplateDefinition<0, Throws> { |
| public: |
| PolymorphicInstanceCallInstr(InstanceCallInstr* instance_call, |
| const ICData& ic_data, |
| bool with_checks) |
| - : TemplateDefinition<0>(instance_call->deopt_id()), |
| + : TemplateDefinition(instance_call->deopt_id()), |
| instance_call_(instance_call), |
| ic_data_(ic_data), |
| with_checks_(with_checks) { |
| @@ -2747,8 +2765,6 @@ class PolymorphicInstanceCallInstr : public TemplateDefinition<0> { |
| virtual void PrintOperandsTo(BufferFormatter* f) const; |
| - virtual bool MayThrow() const { return true; } |
| - |
| private: |
| InstanceCallInstr* instance_call_; |
| const ICData& ic_data_; |
| @@ -2787,12 +2803,7 @@ class StrictCompareInstr : public ComparisonInstr { |
| bool needs_number_check() const { return needs_number_check_; } |
| void set_needs_number_check(bool value) { needs_number_check_ = value; } |
| - virtual bool AllowsCSE() const { return true; } |
| - virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual EffectSet Dependencies() const { return EffectSet::None(); } |
| - virtual bool AttributesEqual(Instruction* other) const; |
| - |
| - virtual bool MayThrow() const { return false; } |
| + bool AttributesEqual(Instruction* other) const; |
| private: |
| // True if the comparison must check for double, Mint or Bigint and |
| @@ -2824,16 +2835,13 @@ class TestSmiInstr : public ComparisonInstr { |
| return kTagged; |
| } |
| - virtual EffectSet Effects() const { return EffectSet::None(); } |
| - |
| - virtual bool MayThrow() const { return false; } |
| - |
| virtual void EmitBranchCode(FlowGraphCompiler* compiler, |
| BranchInstr* branch); |
| virtual Condition EmitComparisonCode(FlowGraphCompiler* compiler, |
| BranchLabels labels); |
| + |
|
Florian Schneider
2014/10/24 14:35:06
Remove extra \n.
Vyacheslav Egorov (Google)
2014/10/24 14:59:54
Done.
|
| private: |
| DISALLOW_COPY_AND_ASSIGN(TestSmiInstr); |
| }; |
| @@ -2876,12 +2884,6 @@ class TestCidsInstr : public ComparisonInstr { |
| return kTagged; |
| } |
| - virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual bool AllowsCSE() const { return true; } |
| - virtual EffectSet Dependencies() const { return EffectSet::None(); } |
| - |
| - virtual bool MayThrow() const { return false; } |
| - |
| virtual bool AttributesEqual(Instruction* other) const; |
| virtual void EmitBranchCode(FlowGraphCompiler* compiler, |
| @@ -2934,10 +2936,6 @@ class EqualityCompareInstr : public ComparisonInstr { |
| return kTagged; |
| } |
| - virtual EffectSet Effects() const { return EffectSet::None(); } |
| - |
| - virtual bool MayThrow() const { return false; } |
| - |
| private: |
| DISALLOW_COPY_AND_ASSIGN(EqualityCompareInstr); |
| }; |
| @@ -2979,12 +2977,6 @@ class RelationalOpInstr : public ComparisonInstr { |
| return kTagged; |
| } |
| - virtual EffectSet Effects() const { |
| - return EffectSet::None(); |
| - } |
| - |
| - virtual bool MayThrow() const { return false; } |
| - |
| private: |
| DISALLOW_COPY_AND_ASSIGN(RelationalOpInstr); |
| }; |
| @@ -3071,14 +3063,14 @@ class IfThenElseInstr : public Definition { |
| }; |
| -class StaticCallInstr : public TemplateDefinition<0> { |
| +class StaticCallInstr : public TemplateDefinition<0, Throws> { |
| public: |
| StaticCallInstr(intptr_t token_pos, |
| const Function& function, |
| const Array& argument_names, |
| ZoneGrowableArray<PushArgumentInstr*>* arguments, |
| const ZoneGrowableArray<const ICData*>& ic_data_array) |
| - : TemplateDefinition<0>(Isolate::Current()->GetNextDeoptId()), |
| + : TemplateDefinition(Isolate::Current()->GetNextDeoptId()), |
| ic_data_(NULL), |
| token_pos_(token_pos), |
| function_(function), |
| @@ -3142,8 +3134,6 @@ class StaticCallInstr : public TemplateDefinition<0> { |
| return is_known_list_constructor() || is_native_list_factory(); |
| } |
| - virtual bool MayThrow() const { return true; } |
| - |
| virtual AliasIdentity Identity() const { return identity_; } |
| virtual void SetIdentity(AliasIdentity identity) { identity_ = identity; } |
| @@ -3165,7 +3155,7 @@ class StaticCallInstr : public TemplateDefinition<0> { |
| }; |
| -class LoadLocalInstr : public TemplateDefinition<0> { |
| +class LoadLocalInstr : public TemplateDefinition<0, NoThrow> { |
| public: |
| explicit LoadLocalInstr(const LocalVariable& local) |
| : local_(local), is_last_(false) { } |
| @@ -3187,11 +3177,6 @@ class LoadLocalInstr : public TemplateDefinition<0> { |
| void mark_last() { is_last_ = true; } |
| bool is_last() const { return is_last_; } |
| - virtual bool MayThrow() const { |
| - UNREACHABLE(); |
| - return false; |
| - } |
| - |
| private: |
| const LocalVariable& local_; |
| bool is_last_; |
| @@ -3200,7 +3185,7 @@ class LoadLocalInstr : public TemplateDefinition<0> { |
| }; |
| -class PushTempInstr : public TemplateDefinition<1> { |
| +class PushTempInstr : public TemplateDefinition<1, NoThrow> { |
| public: |
| explicit PushTempInstr(Value* value) { |
| SetInputAt(0, value); |
| @@ -3219,11 +3204,6 @@ class PushTempInstr : public TemplateDefinition<1> { |
| return EffectSet::None(); |
| } |
| - virtual bool MayThrow() const { |
| - UNREACHABLE(); |
| - return false; |
| - } |
| - |
| private: |
| DISALLOW_COPY_AND_ASSIGN(PushTempInstr); |
| }; |
| @@ -3278,7 +3258,7 @@ class DropTempsInstr : public Definition { |
| }; |
| -class StoreLocalInstr : public TemplateDefinition<1> { |
| +class StoreLocalInstr : public TemplateDefinition<1, NoThrow> { |
| public: |
| StoreLocalInstr(const LocalVariable& local, Value* value) |
| : local_(local), is_dead_(false), is_last_(false) { |
| @@ -3306,11 +3286,6 @@ class StoreLocalInstr : public TemplateDefinition<1> { |
| return EffectSet::None(); |
| } |
| - virtual bool MayThrow() const { |
| - UNREACHABLE(); |
| - return false; |
| - } |
| - |
| private: |
| const LocalVariable& local_; |
| bool is_dead_; |
| @@ -3320,7 +3295,7 @@ class StoreLocalInstr : public TemplateDefinition<1> { |
| }; |
| -class NativeCallInstr : public TemplateDefinition<0> { |
| +class NativeCallInstr : public TemplateDefinition<0, Throws> { |
| public: |
| explicit NativeCallInstr(NativeBodyNode* node) |
| : ast_node_(*node) {} |
| @@ -3349,11 +3324,6 @@ class NativeCallInstr : public TemplateDefinition<0> { |
| virtual EffectSet Effects() const { return EffectSet::All(); } |
| - virtual bool MayThrow() const { |
| - UNREACHABLE(); |
| - return true; |
| - } |
| - |
| private: |
| const NativeBodyNode& ast_node_; |
| @@ -3361,7 +3331,7 @@ class NativeCallInstr : public TemplateDefinition<0> { |
| }; |
| -class DebugStepCheckInstr : public TemplateInstruction<0> { |
| +class DebugStepCheckInstr : public TemplateInstruction<0, NoThrow> { |
| public: |
| DebugStepCheckInstr(intptr_t token_pos, |
| RawPcDescriptors::Kind stub_kind) |
| @@ -3372,7 +3342,6 @@ class DebugStepCheckInstr : public TemplateInstruction<0> { |
| DECLARE_INSTRUCTION(DebugStepCheck) |
| virtual intptr_t token_pos() const { return token_pos_; } |
| - virtual bool MayThrow() const { return false; } |
| virtual bool CanDeoptimize() const { return false; } |
| virtual EffectSet Effects() const { return EffectSet::All(); } |
| virtual intptr_t ArgumentCount() const { return 0; } |
| @@ -3392,7 +3361,7 @@ enum StoreBarrierType { |
| }; |
| -class StoreInstanceFieldInstr : public TemplateDefinition<2> { |
| +class StoreInstanceFieldInstr : public TemplateDefinition<2, NoThrow> { |
| public: |
| StoreInstanceFieldInstr(const Field& field, |
| Value* instance, |
| @@ -3460,8 +3429,6 @@ class StoreInstanceFieldInstr : public TemplateDefinition<2> { |
| // are marked as having no side-effects. |
| virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual bool MayThrow() const { return false; } |
| - |
| bool IsUnboxedStore() const; |
| bool IsPotentialUnboxedStore() const; |
| @@ -3488,12 +3455,12 @@ class StoreInstanceFieldInstr : public TemplateDefinition<2> { |
| }; |
| -class GuardFieldInstr : public TemplateInstruction<1> { |
| +class GuardFieldInstr : public TemplateInstruction<1, NoThrow, Pure> { |
| public: |
| GuardFieldInstr(Value* value, |
| const Field& field, |
| intptr_t deopt_id) |
| - : TemplateInstruction<1>(deopt_id), |
| + : TemplateInstruction(deopt_id), |
| field_(field) { |
| SetInputAt(0, value); |
| } |
| @@ -3510,12 +3477,6 @@ class GuardFieldInstr : public TemplateInstruction<1> { |
| return true; |
| } |
| - virtual bool AllowsCSE() const { return true; } |
| - virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual EffectSet Dependencies() const { return EffectSet::None(); } |
| - |
| - virtual bool MayThrow() const { return false; } |
| - |
| virtual void PrintOperandsTo(BufferFormatter* f) const; |
| private: |
| @@ -3561,7 +3522,7 @@ class GuardFieldLengthInstr : public GuardFieldInstr { |
| }; |
| -class LoadStaticFieldInstr : public TemplateDefinition<1> { |
| +class LoadStaticFieldInstr : public TemplateDefinition<1, NoThrow> { |
| public: |
| explicit LoadStaticFieldInstr(Value* field_value) { |
| ASSERT(field_value->BindsToConstant()); |
| @@ -3584,14 +3545,12 @@ class LoadStaticFieldInstr : public TemplateDefinition<1> { |
| virtual EffectSet Dependencies() const; |
| virtual bool AttributesEqual(Instruction* other) const; |
| - virtual bool MayThrow() const { return false; } |
| - |
| private: |
| DISALLOW_COPY_AND_ASSIGN(LoadStaticFieldInstr); |
| }; |
| -class StoreStaticFieldInstr : public TemplateDefinition<1> { |
| +class StoreStaticFieldInstr : public TemplateDefinition<1, NoThrow> { |
| public: |
| StoreStaticFieldInstr(const Field& field, Value* value) |
| : field_(field) { |
| @@ -3618,8 +3577,6 @@ class StoreStaticFieldInstr : public TemplateDefinition<1> { |
| // are marked as having no side-effects. |
| virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual bool MayThrow() const { return false; } |
| - |
| private: |
| bool CanValueBeSmi() const { |
| const intptr_t cid = value()->Type()->ToNullableCid(); |
| @@ -3634,7 +3591,7 @@ class StoreStaticFieldInstr : public TemplateDefinition<1> { |
| }; |
| -class LoadIndexedInstr : public TemplateDefinition<2> { |
| +class LoadIndexedInstr : public TemplateDefinition<2, NoThrow> { |
| public: |
| LoadIndexedInstr(Value* array, |
| Value* index, |
| @@ -3642,7 +3599,7 @@ class LoadIndexedInstr : public TemplateDefinition<2> { |
| intptr_t class_id, |
| intptr_t deopt_id, |
| intptr_t token_pos) |
| - : TemplateDefinition<2>(deopt_id), |
| + : TemplateDefinition(deopt_id), |
| index_scale_(index_scale), |
| class_id_(class_id), |
| token_pos_(token_pos) { |
| @@ -3682,12 +3639,7 @@ class LoadIndexedInstr : public TemplateDefinition<2> { |
| virtual Representation representation() const; |
| virtual void InferRange(RangeAnalysis* analysis, Range* range); |
| - virtual bool AllowsCSE() const { return false; } |
| virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual EffectSet Dependencies() const; |
| - virtual bool AttributesEqual(Instruction* other) const; |
| - |
| - virtual bool MayThrow() const { return false; } |
| private: |
| const intptr_t index_scale_; |
| @@ -3698,7 +3650,7 @@ class LoadIndexedInstr : public TemplateDefinition<2> { |
| }; |
| -class StringFromCharCodeInstr : public TemplateDefinition<1> { |
| +class StringFromCharCodeInstr : public TemplateDefinition<1, NoThrow, Pure> { |
| public: |
| StringFromCharCodeInstr(Value* char_code, intptr_t cid) : cid_(cid) { |
| ASSERT(char_code != NULL); |
| @@ -3715,15 +3667,10 @@ class StringFromCharCodeInstr : public TemplateDefinition<1> { |
| virtual bool CanDeoptimize() const { return false; } |
| - virtual bool AllowsCSE() const { return true; } |
| - virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual EffectSet Dependencies() const { return EffectSet::None(); } |
| virtual bool AttributesEqual(Instruction* other) const { |
| return other->AsStringFromCharCode()->cid_ == cid_; |
| } |
| - virtual bool MayThrow() const { return false; } |
| - |
| private: |
| const intptr_t cid_; |
| @@ -3731,7 +3678,7 @@ class StringFromCharCodeInstr : public TemplateDefinition<1> { |
| }; |
| -class StringToCharCodeInstr : public TemplateDefinition<1> { |
| +class StringToCharCodeInstr : public TemplateDefinition<1, NoThrow, Pure> { |
| public: |
| StringToCharCodeInstr(Value* str, intptr_t cid) : cid_(cid) { |
| ASSERT(str != NULL); |
| @@ -3745,15 +3692,10 @@ class StringToCharCodeInstr : public TemplateDefinition<1> { |
| virtual bool CanDeoptimize() const { return false; } |
| - virtual bool AllowsCSE() const { return true; } |
| - virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual EffectSet Dependencies() const { return EffectSet::None(); } |
| virtual bool AttributesEqual(Instruction* other) const { |
| return other->AsStringToCharCode()->cid_ == cid_; |
| } |
| - virtual bool MayThrow() const { return false; } |
| - |
| private: |
| const intptr_t cid_; |
| @@ -3761,10 +3703,10 @@ class StringToCharCodeInstr : public TemplateDefinition<1> { |
| }; |
| -class StringInterpolateInstr : public TemplateDefinition<1> { |
| +class StringInterpolateInstr : public TemplateDefinition<1, Throws> { |
| public: |
| StringInterpolateInstr(Value* value, intptr_t token_pos) |
| - : TemplateDefinition<1>(Isolate::Current()->GetNextDeoptId()), |
| + : TemplateDefinition(Isolate::Current()->GetNextDeoptId()), |
| token_pos_(token_pos), |
| function_(Function::Handle()) { |
| SetInputAt(0, value); |
| @@ -3777,7 +3719,6 @@ class StringInterpolateInstr : public TemplateDefinition<1> { |
| // Issues a static call to Dart code which calls toString on objects. |
| virtual EffectSet Effects() const { return EffectSet::All(); } |
| virtual bool CanDeoptimize() const { return true; } |
| - virtual bool MayThrow() const { return true; } |
| const Function& CallFunction() const; |
| @@ -3793,7 +3734,7 @@ class StringInterpolateInstr : public TemplateDefinition<1> { |
| }; |
| -class StoreIndexedInstr : public TemplateDefinition<3> { |
| +class StoreIndexedInstr : public TemplateDefinition<3, NoThrow> { |
| public: |
| StoreIndexedInstr(Value* array, |
| Value* index, |
| @@ -3803,7 +3744,7 @@ class StoreIndexedInstr : public TemplateDefinition<3> { |
| intptr_t class_id, |
| intptr_t deopt_id, |
| intptr_t token_pos) |
| - : TemplateDefinition<3>(deopt_id), |
| + : TemplateDefinition(deopt_id), |
| emit_store_barrier_(emit_store_barrier), |
| index_scale_(index_scale), |
| class_id_(class_id), |
| @@ -3849,8 +3790,6 @@ class StoreIndexedInstr : public TemplateDefinition<3> { |
| virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual bool MayThrow() const { return false; } |
| - |
| private: |
| const StoreBarrierType emit_store_barrier_; |
| const intptr_t index_scale_; |
| @@ -3862,7 +3801,7 @@ class StoreIndexedInstr : public TemplateDefinition<3> { |
| // Note overrideable, built-in: value ? false : true. |
| -class BooleanNegateInstr : public TemplateDefinition<1> { |
| +class BooleanNegateInstr : public TemplateDefinition<1, NoThrow> { |
| public: |
| explicit BooleanNegateInstr(Value* value) { |
| SetInputAt(0, value); |
| @@ -3877,8 +3816,6 @@ class BooleanNegateInstr : public TemplateDefinition<1> { |
| virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual bool MayThrow() const { return false; } |
| - |
| virtual Definition* Canonicalize(FlowGraph* flow_graph); |
| private: |
| @@ -3886,7 +3823,7 @@ class BooleanNegateInstr : public TemplateDefinition<1> { |
| }; |
| -class InstanceOfInstr : public TemplateDefinition<3> { |
| +class InstanceOfInstr : public TemplateDefinition<3, Throws> { |
| public: |
| InstanceOfInstr(intptr_t token_pos, |
| Value* value, |
| @@ -3895,7 +3832,7 @@ class InstanceOfInstr : public TemplateDefinition<3> { |
| const AbstractType& type, |
| bool negate_result, |
| intptr_t deopt_id) |
| - : TemplateDefinition<3>(deopt_id), |
| + : TemplateDefinition(deopt_id), |
| token_pos_(token_pos), |
| type_(type), |
| negate_result_(negate_result) { |
| @@ -3922,8 +3859,6 @@ class InstanceOfInstr : public TemplateDefinition<3> { |
| virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual bool MayThrow() const { return true; } |
| - |
| private: |
| const intptr_t token_pos_; |
| Value* value_; |
| @@ -3936,7 +3871,7 @@ class InstanceOfInstr : public TemplateDefinition<3> { |
| }; |
| -class AllocateObjectInstr : public TemplateDefinition<0> { |
| +class AllocateObjectInstr : public TemplateDefinition<0, NoThrow> { |
| public: |
| AllocateObjectInstr(intptr_t token_pos, |
| const Class& cls, |
| @@ -3972,8 +3907,6 @@ class AllocateObjectInstr : public TemplateDefinition<0> { |
| virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual bool MayThrow() const { return false; } |
| - |
| virtual AliasIdentity Identity() const { return identity_; } |
| virtual void SetIdentity(AliasIdentity identity) { identity_ = identity; } |
| @@ -4077,12 +4010,12 @@ class MaterializeObjectInstr : public Definition { |
| }; |
| -class CreateArrayInstr : public TemplateDefinition<2> { |
| +class CreateArrayInstr : public TemplateDefinition<2, Throws> { |
| public: |
| CreateArrayInstr(intptr_t token_pos, |
| Value* element_type, |
| Value* num_elements) |
| - : TemplateDefinition<2>(Isolate::Current()->GetNextDeoptId()), |
| + : TemplateDefinition(Isolate::Current()->GetNextDeoptId()), |
| token_pos_(token_pos), |
| identity_(AliasIdentity::Unknown()) { |
| SetInputAt(kElementTypePos, element_type); |
| @@ -4107,9 +4040,6 @@ class CreateArrayInstr : public TemplateDefinition<2> { |
| virtual EffectSet Effects() const { return EffectSet::None(); } |
| - // OutOfMemoryError can be called. |
| - virtual bool MayThrow() const { return true; } |
| - |
| virtual AliasIdentity Identity() const { return identity_; } |
| virtual void SetIdentity(AliasIdentity identity) { identity_ = identity; } |
| @@ -4121,7 +4051,7 @@ class CreateArrayInstr : public TemplateDefinition<2> { |
| }; |
| -class LoadUntaggedInstr : public TemplateDefinition<1> { |
| +class LoadUntaggedInstr : public TemplateDefinition<1, NoThrow> { |
| public: |
| LoadUntaggedInstr(Value* object, intptr_t offset) : offset_(offset) { |
| SetInputAt(0, object); |
| @@ -4138,16 +4068,9 @@ class LoadUntaggedInstr : public TemplateDefinition<1> { |
| virtual bool CanDeoptimize() const { return false; } |
| - // This instruction must not be moved without the indexed access that |
| - // depends on it (e.g. out of loops). GC may cause collect |
| - // the array while the external data-array is still accessed. |
|
Florian Schneider
2014/10/24 14:35:06
This comment still is valid, so maybe preserve it.
Vyacheslav Egorov (Google)
2014/10/24 14:59:54
Done.
|
| - virtual bool AllowsCSE() const { return false; } |
| virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual EffectSet Dependencies() const { return EffectSet::None(); } |
| virtual bool AttributesEqual(Instruction* other) const { return true; } |
| - virtual bool MayThrow() const { return false; } |
| - |
| private: |
| intptr_t offset_; |
| @@ -4155,7 +4078,7 @@ class LoadUntaggedInstr : public TemplateDefinition<1> { |
| }; |
| -class LoadClassIdInstr : public TemplateDefinition<1> { |
| +class LoadClassIdInstr : public TemplateDefinition<1, NoThrow> { |
| public: |
| explicit LoadClassIdInstr(Value* object) { |
| SetInputAt(0, object); |
| @@ -4172,20 +4095,18 @@ class LoadClassIdInstr : public TemplateDefinition<1> { |
| virtual bool CanDeoptimize() const { return false; } |
| virtual bool AllowsCSE() const { return true; } |
| - virtual EffectSet Effects() const { return EffectSet::None(); } |
| virtual EffectSet Dependencies() const { |
| return EffectSet::Externalization(); |
| } |
| + virtual EffectSet Effects() const { return EffectSet::None(); } |
| virtual bool AttributesEqual(Instruction* other) const { return true; } |
| - virtual bool MayThrow() const { return false; } |
| - |
| private: |
| DISALLOW_COPY_AND_ASSIGN(LoadClassIdInstr); |
| }; |
| -class LoadFieldInstr : public TemplateDefinition<1> { |
| +class LoadFieldInstr : public TemplateDefinition<1, NoThrow> { |
| public: |
| LoadFieldInstr(Value* instance, |
| intptr_t offset_in_bytes, |
| @@ -4266,8 +4187,6 @@ class LoadFieldInstr : public TemplateDefinition<1> { |
| virtual EffectSet Dependencies() const; |
| virtual bool AttributesEqual(Instruction* other) const; |
| - virtual bool MayThrow() const { return false; } |
| - |
| private: |
| const intptr_t offset_in_bytes_; |
| const AbstractType& type_; |
| @@ -4282,13 +4201,13 @@ class LoadFieldInstr : public TemplateDefinition<1> { |
| }; |
| -class InstantiateTypeInstr : public TemplateDefinition<1> { |
| +class InstantiateTypeInstr : public TemplateDefinition<1, Throws> { |
| public: |
| InstantiateTypeInstr(intptr_t token_pos, |
| const AbstractType& type, |
| const Class& instantiator_class, |
| Value* instantiator) |
| - : TemplateDefinition<1>(Isolate::Current()->GetNextDeoptId()), |
| + : TemplateDefinition(Isolate::Current()->GetNextDeoptId()), |
| token_pos_(token_pos), |
| type_(type), |
| instantiator_class_(instantiator_class) { |
| @@ -4310,8 +4229,6 @@ class InstantiateTypeInstr : public TemplateDefinition<1> { |
| virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual bool MayThrow() const { return true; } |
| - |
| private: |
| const intptr_t token_pos_; |
| const AbstractType& type_; |
| @@ -4321,13 +4238,13 @@ class InstantiateTypeInstr : public TemplateDefinition<1> { |
| }; |
| -class InstantiateTypeArgumentsInstr : public TemplateDefinition<1> { |
| +class InstantiateTypeArgumentsInstr : public TemplateDefinition<1, Throws> { |
| public: |
| InstantiateTypeArgumentsInstr(intptr_t token_pos, |
| const TypeArguments& type_arguments, |
| const Class& instantiator_class, |
| Value* instantiator) |
| - : TemplateDefinition<1>(Isolate::Current()->GetNextDeoptId()), |
| + : TemplateDefinition(Isolate::Current()->GetNextDeoptId()), |
| token_pos_(token_pos), |
| type_arguments_(type_arguments), |
| instantiator_class_(instantiator_class) { |
| @@ -4350,8 +4267,6 @@ class InstantiateTypeArgumentsInstr : public TemplateDefinition<1> { |
| virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual bool MayThrow() const { return true; } |
| - |
| virtual Definition* Canonicalize(FlowGraph* flow_graph); |
| private: |
| @@ -4363,7 +4278,7 @@ class InstantiateTypeArgumentsInstr : public TemplateDefinition<1> { |
| }; |
| -class AllocateContextInstr : public TemplateDefinition<0> { |
| +class AllocateContextInstr : public TemplateDefinition<0, NoThrow> { |
| public: |
| AllocateContextInstr(intptr_t token_pos, |
| intptr_t num_context_variables) |
| @@ -4382,8 +4297,6 @@ class AllocateContextInstr : public TemplateDefinition<0> { |
| virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual bool MayThrow() const { return false; } |
| - |
| private: |
| const intptr_t token_pos_; |
| const intptr_t num_context_variables_; |
| @@ -4392,10 +4305,10 @@ class AllocateContextInstr : public TemplateDefinition<0> { |
| }; |
| -class InitStaticFieldInstr : public TemplateInstruction<1> { |
| +class InitStaticFieldInstr : public TemplateInstruction<1, Throws> { |
| public: |
| InitStaticFieldInstr(Value* input, const Field& field) |
| - : TemplateInstruction<1>(Isolate::Current()->GetNextDeoptId()), |
| + : TemplateInstruction(Isolate::Current()->GetNextDeoptId()), |
| field_(field) { |
| SetInputAt(0, input); |
| } |
| @@ -4408,7 +4321,6 @@ class InitStaticFieldInstr : public TemplateInstruction<1> { |
| virtual intptr_t ArgumentCount() const { return 0; } |
| virtual bool CanDeoptimize() const { return true; } |
| virtual EffectSet Effects() const { return EffectSet::All(); } |
| - virtual bool MayThrow() const { return true; } |
| virtual Instruction* Canonicalize(FlowGraph* flow_graph); |
| private: |
| @@ -4418,7 +4330,8 @@ class InitStaticFieldInstr : public TemplateInstruction<1> { |
| }; |
| -class AllocateUninitializedContextInstr : public TemplateDefinition<0> { |
| +class AllocateUninitializedContextInstr |
| + : public TemplateDefinition<0, NoThrow> { |
| public: |
| AllocateUninitializedContextInstr(intptr_t token_pos, |
| intptr_t num_context_variables) |
| @@ -4437,8 +4350,6 @@ class AllocateUninitializedContextInstr : public TemplateDefinition<0> { |
| virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual bool MayThrow() const { return false; } |
| - |
| private: |
| const intptr_t token_pos_; |
| const intptr_t num_context_variables_; |
| @@ -4447,10 +4358,10 @@ class AllocateUninitializedContextInstr : public TemplateDefinition<0> { |
| }; |
| -class CloneContextInstr : public TemplateDefinition<1> { |
| +class CloneContextInstr : public TemplateDefinition<1, NoThrow> { |
| public: |
| CloneContextInstr(intptr_t token_pos, Value* context_value) |
| - : TemplateDefinition<1>(Isolate::Current()->GetNextDeoptId()), |
| + : TemplateDefinition(Isolate::Current()->GetNextDeoptId()), |
| token_pos_(token_pos) { |
| SetInputAt(0, context_value); |
| } |
| @@ -4465,8 +4376,6 @@ class CloneContextInstr : public TemplateDefinition<1> { |
| virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual bool MayThrow() const { return false; } |
| - |
| private: |
| const intptr_t token_pos_; |
| @@ -4474,10 +4383,10 @@ class CloneContextInstr : public TemplateDefinition<1> { |
| }; |
| -class CheckEitherNonSmiInstr : public TemplateInstruction<2> { |
| +class CheckEitherNonSmiInstr : public TemplateInstruction<2, NoThrow, Pure> { |
| public: |
| CheckEitherNonSmiInstr(Value* left, Value* right, intptr_t deopt_id) |
| - : TemplateInstruction<2>(deopt_id), licm_hoisted_(false) { |
| + : TemplateInstruction(deopt_id), licm_hoisted_(false) { |
| SetInputAt(0, left); |
| SetInputAt(1, right); |
| } |
| @@ -4493,13 +4402,8 @@ class CheckEitherNonSmiInstr : public TemplateInstruction<2> { |
| virtual Instruction* Canonicalize(FlowGraph* flow_graph); |
| - virtual bool AllowsCSE() const { return true; } |
| - virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual EffectSet Dependencies() const { return EffectSet::None(); } |
| virtual bool AttributesEqual(Instruction* other) const { return true; } |
| - virtual bool MayThrow() const { return false; } |
| - |
| void set_licm_hoisted(bool value) { licm_hoisted_ = value; } |
| private: |
| @@ -4509,7 +4413,7 @@ class CheckEitherNonSmiInstr : public TemplateInstruction<2> { |
| }; |
| -class BoxDoubleInstr : public TemplateDefinition<1> { |
| +class BoxDoubleInstr : public TemplateDefinition<1, NoThrow, Pure> { |
| public: |
| explicit BoxDoubleInstr(Value* value) { |
| SetInputAt(0, value); |
| @@ -4531,13 +4435,8 @@ class BoxDoubleInstr : public TemplateDefinition<1> { |
| return kUnboxedDouble; |
| } |
| - virtual bool AllowsCSE() const { return true; } |
| - virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual EffectSet Dependencies() const { return EffectSet::None(); } |
| virtual bool AttributesEqual(Instruction* other) const { return true; } |
| - virtual bool MayThrow() const { return false; } |
| - |
| Definition* Canonicalize(FlowGraph* flow_graph); |
| private: |
| @@ -4545,7 +4444,7 @@ class BoxDoubleInstr : public TemplateDefinition<1> { |
| }; |
| -class BoxFloat32x4Instr : public TemplateDefinition<1> { |
| +class BoxFloat32x4Instr : public TemplateDefinition<1, NoThrow, Pure> { |
| public: |
| explicit BoxFloat32x4Instr(Value* value) { |
| SetInputAt(0, value); |
| @@ -4567,13 +4466,8 @@ class BoxFloat32x4Instr : public TemplateDefinition<1> { |
| DECLARE_INSTRUCTION(BoxFloat32x4) |
| virtual CompileType ComputeType() const; |
| - virtual bool AllowsCSE() const { return true; } |
| - virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual EffectSet Dependencies() const { return EffectSet::None(); } |
| virtual bool AttributesEqual(Instruction* other) const { return true; } |
| - virtual bool MayThrow() const { return false; } |
| - |
| Definition* Canonicalize(FlowGraph* flow_graph); |
| private: |
| @@ -4581,7 +4475,7 @@ class BoxFloat32x4Instr : public TemplateDefinition<1> { |
| }; |
| -class BoxFloat64x2Instr : public TemplateDefinition<1> { |
| +class BoxFloat64x2Instr : public TemplateDefinition<1, NoThrow, Pure> { |
| public: |
| explicit BoxFloat64x2Instr(Value* value) { |
| SetInputAt(0, value); |
| @@ -4603,13 +4497,8 @@ class BoxFloat64x2Instr : public TemplateDefinition<1> { |
| DECLARE_INSTRUCTION(BoxFloat64x2) |
| virtual CompileType ComputeType() const; |
| - virtual bool AllowsCSE() const { return true; } |
| - virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual EffectSet Dependencies() const { return EffectSet::None(); } |
| virtual bool AttributesEqual(Instruction* other) const { return true; } |
| - virtual bool MayThrow() const { return false; } |
| - |
| Definition* Canonicalize(FlowGraph* flow_graph); |
| private: |
| @@ -4618,7 +4507,7 @@ class BoxFloat64x2Instr : public TemplateDefinition<1> { |
| -class BoxInt32x4Instr : public TemplateDefinition<1> { |
| +class BoxInt32x4Instr : public TemplateDefinition<1, NoThrow, Pure> { |
| public: |
| explicit BoxInt32x4Instr(Value* value) { |
| SetInputAt(0, value); |
| @@ -4640,13 +4529,8 @@ class BoxInt32x4Instr : public TemplateDefinition<1> { |
| DECLARE_INSTRUCTION(BoxInt32x4) |
| virtual CompileType ComputeType() const; |
| - virtual bool AllowsCSE() const { return true; } |
| - virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual EffectSet Dependencies() const { return EffectSet::None(); } |
| virtual bool AttributesEqual(Instruction* other) const { return true; } |
| - virtual bool MayThrow() const { return false; } |
| - |
| Definition* Canonicalize(FlowGraph* flow_graph); |
| private: |
| @@ -4654,7 +4538,7 @@ class BoxInt32x4Instr : public TemplateDefinition<1> { |
| }; |
| -class BoxIntegerInstr : public TemplateDefinition<1> { |
| +class BoxIntegerInstr : public TemplateDefinition<1, NoThrow, Pure> { |
| public: |
| explicit BoxIntegerInstr(Value* value) : is_smi_(false) { |
| SetInputAt(0, value); |
| @@ -4682,13 +4566,8 @@ class BoxIntegerInstr : public TemplateDefinition<1> { |
| virtual void InferRange(RangeAnalysis* analysis, Range* range); |
| - virtual bool AllowsCSE() const { return true; } |
| - virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual EffectSet Dependencies() const { return EffectSet::None(); } |
| virtual bool AttributesEqual(Instruction* other) const { return true; } |
| - virtual bool MayThrow() const { return false; } |
| - |
| virtual Definition* Canonicalize(FlowGraph* flow_graph); |
| private: |
| @@ -4698,10 +4577,10 @@ class BoxIntegerInstr : public TemplateDefinition<1> { |
| }; |
| -class UnboxDoubleInstr : public TemplateDefinition<1> { |
| +class UnboxDoubleInstr : public TemplateDefinition<1, NoThrow, Pure> { |
| public: |
| UnboxDoubleInstr(Value* value, intptr_t deopt_id) |
| - : TemplateDefinition<1>(deopt_id) { |
| + : TemplateDefinition(deopt_id) { |
| SetInputAt(0, value); |
| } |
| @@ -4719,13 +4598,8 @@ class UnboxDoubleInstr : public TemplateDefinition<1> { |
| DECLARE_INSTRUCTION(UnboxDouble) |
| virtual CompileType ComputeType() const; |
| - virtual bool AllowsCSE() const { return true; } |
| - virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual EffectSet Dependencies() const { return EffectSet::None(); } |
| virtual bool AttributesEqual(Instruction* other) const { return true; } |
| - virtual bool MayThrow() const { return false; } |
| - |
| Definition* Canonicalize(FlowGraph* flow_graph); |
| private: |
| @@ -4733,10 +4607,10 @@ class UnboxDoubleInstr : public TemplateDefinition<1> { |
| }; |
| -class UnboxFloat32x4Instr : public TemplateDefinition<1> { |
| +class UnboxFloat32x4Instr : public TemplateDefinition<1, NoThrow, Pure> { |
| public: |
| UnboxFloat32x4Instr(Value* value, intptr_t deopt_id) |
| - : TemplateDefinition<1>(deopt_id) { |
| + : TemplateDefinition(deopt_id) { |
| SetInputAt(0, value); |
| } |
| @@ -4753,13 +4627,8 @@ class UnboxFloat32x4Instr : public TemplateDefinition<1> { |
| DECLARE_INSTRUCTION(UnboxFloat32x4) |
| virtual CompileType ComputeType() const; |
| - virtual bool AllowsCSE() const { return true; } |
| - virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual EffectSet Dependencies() const { return EffectSet::None(); } |
| virtual bool AttributesEqual(Instruction* other) const { return true; } |
| - virtual bool MayThrow() const { return false; } |
| - |
| Definition* Canonicalize(FlowGraph* flow_graph); |
| private: |
| @@ -4767,10 +4636,10 @@ class UnboxFloat32x4Instr : public TemplateDefinition<1> { |
| }; |
| -class UnboxFloat64x2Instr : public TemplateDefinition<1> { |
| +class UnboxFloat64x2Instr : public TemplateDefinition<1, NoThrow, Pure> { |
| public: |
| UnboxFloat64x2Instr(Value* value, intptr_t deopt_id) |
| - : TemplateDefinition<1>(deopt_id) { |
| + : TemplateDefinition(deopt_id) { |
| SetInputAt(0, value); |
| } |
| @@ -4787,13 +4656,8 @@ class UnboxFloat64x2Instr : public TemplateDefinition<1> { |
| DECLARE_INSTRUCTION(UnboxFloat64x2) |
| virtual CompileType ComputeType() const; |
| - virtual bool AllowsCSE() const { return true; } |
| - virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual EffectSet Dependencies() const { return EffectSet::None(); } |
| virtual bool AttributesEqual(Instruction* other) const { return true; } |
| - virtual bool MayThrow() const { return false; } |
| - |
| Definition* Canonicalize(FlowGraph* flow_graph); |
| private: |
| @@ -4801,10 +4665,10 @@ class UnboxFloat64x2Instr : public TemplateDefinition<1> { |
| }; |
| -class UnboxInt32x4Instr : public TemplateDefinition<1> { |
| +class UnboxInt32x4Instr : public TemplateDefinition<1, NoThrow, Pure> { |
| public: |
| UnboxInt32x4Instr(Value* value, intptr_t deopt_id) |
| - : TemplateDefinition<1>(deopt_id) { |
| + : TemplateDefinition(deopt_id) { |
| SetInputAt(0, value); |
| } |
| @@ -4818,16 +4682,11 @@ class UnboxInt32x4Instr : public TemplateDefinition<1> { |
| return kUnboxedInt32x4; |
| } |
| - virtual bool AllowsCSE() const { return true; } |
| - virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual EffectSet Dependencies() const { return EffectSet::None(); } |
| virtual bool AttributesEqual(Instruction* other) const { return true; } |
| DECLARE_INSTRUCTION(UnboxInt32x4) |
| virtual CompileType ComputeType() const; |
| - virtual bool MayThrow() const { return false; } |
| - |
| Definition* Canonicalize(FlowGraph* flow_graph); |
| private: |
| @@ -4835,10 +4694,10 @@ class UnboxInt32x4Instr : public TemplateDefinition<1> { |
| }; |
| -class UnboxIntegerInstr : public TemplateDefinition<1> { |
| +class UnboxIntegerInstr : public TemplateDefinition<1, NoThrow, Pure> { |
| public: |
| UnboxIntegerInstr(Value* value, intptr_t deopt_id) |
| - : TemplateDefinition<1>(deopt_id) { |
| + : TemplateDefinition(deopt_id) { |
| SetInputAt(0, value); |
| } |
| @@ -4860,13 +4719,8 @@ class UnboxIntegerInstr : public TemplateDefinition<1> { |
| DECLARE_INSTRUCTION(UnboxInteger) |
| virtual CompileType ComputeType() const; |
| - virtual bool AllowsCSE() const { return true; } |
| - virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual EffectSet Dependencies() const { return EffectSet::None(); } |
| virtual bool AttributesEqual(Instruction* other) const { return true; } |
| - virtual bool MayThrow() const { return false; } |
| - |
| virtual Definition* Canonicalize(FlowGraph* flow_graph); |
| private: |
| @@ -4874,7 +4728,7 @@ class UnboxIntegerInstr : public TemplateDefinition<1> { |
| }; |
| -class MathUnaryInstr : public TemplateDefinition<1> { |
| +class MathUnaryInstr : public TemplateDefinition<1, NoThrow, Pure> { |
| public: |
| enum MathUnaryKind { |
| kIllegal, |
| @@ -4884,7 +4738,7 @@ class MathUnaryInstr : public TemplateDefinition<1> { |
| kDoubleSquare, |
| }; |
| MathUnaryInstr(MathUnaryKind kind, Value* value, intptr_t deopt_id) |
| - : TemplateDefinition<1>(deopt_id), kind_(kind) { |
| + : TemplateDefinition(deopt_id), kind_(kind) { |
| SetInputAt(0, value); |
| } |
| @@ -4914,15 +4768,10 @@ class MathUnaryInstr : public TemplateDefinition<1> { |
| DECLARE_INSTRUCTION(MathUnary) |
| virtual CompileType ComputeType() const; |
| - virtual bool AllowsCSE() const { return true; } |
| - virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual EffectSet Dependencies() const { return EffectSet::None(); } |
| virtual bool AttributesEqual(Instruction* other) const { |
| return kind() == other->AsMathUnary()->kind(); |
| } |
| - virtual bool MayThrow() const { return false; } |
| - |
| Definition* Canonicalize(FlowGraph* flow_graph); |
| static const char* KindToCString(MathUnaryKind kind); |
| @@ -4935,14 +4784,14 @@ class MathUnaryInstr : public TemplateDefinition<1> { |
| // Represents Math's static min and max functions. |
| -class MathMinMaxInstr : public TemplateDefinition<2> { |
| +class MathMinMaxInstr : public TemplateDefinition<2, NoThrow, Pure> { |
| public: |
| MathMinMaxInstr(MethodRecognizer::Kind op_kind, |
| Value* left_value, |
| Value* right_value, |
| intptr_t deopt_id, |
| intptr_t result_cid) |
| - : TemplateDefinition<2>(deopt_id), |
| + : TemplateDefinition(deopt_id), |
| op_kind_(op_kind), |
| result_cid_(result_cid) { |
| ASSERT((result_cid == kSmiCid) || (result_cid == kDoubleCid)); |
| @@ -4983,13 +4832,8 @@ class MathMinMaxInstr : public TemplateDefinition<2> { |
| DECLARE_INSTRUCTION(MathMinMax) |
| virtual CompileType ComputeType() const; |
| - virtual bool AllowsCSE() const { return true; } |
| - virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual EffectSet Dependencies() const { return EffectSet::None(); } |
| virtual bool AttributesEqual(Instruction* other) const; |
| - virtual bool MayThrow() const { return false; } |
| - |
| private: |
| const MethodRecognizer::Kind op_kind_; |
| const intptr_t result_cid_; |
| @@ -4998,14 +4842,14 @@ class MathMinMaxInstr : public TemplateDefinition<2> { |
| }; |
| -class BinaryDoubleOpInstr : public TemplateDefinition<2> { |
| +class BinaryDoubleOpInstr : public TemplateDefinition<2, NoThrow, Pure> { |
| public: |
| BinaryDoubleOpInstr(Token::Kind op_kind, |
| Value* left, |
| Value* right, |
| intptr_t deopt_id, |
| intptr_t token_pos) |
| - : TemplateDefinition<2>(deopt_id), |
| + : TemplateDefinition(deopt_id), |
| op_kind_(op_kind), |
| token_pos_(token_pos) { |
| SetInputAt(0, left); |
| @@ -5043,15 +4887,10 @@ class BinaryDoubleOpInstr : public TemplateDefinition<2> { |
| virtual Definition* Canonicalize(FlowGraph* flow_graph); |
| - virtual bool AllowsCSE() const { return true; } |
| - virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual EffectSet Dependencies() const { return EffectSet::None(); } |
| virtual bool AttributesEqual(Instruction* other) const { |
| return op_kind() == other->AsBinaryDoubleOp()->op_kind(); |
| } |
| - virtual bool MayThrow() const { return false; } |
| - |
| private: |
| const Token::Kind op_kind_; |
| const intptr_t token_pos_; |
| @@ -5060,13 +4899,13 @@ class BinaryDoubleOpInstr : public TemplateDefinition<2> { |
| }; |
| -class BinaryFloat32x4OpInstr : public TemplateDefinition<2> { |
| +class BinaryFloat32x4OpInstr : public TemplateDefinition<2, NoThrow, Pure> { |
| public: |
| BinaryFloat32x4OpInstr(Token::Kind op_kind, |
| Value* left, |
| Value* right, |
| intptr_t deopt_id) |
| - : TemplateDefinition<2>(deopt_id), op_kind_(op_kind) { |
| + : TemplateDefinition(deopt_id), op_kind_(op_kind) { |
| SetInputAt(0, left); |
| SetInputAt(1, right); |
| } |
| @@ -5098,15 +4937,10 @@ class BinaryFloat32x4OpInstr : public TemplateDefinition<2> { |
| DECLARE_INSTRUCTION(BinaryFloat32x4Op) |
| virtual CompileType ComputeType() const; |
| - virtual bool AllowsCSE() const { return true; } |
| - virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual EffectSet Dependencies() const { return EffectSet::None(); } |
| virtual bool AttributesEqual(Instruction* other) const { |
| return op_kind() == other->AsBinaryFloat32x4Op()->op_kind(); |
| } |
| - virtual bool MayThrow() const { return false; } |
| - |
| private: |
| const Token::Kind op_kind_; |
| @@ -5114,12 +4948,12 @@ class BinaryFloat32x4OpInstr : public TemplateDefinition<2> { |
| }; |
| -class Simd32x4ShuffleInstr : public TemplateDefinition<1> { |
| +class Simd32x4ShuffleInstr : public TemplateDefinition<1, NoThrow, Pure> { |
| public: |
| Simd32x4ShuffleInstr(MethodRecognizer::Kind op_kind, Value* value, |
| intptr_t mask, |
| intptr_t deopt_id) |
| - : TemplateDefinition<1>(deopt_id), op_kind_(op_kind), mask_(mask) { |
| + : TemplateDefinition(deopt_id), op_kind_(op_kind), mask_(mask) { |
| SetInputAt(0, value); |
| } |
| @@ -5169,16 +5003,11 @@ class Simd32x4ShuffleInstr : public TemplateDefinition<1> { |
| DECLARE_INSTRUCTION(Simd32x4Shuffle) |
| virtual CompileType ComputeType() const; |
| - virtual bool AllowsCSE() const { return true; } |
| - virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual EffectSet Dependencies() const { return EffectSet::None(); } |
| virtual bool AttributesEqual(Instruction* other) const { |
| return (op_kind() == other->AsSimd32x4Shuffle()->op_kind()) && |
| (mask() == other->AsSimd32x4Shuffle()->mask()); |
| } |
| - virtual bool MayThrow() const { return false; } |
| - |
| private: |
| const MethodRecognizer::Kind op_kind_; |
| const intptr_t mask_; |
| @@ -5187,11 +5016,11 @@ class Simd32x4ShuffleInstr : public TemplateDefinition<1> { |
| }; |
| -class Simd32x4ShuffleMixInstr : public TemplateDefinition<2> { |
| +class Simd32x4ShuffleMixInstr : public TemplateDefinition<2, NoThrow, Pure> { |
| public: |
| Simd32x4ShuffleMixInstr(MethodRecognizer::Kind op_kind, Value* xy, |
| Value* zw, intptr_t mask, intptr_t deopt_id) |
| - : TemplateDefinition<2>(deopt_id), op_kind_(op_kind), mask_(mask) { |
| + : TemplateDefinition(deopt_id), op_kind_(op_kind), mask_(mask) { |
| SetInputAt(0, xy); |
| SetInputAt(1, zw); |
| } |
| @@ -5233,16 +5062,11 @@ class Simd32x4ShuffleMixInstr : public TemplateDefinition<2> { |
| DECLARE_INSTRUCTION(Simd32x4ShuffleMix) |
| virtual CompileType ComputeType() const; |
| - virtual bool AllowsCSE() const { return true; } |
| - virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual EffectSet Dependencies() const { return EffectSet::None(); } |
| virtual bool AttributesEqual(Instruction* other) const { |
| return (op_kind() == other->AsSimd32x4ShuffleMix()->op_kind()) && |
| (mask() == other->AsSimd32x4ShuffleMix()->mask()); |
| } |
| - virtual bool MayThrow() const { return false; } |
| - |
| private: |
| const MethodRecognizer::Kind op_kind_; |
| const intptr_t mask_; |
| @@ -5251,14 +5075,14 @@ class Simd32x4ShuffleMixInstr : public TemplateDefinition<2> { |
| }; |
| -class Float32x4ConstructorInstr : public TemplateDefinition<4> { |
| +class Float32x4ConstructorInstr : public TemplateDefinition<4, NoThrow, Pure> { |
| public: |
| Float32x4ConstructorInstr(Value* value0, |
| Value* value1, |
| Value* value2, |
| Value* value3, |
| intptr_t deopt_id) |
| - : TemplateDefinition<4>(deopt_id) { |
| + : TemplateDefinition(deopt_id) { |
| SetInputAt(0, value0); |
| SetInputAt(1, value1); |
| SetInputAt(2, value2); |
| @@ -5292,22 +5116,17 @@ class Float32x4ConstructorInstr : public TemplateDefinition<4> { |
| DECLARE_INSTRUCTION(Float32x4Constructor) |
| virtual CompileType ComputeType() const; |
| - virtual bool AllowsCSE() const { return true; } |
| - virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual EffectSet Dependencies() const { return EffectSet::None(); } |
| virtual bool AttributesEqual(Instruction* other) const { return true; } |
| - virtual bool MayThrow() const { return false; } |
| - |
| private: |
| DISALLOW_COPY_AND_ASSIGN(Float32x4ConstructorInstr); |
| }; |
| -class Float32x4SplatInstr : public TemplateDefinition<1> { |
| +class Float32x4SplatInstr : public TemplateDefinition<1, NoThrow, Pure> { |
| public: |
| Float32x4SplatInstr(Value* value, intptr_t deopt_id) |
| - : TemplateDefinition<1>(deopt_id) { |
| + : TemplateDefinition(deopt_id) { |
| SetInputAt(0, value); |
| } |
| @@ -5335,20 +5154,15 @@ class Float32x4SplatInstr : public TemplateDefinition<1> { |
| DECLARE_INSTRUCTION(Float32x4Splat) |
| virtual CompileType ComputeType() const; |
| - virtual bool AllowsCSE() const { return true; } |
| - virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual EffectSet Dependencies() const { return EffectSet::None(); } |
| virtual bool AttributesEqual(Instruction* other) const { return true; } |
| - virtual bool MayThrow() const { return false; } |
| - |
| private: |
| DISALLOW_COPY_AND_ASSIGN(Float32x4SplatInstr); |
| }; |
| // TODO(vegorov) replace with UnboxedConstantInstr. |
| -class Float32x4ZeroInstr : public TemplateDefinition<0> { |
| +class Float32x4ZeroInstr : public TemplateDefinition<0, NoThrow, Pure> { |
| public: |
| Float32x4ZeroInstr() { } |
| @@ -5361,25 +5175,20 @@ class Float32x4ZeroInstr : public TemplateDefinition<0> { |
| DECLARE_INSTRUCTION(Float32x4Zero) |
| virtual CompileType ComputeType() const; |
| - virtual bool AllowsCSE() const { return true; } |
| - virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual EffectSet Dependencies() const { return EffectSet::None(); } |
| virtual bool AttributesEqual(Instruction* other) const { return true; } |
| - virtual bool MayThrow() const { return false; } |
| - |
| private: |
| DISALLOW_COPY_AND_ASSIGN(Float32x4ZeroInstr); |
| }; |
| -class Float32x4ComparisonInstr : public TemplateDefinition<2> { |
| +class Float32x4ComparisonInstr : public TemplateDefinition<2, NoThrow, Pure> { |
| public: |
| Float32x4ComparisonInstr(MethodRecognizer::Kind op_kind, |
| Value* left, |
| Value* right, |
| intptr_t deopt_id) |
| - : TemplateDefinition<2>(deopt_id), op_kind_(op_kind) { |
| + : TemplateDefinition(deopt_id), op_kind_(op_kind) { |
| SetInputAt(0, left); |
| SetInputAt(1, right); |
| } |
| @@ -5411,15 +5220,10 @@ class Float32x4ComparisonInstr : public TemplateDefinition<2> { |
| DECLARE_INSTRUCTION(Float32x4Comparison) |
| virtual CompileType ComputeType() const; |
| - virtual bool AllowsCSE() const { return true; } |
| - virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual EffectSet Dependencies() const { return EffectSet::None(); } |
| virtual bool AttributesEqual(Instruction* other) const { |
| return op_kind() == other->AsFloat32x4Comparison()->op_kind(); |
| } |
| - virtual bool MayThrow() const { return false; } |
| - |
| private: |
| const MethodRecognizer::Kind op_kind_; |
| @@ -5427,13 +5231,13 @@ class Float32x4ComparisonInstr : public TemplateDefinition<2> { |
| }; |
| -class Float32x4MinMaxInstr : public TemplateDefinition<2> { |
| +class Float32x4MinMaxInstr : public TemplateDefinition<2, NoThrow, Pure> { |
| public: |
| Float32x4MinMaxInstr(MethodRecognizer::Kind op_kind, |
| Value* left, |
| Value* right, |
| intptr_t deopt_id) |
| - : TemplateDefinition<2>(deopt_id), op_kind_(op_kind) { |
| + : TemplateDefinition(deopt_id), op_kind_(op_kind) { |
| SetInputAt(0, left); |
| SetInputAt(1, right); |
| } |
| @@ -5465,15 +5269,10 @@ class Float32x4MinMaxInstr : public TemplateDefinition<2> { |
| DECLARE_INSTRUCTION(Float32x4MinMax) |
| virtual CompileType ComputeType() const; |
| - virtual bool AllowsCSE() const { return true; } |
| - virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual EffectSet Dependencies() const { return EffectSet::None(); } |
| virtual bool AttributesEqual(Instruction* other) const { |
| return op_kind() == other->AsFloat32x4MinMax()->op_kind(); |
| } |
| - virtual bool MayThrow() const { return false; } |
| - |
| private: |
| const MethodRecognizer::Kind op_kind_; |
| @@ -5481,13 +5280,13 @@ class Float32x4MinMaxInstr : public TemplateDefinition<2> { |
| }; |
| -class Float32x4ScaleInstr : public TemplateDefinition<2> { |
| +class Float32x4ScaleInstr : public TemplateDefinition<2, NoThrow, Pure> { |
| public: |
| Float32x4ScaleInstr(MethodRecognizer::Kind op_kind, |
| Value* left, |
| Value* right, |
| intptr_t deopt_id) |
| - : TemplateDefinition<2>(deopt_id), op_kind_(op_kind) { |
| + : TemplateDefinition(deopt_id), op_kind_(op_kind) { |
| SetInputAt(0, left); |
| SetInputAt(1, right); |
| } |
| @@ -5522,15 +5321,10 @@ class Float32x4ScaleInstr : public TemplateDefinition<2> { |
| DECLARE_INSTRUCTION(Float32x4Scale) |
| virtual CompileType ComputeType() const; |
| - virtual bool AllowsCSE() const { return true; } |
| - virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual EffectSet Dependencies() const { return EffectSet::None(); } |
| virtual bool AttributesEqual(Instruction* other) const { |
| return op_kind() == other->AsFloat32x4Scale()->op_kind(); |
| } |
| - virtual bool MayThrow() const { return false; } |
| - |
| private: |
| const MethodRecognizer::Kind op_kind_; |
| @@ -5538,12 +5332,12 @@ class Float32x4ScaleInstr : public TemplateDefinition<2> { |
| }; |
| -class Float32x4SqrtInstr : public TemplateDefinition<1> { |
| +class Float32x4SqrtInstr : public TemplateDefinition<1, NoThrow, Pure> { |
| public: |
| Float32x4SqrtInstr(MethodRecognizer::Kind op_kind, |
| Value* left, |
| intptr_t deopt_id) |
| - : TemplateDefinition<1>(deopt_id), op_kind_(op_kind) { |
| + : TemplateDefinition(deopt_id), op_kind_(op_kind) { |
| SetInputAt(0, left); |
| } |
| @@ -5573,15 +5367,10 @@ class Float32x4SqrtInstr : public TemplateDefinition<1> { |
| DECLARE_INSTRUCTION(Float32x4Sqrt) |
| virtual CompileType ComputeType() const; |
| - virtual bool AllowsCSE() const { return true; } |
| - virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual EffectSet Dependencies() const { return EffectSet::None(); } |
| virtual bool AttributesEqual(Instruction* other) const { |
| return op_kind() == other->AsFloat32x4Sqrt()->op_kind(); |
| } |
| - virtual bool MayThrow() const { return false; } |
| - |
| private: |
| const MethodRecognizer::Kind op_kind_; |
| @@ -5590,12 +5379,12 @@ class Float32x4SqrtInstr : public TemplateDefinition<1> { |
| // TODO(vegorov) rename to Unary to match naming convention for arithmetic. |
| -class Float32x4ZeroArgInstr : public TemplateDefinition<1> { |
| +class Float32x4ZeroArgInstr : public TemplateDefinition<1, NoThrow, Pure> { |
| public: |
| Float32x4ZeroArgInstr(MethodRecognizer::Kind op_kind, |
| Value* left, |
| intptr_t deopt_id) |
| - : TemplateDefinition<1>(deopt_id), |
| + : TemplateDefinition(deopt_id), |
| op_kind_(op_kind) { |
| SetInputAt(0, left); |
| } |
| @@ -5626,15 +5415,10 @@ class Float32x4ZeroArgInstr : public TemplateDefinition<1> { |
| DECLARE_INSTRUCTION(Float32x4ZeroArg) |
| virtual CompileType ComputeType() const; |
| - virtual bool AllowsCSE() const { return true; } |
| - virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual EffectSet Dependencies() const { return EffectSet::None(); } |
| virtual bool AttributesEqual(Instruction* other) const { |
| return op_kind() == other->AsFloat32x4ZeroArg()->op_kind(); |
| } |
| - virtual bool MayThrow() const { return false; } |
| - |
| private: |
| const MethodRecognizer::Kind op_kind_; |
| @@ -5642,13 +5426,13 @@ class Float32x4ZeroArgInstr : public TemplateDefinition<1> { |
| }; |
| -class Float32x4ClampInstr : public TemplateDefinition<3> { |
| +class Float32x4ClampInstr : public TemplateDefinition<3, NoThrow, Pure> { |
| public: |
| Float32x4ClampInstr(Value* left, |
| Value* lower, |
| Value* upper, |
| intptr_t deopt_id) |
| - : TemplateDefinition<3>(deopt_id) { |
| + : TemplateDefinition(deopt_id) { |
| SetInputAt(0, left); |
| SetInputAt(1, lower); |
| SetInputAt(2, upper); |
| @@ -5680,25 +5464,20 @@ class Float32x4ClampInstr : public TemplateDefinition<3> { |
| DECLARE_INSTRUCTION(Float32x4Clamp) |
| virtual CompileType ComputeType() const; |
| - virtual bool AllowsCSE() const { return true; } |
| - virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual EffectSet Dependencies() const { return EffectSet::None(); } |
| virtual bool AttributesEqual(Instruction* other) const { return true; } |
| - virtual bool MayThrow() const { return false; } |
| - |
| private: |
| DISALLOW_COPY_AND_ASSIGN(Float32x4ClampInstr); |
| }; |
| -class Float32x4WithInstr : public TemplateDefinition<2> { |
| +class Float32x4WithInstr : public TemplateDefinition<2, NoThrow, Pure> { |
| public: |
| Float32x4WithInstr(MethodRecognizer::Kind op_kind, |
| Value* left, |
| Value* replacement, |
| intptr_t deopt_id) |
| - : TemplateDefinition<2>(deopt_id), |
| + : TemplateDefinition(deopt_id), |
| op_kind_(op_kind) { |
| SetInputAt(0, replacement); |
| SetInputAt(1, left); |
| @@ -5734,15 +5513,10 @@ class Float32x4WithInstr : public TemplateDefinition<2> { |
| DECLARE_INSTRUCTION(Float32x4With) |
| virtual CompileType ComputeType() const; |
| - virtual bool AllowsCSE() const { return true; } |
| - virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual EffectSet Dependencies() const { return EffectSet::None(); } |
| virtual bool AttributesEqual(Instruction* other) const { |
| return op_kind() == other->AsFloat32x4With()->op_kind(); |
| } |
| - virtual bool MayThrow() const { return false; } |
| - |
| private: |
| const MethodRecognizer::Kind op_kind_; |
| @@ -5750,13 +5524,13 @@ class Float32x4WithInstr : public TemplateDefinition<2> { |
| }; |
| -class Simd64x2ShuffleInstr : public TemplateDefinition<1> { |
| +class Simd64x2ShuffleInstr : public TemplateDefinition<1, NoThrow, Pure> { |
| public: |
| Simd64x2ShuffleInstr(MethodRecognizer::Kind op_kind, |
| Value* value, |
| intptr_t mask, |
| intptr_t deopt_id) |
| - : TemplateDefinition<1>(deopt_id), op_kind_(op_kind), mask_(mask) { |
| + : TemplateDefinition(deopt_id), op_kind_(op_kind), mask_(mask) { |
| SetInputAt(0, value); |
| } |
| @@ -5798,16 +5572,11 @@ class Simd64x2ShuffleInstr : public TemplateDefinition<1> { |
| DECLARE_INSTRUCTION(Simd64x2Shuffle) |
| virtual CompileType ComputeType() const; |
| - virtual bool AllowsCSE() const { return true; } |
| - virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual EffectSet Dependencies() const { return EffectSet::None(); } |
| virtual bool AttributesEqual(Instruction* other) const { |
| return (op_kind() == other->AsSimd64x2Shuffle()->op_kind()) && |
| (mask() == other->AsSimd64x2Shuffle()->mask()); |
| } |
| - virtual bool MayThrow() const { return false; } |
| - |
| private: |
| const MethodRecognizer::Kind op_kind_; |
| const intptr_t mask_; |
| @@ -5816,10 +5585,10 @@ class Simd64x2ShuffleInstr : public TemplateDefinition<1> { |
| }; |
| -class Float32x4ToInt32x4Instr : public TemplateDefinition<1> { |
| +class Float32x4ToInt32x4Instr : public TemplateDefinition<1, NoThrow, Pure> { |
| public: |
| Float32x4ToInt32x4Instr(Value* left, intptr_t deopt_id) |
| - : TemplateDefinition<1>(deopt_id) { |
| + : TemplateDefinition(deopt_id) { |
| SetInputAt(0, left); |
| } |
| @@ -5847,22 +5616,17 @@ class Float32x4ToInt32x4Instr : public TemplateDefinition<1> { |
| DECLARE_INSTRUCTION(Float32x4ToInt32x4) |
| virtual CompileType ComputeType() const; |
| - virtual bool AllowsCSE() const { return true; } |
| - virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual EffectSet Dependencies() const { return EffectSet::None(); } |
| virtual bool AttributesEqual(Instruction* other) const { return true; } |
| - virtual bool MayThrow() const { return false; } |
| - |
| private: |
| DISALLOW_COPY_AND_ASSIGN(Float32x4ToInt32x4Instr); |
| }; |
| -class Float32x4ToFloat64x2Instr : public TemplateDefinition<1> { |
| +class Float32x4ToFloat64x2Instr : public TemplateDefinition<1, NoThrow, Pure> { |
| public: |
| Float32x4ToFloat64x2Instr(Value* left, intptr_t deopt_id) |
| - : TemplateDefinition<1>(deopt_id) { |
| + : TemplateDefinition(deopt_id) { |
| SetInputAt(0, left); |
| } |
| @@ -5890,22 +5654,17 @@ class Float32x4ToFloat64x2Instr : public TemplateDefinition<1> { |
| DECLARE_INSTRUCTION(Float32x4ToFloat64x2) |
| virtual CompileType ComputeType() const; |
| - virtual bool AllowsCSE() const { return true; } |
| - virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual EffectSet Dependencies() const { return EffectSet::None(); } |
| virtual bool AttributesEqual(Instruction* other) const { return true; } |
| - virtual bool MayThrow() const { return false; } |
| - |
| private: |
| DISALLOW_COPY_AND_ASSIGN(Float32x4ToFloat64x2Instr); |
| }; |
| -class Float64x2ToFloat32x4Instr : public TemplateDefinition<1> { |
| +class Float64x2ToFloat32x4Instr : public TemplateDefinition<1, NoThrow, Pure> { |
| public: |
| Float64x2ToFloat32x4Instr(Value* left, intptr_t deopt_id) |
| - : TemplateDefinition<1>(deopt_id) { |
| + : TemplateDefinition(deopt_id) { |
| SetInputAt(0, left); |
| } |
| @@ -5933,22 +5692,17 @@ class Float64x2ToFloat32x4Instr : public TemplateDefinition<1> { |
| DECLARE_INSTRUCTION(Float64x2ToFloat32x4) |
| virtual CompileType ComputeType() const; |
| - virtual bool AllowsCSE() const { return true; } |
| - virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual EffectSet Dependencies() const { return EffectSet::None(); } |
| virtual bool AttributesEqual(Instruction* other) const { return true; } |
| - virtual bool MayThrow() const { return false; } |
| - |
| private: |
| DISALLOW_COPY_AND_ASSIGN(Float64x2ToFloat32x4Instr); |
| }; |
| -class Float64x2ConstructorInstr : public TemplateDefinition<2> { |
| +class Float64x2ConstructorInstr : public TemplateDefinition<2, NoThrow, Pure> { |
| public: |
| Float64x2ConstructorInstr(Value* value0, Value* value1, intptr_t deopt_id) |
| - : TemplateDefinition<2>(deopt_id) { |
| + : TemplateDefinition(deopt_id) { |
| SetInputAt(0, value0); |
| SetInputAt(1, value1); |
| } |
| @@ -5978,22 +5732,17 @@ class Float64x2ConstructorInstr : public TemplateDefinition<2> { |
| DECLARE_INSTRUCTION(Float64x2Constructor) |
| virtual CompileType ComputeType() const; |
| - virtual bool AllowsCSE() const { return true; } |
| - virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual EffectSet Dependencies() const { return EffectSet::None(); } |
| virtual bool AttributesEqual(Instruction* other) const { return true; } |
| - virtual bool MayThrow() const { return false; } |
| - |
| private: |
| DISALLOW_COPY_AND_ASSIGN(Float64x2ConstructorInstr); |
| }; |
| -class Float64x2SplatInstr : public TemplateDefinition<1> { |
| +class Float64x2SplatInstr : public TemplateDefinition<1, NoThrow, Pure> { |
| public: |
| Float64x2SplatInstr(Value* value, intptr_t deopt_id) |
| - : TemplateDefinition<1>(deopt_id) { |
| + : TemplateDefinition(deopt_id) { |
| SetInputAt(0, value); |
| } |
| @@ -6021,19 +5770,14 @@ class Float64x2SplatInstr : public TemplateDefinition<1> { |
| DECLARE_INSTRUCTION(Float64x2Splat) |
| virtual CompileType ComputeType() const; |
| - virtual bool AllowsCSE() const { return true; } |
| - virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual EffectSet Dependencies() const { return EffectSet::None(); } |
| virtual bool AttributesEqual(Instruction* other) const { return true; } |
| - virtual bool MayThrow() const { return false; } |
| - |
| private: |
| DISALLOW_COPY_AND_ASSIGN(Float64x2SplatInstr); |
| }; |
| -class Float64x2ZeroInstr : public TemplateDefinition<0> { |
| +class Float64x2ZeroInstr : public TemplateDefinition<0, NoThrow, Pure> { |
| public: |
| Float64x2ZeroInstr() { } |
| @@ -6046,25 +5790,20 @@ class Float64x2ZeroInstr : public TemplateDefinition<0> { |
| DECLARE_INSTRUCTION(Float64x2Zero) |
| virtual CompileType ComputeType() const; |
| - virtual bool AllowsCSE() const { return true; } |
| - virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual EffectSet Dependencies() const { return EffectSet::None(); } |
| virtual bool AttributesEqual(Instruction* other) const { return true; } |
| - virtual bool MayThrow() const { return false; } |
| - |
| private: |
| DISALLOW_COPY_AND_ASSIGN(Float64x2ZeroInstr); |
| }; |
| // TODO(vegorov) rename to Unary to match arithmetic instructions. |
| -class Float64x2ZeroArgInstr : public TemplateDefinition<1> { |
| +class Float64x2ZeroArgInstr : public TemplateDefinition<1, NoThrow, Pure> { |
| public: |
| Float64x2ZeroArgInstr(MethodRecognizer::Kind op_kind, |
| Value* left, |
| intptr_t deopt_id) |
| - : TemplateDefinition<1>(deopt_id), op_kind_(op_kind) { |
| + : TemplateDefinition(deopt_id), op_kind_(op_kind) { |
| SetInputAt(0, left); |
| } |
| @@ -6098,15 +5837,10 @@ class Float64x2ZeroArgInstr : public TemplateDefinition<1> { |
| DECLARE_INSTRUCTION(Float64x2ZeroArg) |
| virtual CompileType ComputeType() const; |
| - virtual bool AllowsCSE() const { return true; } |
| - virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual EffectSet Dependencies() const { return EffectSet::None(); } |
| virtual bool AttributesEqual(Instruction* other) const { |
| return op_kind() == other->AsFloat64x2ZeroArg()->op_kind(); |
| } |
| - virtual bool MayThrow() const { return false; } |
| - |
| private: |
| const MethodRecognizer::Kind op_kind_; |
| @@ -6114,13 +5848,13 @@ class Float64x2ZeroArgInstr : public TemplateDefinition<1> { |
| }; |
| -class Float64x2OneArgInstr : public TemplateDefinition<2> { |
| +class Float64x2OneArgInstr : public TemplateDefinition<2, NoThrow, Pure> { |
| public: |
| Float64x2OneArgInstr(MethodRecognizer::Kind op_kind, |
| Value* left, |
| Value* right, |
| intptr_t deopt_id) |
| - : TemplateDefinition<2>(deopt_id), op_kind_(op_kind) { |
| + : TemplateDefinition(deopt_id), op_kind_(op_kind) { |
| SetInputAt(0, left); |
| SetInputAt(1, right); |
| } |
| @@ -6160,15 +5894,10 @@ class Float64x2OneArgInstr : public TemplateDefinition<2> { |
| DECLARE_INSTRUCTION(Float64x2OneArg) |
| virtual CompileType ComputeType() const; |
| - virtual bool AllowsCSE() const { return true; } |
| - virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual EffectSet Dependencies() const { return EffectSet::None(); } |
| virtual bool AttributesEqual(Instruction* other) const { |
| return op_kind() == other->AsFloat64x2OneArg()->op_kind(); |
| } |
| - virtual bool MayThrow() const { return false; } |
| - |
| private: |
| const MethodRecognizer::Kind op_kind_; |
| @@ -6176,14 +5905,14 @@ class Float64x2OneArgInstr : public TemplateDefinition<2> { |
| }; |
| -class Int32x4ConstructorInstr : public TemplateDefinition<4> { |
| +class Int32x4ConstructorInstr : public TemplateDefinition<4, NoThrow, Pure> { |
| public: |
| Int32x4ConstructorInstr(Value* value0, |
| Value* value1, |
| Value* value2, |
| Value* value3, |
| intptr_t deopt_id) |
| - : TemplateDefinition<4>(deopt_id) { |
| + : TemplateDefinition(deopt_id) { |
| SetInputAt(0, value0); |
| SetInputAt(1, value1); |
| SetInputAt(2, value2); |
| @@ -6217,26 +5946,22 @@ class Int32x4ConstructorInstr : public TemplateDefinition<4> { |
| DECLARE_INSTRUCTION(Int32x4Constructor) |
| virtual CompileType ComputeType() const; |
| - virtual bool AllowsCSE() const { return true; } |
| - virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual EffectSet Dependencies() const { return EffectSet::None(); } |
| virtual bool AttributesEqual(Instruction* other) const { return true; } |
| - virtual bool MayThrow() const { return false; } |
| - |
| private: |
| DISALLOW_COPY_AND_ASSIGN(Int32x4ConstructorInstr); |
| }; |
| -class Int32x4BoolConstructorInstr : public TemplateDefinition<4> { |
| +class Int32x4BoolConstructorInstr |
| + : public TemplateDefinition<4, NoThrow, Pure> { |
| public: |
| Int32x4BoolConstructorInstr(Value* value0, |
| Value* value1, |
| Value* value2, |
| Value* value3, |
| intptr_t deopt_id) |
| - : TemplateDefinition<4>(deopt_id) { |
| + : TemplateDefinition(deopt_id) { |
| SetInputAt(0, value0); |
| SetInputAt(1, value1); |
| SetInputAt(2, value2); |
| @@ -6270,24 +5995,19 @@ class Int32x4BoolConstructorInstr : public TemplateDefinition<4> { |
| DECLARE_INSTRUCTION(Int32x4BoolConstructor) |
| virtual CompileType ComputeType() const; |
| - virtual bool AllowsCSE() const { return true; } |
| - virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual EffectSet Dependencies() const { return EffectSet::None(); } |
| virtual bool AttributesEqual(Instruction* other) const { return true; } |
| - virtual bool MayThrow() const { return false; } |
| - |
| private: |
| DISALLOW_COPY_AND_ASSIGN(Int32x4BoolConstructorInstr); |
| }; |
| -class Int32x4GetFlagInstr : public TemplateDefinition<1> { |
| +class Int32x4GetFlagInstr : public TemplateDefinition<1, NoThrow, Pure> { |
| public: |
| Int32x4GetFlagInstr(MethodRecognizer::Kind op_kind, |
| Value* value, |
| intptr_t deopt_id) |
| - : TemplateDefinition<1>(deopt_id), op_kind_(op_kind) { |
| + : TemplateDefinition(deopt_id), op_kind_(op_kind) { |
| SetInputAt(0, value); |
| } |
| @@ -6317,15 +6037,10 @@ class Int32x4GetFlagInstr : public TemplateDefinition<1> { |
| DECLARE_INSTRUCTION(Int32x4GetFlag) |
| virtual CompileType ComputeType() const; |
| - virtual bool AllowsCSE() const { return true; } |
| - virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual EffectSet Dependencies() const { return EffectSet::None(); } |
| virtual bool AttributesEqual(Instruction* other) const { |
| return op_kind() == other->AsInt32x4GetFlag()->op_kind(); |
| } |
| - virtual bool MayThrow() const { return false; } |
| - |
| private: |
| const MethodRecognizer::Kind op_kind_; |
| @@ -6333,12 +6048,12 @@ class Int32x4GetFlagInstr : public TemplateDefinition<1> { |
| }; |
| -class Simd32x4GetSignMaskInstr : public TemplateDefinition<1> { |
| +class Simd32x4GetSignMaskInstr : public TemplateDefinition<1, NoThrow, Pure> { |
| public: |
| Simd32x4GetSignMaskInstr(MethodRecognizer::Kind op_kind, |
| Value* value, |
| intptr_t deopt_id) |
| - : TemplateDefinition<1>(deopt_id), op_kind_(op_kind) { |
| + : TemplateDefinition(deopt_id), op_kind_(op_kind) { |
| SetInputAt(0, value); |
| } |
| @@ -6372,15 +6087,10 @@ class Simd32x4GetSignMaskInstr : public TemplateDefinition<1> { |
| DECLARE_INSTRUCTION(Simd32x4GetSignMask) |
| virtual CompileType ComputeType() const; |
| - virtual bool AllowsCSE() const { return true; } |
| - virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual EffectSet Dependencies() const { return EffectSet::None(); } |
| virtual bool AttributesEqual(Instruction* other) const { |
| return other->AsSimd32x4GetSignMask()->op_kind() == op_kind(); |
| } |
| - virtual bool MayThrow() const { return false; } |
| - |
| private: |
| const MethodRecognizer::Kind op_kind_; |
| @@ -6388,13 +6098,13 @@ class Simd32x4GetSignMaskInstr : public TemplateDefinition<1> { |
| }; |
| -class Int32x4SelectInstr : public TemplateDefinition<3> { |
| +class Int32x4SelectInstr : public TemplateDefinition<3, NoThrow, Pure> { |
| public: |
| Int32x4SelectInstr(Value* mask, |
| Value* trueValue, |
| Value* falseValue, |
| intptr_t deopt_id) |
| - : TemplateDefinition<3>(deopt_id) { |
| + : TemplateDefinition(deopt_id) { |
| SetInputAt(0, mask); |
| SetInputAt(1, trueValue); |
| SetInputAt(2, falseValue); |
| @@ -6429,25 +6139,20 @@ class Int32x4SelectInstr : public TemplateDefinition<3> { |
| DECLARE_INSTRUCTION(Int32x4Select) |
| virtual CompileType ComputeType() const; |
| - virtual bool AllowsCSE() const { return true; } |
| - virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual EffectSet Dependencies() const { return EffectSet::None(); } |
| virtual bool AttributesEqual(Instruction* other) const { return true; } |
| - virtual bool MayThrow() const { return false; } |
| - |
| private: |
| DISALLOW_COPY_AND_ASSIGN(Int32x4SelectInstr); |
| }; |
| -class Int32x4SetFlagInstr : public TemplateDefinition<2> { |
| +class Int32x4SetFlagInstr : public TemplateDefinition<2, NoThrow, Pure> { |
| public: |
| Int32x4SetFlagInstr(MethodRecognizer::Kind op_kind, |
| Value* value, |
| Value* flagValue, |
| intptr_t deopt_id) |
| - : TemplateDefinition<2>(deopt_id), op_kind_(op_kind) { |
| + : TemplateDefinition(deopt_id), op_kind_(op_kind) { |
| SetInputAt(0, value); |
| SetInputAt(1, flagValue); |
| } |
| @@ -6482,15 +6187,10 @@ class Int32x4SetFlagInstr : public TemplateDefinition<2> { |
| DECLARE_INSTRUCTION(Int32x4SetFlag) |
| virtual CompileType ComputeType() const; |
| - virtual bool AllowsCSE() const { return true; } |
| - virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual EffectSet Dependencies() const { return EffectSet::None(); } |
| virtual bool AttributesEqual(Instruction* other) const { |
| return op_kind() == other->AsInt32x4SetFlag()->op_kind(); |
| } |
| - virtual bool MayThrow() const { return false; } |
| - |
| private: |
| const MethodRecognizer::Kind op_kind_; |
| @@ -6498,10 +6198,10 @@ class Int32x4SetFlagInstr : public TemplateDefinition<2> { |
| }; |
| -class Int32x4ToFloat32x4Instr : public TemplateDefinition<1> { |
| +class Int32x4ToFloat32x4Instr : public TemplateDefinition<1, NoThrow, Pure> { |
| public: |
| Int32x4ToFloat32x4Instr(Value* left, intptr_t deopt_id) |
| - : TemplateDefinition<1>(deopt_id) { |
| + : TemplateDefinition(deopt_id) { |
| SetInputAt(0, left); |
| } |
| @@ -6529,25 +6229,20 @@ class Int32x4ToFloat32x4Instr : public TemplateDefinition<1> { |
| DECLARE_INSTRUCTION(Int32x4ToFloat32x4) |
| virtual CompileType ComputeType() const; |
| - virtual bool AllowsCSE() const { return true; } |
| - virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual EffectSet Dependencies() const { return EffectSet::None(); } |
| virtual bool AttributesEqual(Instruction* other) const { return true; } |
| - virtual bool MayThrow() const { return false; } |
| - |
| private: |
| DISALLOW_COPY_AND_ASSIGN(Int32x4ToFloat32x4Instr); |
| }; |
| -class BinaryInt32x4OpInstr : public TemplateDefinition<2> { |
| +class BinaryInt32x4OpInstr : public TemplateDefinition<2, NoThrow, Pure> { |
| public: |
| BinaryInt32x4OpInstr(Token::Kind op_kind, |
| Value* left, |
| Value* right, |
| intptr_t deopt_id) |
| - : TemplateDefinition<2>(deopt_id), op_kind_(op_kind) { |
| + : TemplateDefinition(deopt_id), op_kind_(op_kind) { |
| SetInputAt(0, left); |
| SetInputAt(1, right); |
| } |
| @@ -6579,15 +6274,10 @@ class BinaryInt32x4OpInstr : public TemplateDefinition<2> { |
| DECLARE_INSTRUCTION(BinaryInt32x4Op) |
| virtual CompileType ComputeType() const; |
| - virtual bool AllowsCSE() const { return true; } |
| - virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual EffectSet Dependencies() const { return EffectSet::None(); } |
| virtual bool AttributesEqual(Instruction* other) const { |
| return op_kind() == other->AsBinaryInt32x4Op()->op_kind(); |
| } |
| - virtual bool MayThrow() const { return false; } |
| - |
| private: |
| const Token::Kind op_kind_; |
| @@ -6595,13 +6285,13 @@ class BinaryInt32x4OpInstr : public TemplateDefinition<2> { |
| }; |
| -class BinaryFloat64x2OpInstr : public TemplateDefinition<2> { |
| +class BinaryFloat64x2OpInstr : public TemplateDefinition<2, NoThrow, Pure> { |
| public: |
| BinaryFloat64x2OpInstr(Token::Kind op_kind, |
| Value* left, |
| Value* right, |
| intptr_t deopt_id) |
| - : TemplateDefinition<2>(deopt_id), op_kind_(op_kind) { |
| + : TemplateDefinition(deopt_id), op_kind_(op_kind) { |
| SetInputAt(0, left); |
| SetInputAt(1, right); |
| } |
| @@ -6633,16 +6323,10 @@ class BinaryFloat64x2OpInstr : public TemplateDefinition<2> { |
| DECLARE_INSTRUCTION(BinaryFloat64x2Op) |
| virtual CompileType ComputeType() const; |
| - virtual bool AllowsCSE() const { return true; } |
| - virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual EffectSet Dependencies() const { return EffectSet::None(); } |
| virtual bool AttributesEqual(Instruction* other) const { |
| - ASSERT(other->IsBinaryFloat64x2Op()); |
| return op_kind() == other->AsBinaryFloat64x2Op()->op_kind(); |
| } |
| - virtual bool MayThrow() const { return false; } |
| - |
| private: |
| const Token::Kind op_kind_; |
| @@ -6650,12 +6334,12 @@ class BinaryFloat64x2OpInstr : public TemplateDefinition<2> { |
| }; |
| -class UnaryIntegerOpInstr : public TemplateDefinition<1> { |
| +class UnaryIntegerOpInstr : public TemplateDefinition<1, NoThrow, Pure> { |
| public: |
| UnaryIntegerOpInstr(Token::Kind op_kind, |
| Value* value, |
| intptr_t deopt_id) |
| - : TemplateDefinition<1>(deopt_id), op_kind_(op_kind) { |
| + : TemplateDefinition(deopt_id), op_kind_(op_kind) { |
| ASSERT((op_kind == Token::kNEGATE) || |
| (op_kind == Token::kBIT_NOT)); |
| SetInputAt(0, value); |
| @@ -6670,9 +6354,6 @@ class UnaryIntegerOpInstr : public TemplateDefinition<1> { |
| Value* value() const { return inputs_[0]; } |
| Token::Kind op_kind() const { return op_kind_; } |
| - virtual bool AllowsCSE() const { return true; } |
| - virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual EffectSet Dependencies() const { return EffectSet::None(); } |
| virtual bool AttributesEqual(Instruction* other) const { |
| return other->AsUnaryIntegerOp()->op_kind() == op_kind(); |
| } |
| @@ -6683,8 +6364,6 @@ class UnaryIntegerOpInstr : public TemplateDefinition<1> { |
| return GetDeoptId(); |
| } |
| - virtual bool MayThrow() const { return false; } |
| - |
| virtual void PrintOperandsTo(BufferFormatter* f) const; |
| DEFINE_INSTRUCTION_TYPE_CHECK(UnaryIntegerOp) |
| @@ -6771,13 +6450,13 @@ class UnaryMintOpInstr : public UnaryIntegerOpInstr { |
| }; |
| -class BinaryIntegerOpInstr : public TemplateDefinition<2> { |
| +class BinaryIntegerOpInstr : public TemplateDefinition<2, NoThrow, Pure> { |
| public: |
| BinaryIntegerOpInstr(Token::Kind op_kind, |
| Value* left, |
| Value* right, |
| intptr_t deopt_id) |
| - : TemplateDefinition<2>(deopt_id), |
| + : TemplateDefinition(deopt_id), |
| op_kind_(op_kind), |
| can_overflow_(true), |
| is_truncating_(false) { |
| @@ -6837,15 +6516,11 @@ class BinaryIntegerOpInstr : public TemplateDefinition<2> { |
| return false; |
| } |
| } |
| - virtual bool AllowsCSE() const { return true; } |
| - virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual EffectSet Dependencies() const { return EffectSet::None(); } |
| + |
| virtual bool AttributesEqual(Instruction* other) const; |
| virtual intptr_t DeoptimizationTarget() const { return GetDeoptId(); } |
| - virtual bool MayThrow() const { return false; } |
| - |
| virtual void PrintOperandsTo(BufferFormatter* f) const; |
| DEFINE_INSTRUCTION_TYPE_CHECK(BinaryIntegerOp) |
| @@ -7074,12 +6749,12 @@ class ShiftMintOpInstr : public BinaryIntegerOpInstr { |
| // Handles only NEGATE. |
| -class UnaryDoubleOpInstr : public TemplateDefinition<1> { |
| +class UnaryDoubleOpInstr : public TemplateDefinition<1, NoThrow, Pure> { |
| public: |
| UnaryDoubleOpInstr(Token::Kind op_kind, |
| Value* value, |
| intptr_t deopt_id) |
| - : TemplateDefinition<1>(deopt_id), op_kind_(op_kind) { |
| + : TemplateDefinition(deopt_id), op_kind_(op_kind) { |
| ASSERT(op_kind == Token::kNEGATE); |
| SetInputAt(0, value); |
| } |
| @@ -7109,13 +6784,8 @@ class UnaryDoubleOpInstr : public TemplateDefinition<1> { |
| return kUnboxedDouble; |
| } |
| - virtual bool AllowsCSE() const { return true; } |
| - virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual EffectSet Dependencies() const { return EffectSet::None(); } |
| virtual bool AttributesEqual(Instruction* other) const { return true; } |
| - virtual bool MayThrow() const { return false; } |
| - |
| private: |
| const Token::Kind op_kind_; |
| @@ -7123,10 +6793,10 @@ class UnaryDoubleOpInstr : public TemplateDefinition<1> { |
| }; |
| -class CheckStackOverflowInstr : public TemplateInstruction<0> { |
| +class CheckStackOverflowInstr : public TemplateInstruction<0, NoThrow> { |
| public: |
| CheckStackOverflowInstr(intptr_t token_pos, intptr_t loop_depth) |
| - : TemplateInstruction<0>(Isolate::Current()->GetNextDeoptId()), |
| + : TemplateInstruction(Isolate::Current()->GetNextDeoptId()), |
| token_pos_(token_pos), |
| loop_depth_(loop_depth) { |
| } |
| @@ -7143,8 +6813,6 @@ class CheckStackOverflowInstr : public TemplateInstruction<0> { |
| virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual bool MayThrow() const { return false; } |
| - |
| virtual void PrintOperandsTo(BufferFormatter* f) const; |
| private: |
| @@ -7156,7 +6824,7 @@ class CheckStackOverflowInstr : public TemplateInstruction<0> { |
| // TODO(vegorov): remove this instruction in favor of Int32ToDouble. |
| -class SmiToDoubleInstr : public TemplateDefinition<1> { |
| +class SmiToDoubleInstr : public TemplateDefinition<1, NoThrow, Pure> { |
| public: |
| SmiToDoubleInstr(Value* value, intptr_t token_pos) |
| : token_pos_(token_pos) { |
| @@ -7175,13 +6843,8 @@ class SmiToDoubleInstr : public TemplateDefinition<1> { |
| virtual bool CanDeoptimize() const { return false; } |
| - virtual bool AllowsCSE() const { return true; } |
| - virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual EffectSet Dependencies() const { return EffectSet::None(); } |
| virtual bool AttributesEqual(Instruction* other) const { return true; } |
| - virtual bool MayThrow() const { return false; } |
| - |
| private: |
| const intptr_t token_pos_; |
| @@ -7189,7 +6852,7 @@ class SmiToDoubleInstr : public TemplateDefinition<1> { |
| }; |
| -class Int32ToDoubleInstr : public TemplateDefinition<1> { |
| +class Int32ToDoubleInstr : public TemplateDefinition<1, NoThrow, Pure> { |
| public: |
| explicit Int32ToDoubleInstr(Value* value) { |
| SetInputAt(0, value); |
| @@ -7211,22 +6874,17 @@ class Int32ToDoubleInstr : public TemplateDefinition<1> { |
| virtual bool CanDeoptimize() const { return false; } |
| - virtual bool AllowsCSE() const { return true; } |
| - virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual EffectSet Dependencies() const { return EffectSet::None(); } |
| virtual bool AttributesEqual(Instruction* other) const { return true; } |
| - virtual bool MayThrow() const { return false; } |
| - |
| private: |
| DISALLOW_COPY_AND_ASSIGN(Int32ToDoubleInstr); |
| }; |
| -class MintToDoubleInstr : public TemplateDefinition<1> { |
| +class MintToDoubleInstr : public TemplateDefinition<1, NoThrow, Pure> { |
| public: |
| MintToDoubleInstr(Value* value, intptr_t deopt_id) |
| - : TemplateDefinition<1>(deopt_id) { |
| + : TemplateDefinition(deopt_id) { |
| SetInputAt(0, value); |
| } |
| @@ -7251,23 +6909,17 @@ class MintToDoubleInstr : public TemplateDefinition<1> { |
| } |
| virtual bool CanDeoptimize() const { return false; } |
| - |
| - virtual bool AllowsCSE() const { return true; } |
| - virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual EffectSet Dependencies() const { return EffectSet::None(); } |
| virtual bool AttributesEqual(Instruction* other) const { return true; } |
| - virtual bool MayThrow() const { return false; } |
| - |
| private: |
| DISALLOW_COPY_AND_ASSIGN(MintToDoubleInstr); |
| }; |
| -class DoubleToIntegerInstr : public TemplateDefinition<1> { |
| +class DoubleToIntegerInstr : public TemplateDefinition<1, Throws> { |
| public: |
| DoubleToIntegerInstr(Value* value, InstanceCallInstr* instance_call) |
| - : TemplateDefinition<1>(instance_call->deopt_id()), |
| + : TemplateDefinition(instance_call->deopt_id()), |
| instance_call_(instance_call) { |
| SetInputAt(0, value); |
| } |
| @@ -7284,8 +6936,6 @@ class DoubleToIntegerInstr : public TemplateDefinition<1> { |
| virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual bool MayThrow() const { return true; } |
| - |
| private: |
| InstanceCallInstr* instance_call_; |
| @@ -7295,10 +6945,10 @@ class DoubleToIntegerInstr : public TemplateDefinition<1> { |
| // Similar to 'DoubleToIntegerInstr' but expects unboxed double as input |
| // and creates a Smi. |
| -class DoubleToSmiInstr : public TemplateDefinition<1> { |
| +class DoubleToSmiInstr : public TemplateDefinition<1, NoThrow, Pure> { |
| public: |
| DoubleToSmiInstr(Value* value, intptr_t deopt_id) |
| - : TemplateDefinition<1>(deopt_id) { |
| + : TemplateDefinition(deopt_id) { |
| SetInputAt(0, value); |
| } |
| @@ -7316,21 +6966,19 @@ class DoubleToSmiInstr : public TemplateDefinition<1> { |
| virtual intptr_t DeoptimizationTarget() const { return GetDeoptId(); } |
| - virtual EffectSet Effects() const { return EffectSet::None(); } |
| - |
| - virtual bool MayThrow() const { return false; } |
| + virtual bool AttributesEqual(Instruction* other) const { return true; } |
| private: |
| DISALLOW_COPY_AND_ASSIGN(DoubleToSmiInstr); |
| }; |
| -class DoubleToDoubleInstr : public TemplateDefinition<1> { |
| +class DoubleToDoubleInstr : public TemplateDefinition<1, NoThrow, Pure> { |
| public: |
| DoubleToDoubleInstr(Value* value, |
| MethodRecognizer::Kind recognized_kind, |
| intptr_t deopt_id) |
| - : TemplateDefinition<1>(deopt_id), |
| + : TemplateDefinition(deopt_id), |
| recognized_kind_(recognized_kind) { |
| SetInputAt(0, value); |
| } |
| @@ -7355,15 +7003,10 @@ class DoubleToDoubleInstr : public TemplateDefinition<1> { |
| virtual intptr_t DeoptimizationTarget() const { return GetDeoptId(); } |
| - virtual bool AllowsCSE() const { return true; } |
| - virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual EffectSet Dependencies() const { return EffectSet::None(); } |
| virtual bool AttributesEqual(Instruction* other) const { |
| return other->AsDoubleToDouble()->recognized_kind() == recognized_kind(); |
| } |
| - virtual bool MayThrow() const { return false; } |
| - |
| private: |
| const MethodRecognizer::Kind recognized_kind_; |
| @@ -7371,10 +7014,10 @@ class DoubleToDoubleInstr : public TemplateDefinition<1> { |
| }; |
| -class DoubleToFloatInstr: public TemplateDefinition<1> { |
| +class DoubleToFloatInstr: public TemplateDefinition<1, NoThrow, Pure> { |
| public: |
| DoubleToFloatInstr(Value* value, intptr_t deopt_id) |
| - : TemplateDefinition<1>(deopt_id) { |
| + : TemplateDefinition(deopt_id) { |
| SetInputAt(0, value); |
| } |
| @@ -7401,13 +7044,8 @@ class DoubleToFloatInstr: public TemplateDefinition<1> { |
| virtual intptr_t DeoptimizationTarget() const { return GetDeoptId(); } |
| - virtual bool AllowsCSE() const { return true; } |
| - virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual EffectSet Dependencies() const { return EffectSet::None(); } |
| virtual bool AttributesEqual(Instruction* other) const { return true; } |
| - virtual bool MayThrow() const { return false; } |
| - |
| virtual Definition* Canonicalize(FlowGraph* flow_graph); |
| private: |
| @@ -7415,10 +7053,10 @@ class DoubleToFloatInstr: public TemplateDefinition<1> { |
| }; |
| -class FloatToDoubleInstr: public TemplateDefinition<1> { |
| +class FloatToDoubleInstr: public TemplateDefinition<1, NoThrow, Pure> { |
| public: |
| FloatToDoubleInstr(Value* value, intptr_t deopt_id) |
| - : TemplateDefinition<1>(deopt_id) { |
| + : TemplateDefinition(deopt_id) { |
| SetInputAt(0, value); |
| } |
| @@ -7441,13 +7079,8 @@ class FloatToDoubleInstr: public TemplateDefinition<1> { |
| virtual intptr_t DeoptimizationTarget() const { return GetDeoptId(); } |
| - virtual bool AllowsCSE() const { return true; } |
| - virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual EffectSet Dependencies() const { return EffectSet::None(); } |
| virtual bool AttributesEqual(Instruction* other) const { return true; } |
| - virtual bool MayThrow() const { return false; } |
| - |
| virtual Definition* Canonicalize(FlowGraph* flow_graph); |
| private: |
| @@ -7455,7 +7088,7 @@ class FloatToDoubleInstr: public TemplateDefinition<1> { |
| }; |
| -class InvokeMathCFunctionInstr : public Definition { |
| +class InvokeMathCFunctionInstr : public PureDefinition { |
| public: |
| InvokeMathCFunctionInstr(ZoneGrowableArray<Value*>* inputs, |
| intptr_t deopt_id, |
| @@ -7495,9 +7128,6 @@ class InvokeMathCFunctionInstr : public Definition { |
| return (*inputs_)[i]; |
| } |
| - virtual bool AllowsCSE() const { return true; } |
| - virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual EffectSet Dependencies() const { return EffectSet::None(); } |
| virtual bool AttributesEqual(Instruction* other) const { |
| InvokeMathCFunctionInstr* other_invoke = other->AsInvokeMathCFunction(); |
| return other_invoke->recognized_kind() == recognized_kind(); |
| @@ -7522,7 +7152,7 @@ class InvokeMathCFunctionInstr : public Definition { |
| }; |
| -class ExtractNthOutputInstr : public TemplateDefinition<1> { |
| +class ExtractNthOutputInstr : public TemplateDefinition<1, NoThrow, Pure> { |
| public: |
| // Extract the Nth output register from value. |
| ExtractNthOutputInstr(Value* value, |
| @@ -7560,17 +7190,12 @@ class ExtractNthOutputInstr : public TemplateDefinition<1> { |
| return definition_rep_; |
| } |
| - virtual bool AllowsCSE() const { return true; } |
| - virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual EffectSet Dependencies() const { return EffectSet::None(); } |
| virtual bool AttributesEqual(Instruction* other) const { |
| ExtractNthOutputInstr* other_extract = other->AsExtractNthOutput(); |
| return (other_extract->representation() == representation()) && |
| (other_extract->index() == index()); |
| } |
| - virtual bool MayThrow() const { return false; } |
| - |
| private: |
| const intptr_t index_; |
| const Representation definition_rep_; |
| @@ -7579,7 +7204,7 @@ class ExtractNthOutputInstr : public TemplateDefinition<1> { |
| }; |
| -class MergedMathInstr : public Definition { |
| +class MergedMathInstr : public PureDefinition { |
| public: |
| enum Kind { |
| kTruncDivMod, |
| @@ -7653,9 +7278,6 @@ class MergedMathInstr : public Definition { |
| DECLARE_INSTRUCTION(MergedMath) |
| - virtual bool AllowsCSE() const { return true; } |
| - virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual EffectSet Dependencies() const { return EffectSet::None(); } |
| virtual bool AttributesEqual(Instruction* other) const { |
| MergedMathInstr* other_invoke = other->AsMergedMath(); |
| return other_invoke->kind() == kind(); |
| @@ -7680,7 +7302,7 @@ class MergedMathInstr : public Definition { |
| }; |
| -class CheckClassInstr : public TemplateInstruction<1> { |
| +class CheckClassInstr : public TemplateInstruction<1, NoThrow> { |
| public: |
| CheckClassInstr(Value* value, |
| intptr_t deopt_id, |
| @@ -7712,12 +7334,10 @@ class CheckClassInstr : public TemplateInstruction<1> { |
| static bool IsDenseMask(intptr_t mask); |
| virtual bool AllowsCSE() const { return true; } |
| - virtual EffectSet Effects() const { return EffectSet::None(); } |
| virtual EffectSet Dependencies() const; |
| + virtual EffectSet Effects() const { return EffectSet::None(); } |
| virtual bool AttributesEqual(Instruction* other) const; |
| - virtual bool MayThrow() const { return false; } |
| - |
| void set_licm_hoisted(bool value) { licm_hoisted_ = value; } |
| private: |
| @@ -7730,10 +7350,10 @@ class CheckClassInstr : public TemplateInstruction<1> { |
| }; |
| -class CheckSmiInstr : public TemplateInstruction<1> { |
| +class CheckSmiInstr : public TemplateInstruction<1, NoThrow, Pure> { |
| public: |
| CheckSmiInstr(Value* value, intptr_t deopt_id, intptr_t token_pos) |
| - : TemplateInstruction<1>(deopt_id), |
| + : TemplateInstruction(deopt_id), |
| token_pos_(token_pos), |
| licm_hoisted_(false) { |
| SetInputAt(0, value); |
| @@ -7750,13 +7370,8 @@ class CheckSmiInstr : public TemplateInstruction<1> { |
| virtual Instruction* Canonicalize(FlowGraph* flow_graph); |
| - virtual bool AllowsCSE() const { return true; } |
| - virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual EffectSet Dependencies() const { return EffectSet::None(); } |
| virtual bool AttributesEqual(Instruction* other) const { return true; } |
| - virtual bool MayThrow() const { return false; } |
| - |
| void set_licm_hoisted(bool value) { licm_hoisted_ = value; } |
| private: |
| @@ -7767,10 +7382,10 @@ class CheckSmiInstr : public TemplateInstruction<1> { |
| }; |
| -class CheckClassIdInstr : public TemplateInstruction<1> { |
| +class CheckClassIdInstr : public TemplateInstruction<1, NoThrow> { |
| public: |
| CheckClassIdInstr(Value* value, intptr_t cid, intptr_t deopt_id) |
| - : TemplateInstruction<1>(deopt_id), cid_(cid) { |
| + : TemplateInstruction(deopt_id), cid_(cid) { |
| SetInputAt(0, value); |
| } |
| @@ -7786,12 +7401,10 @@ class CheckClassIdInstr : public TemplateInstruction<1> { |
| virtual Instruction* Canonicalize(FlowGraph* flow_graph); |
| virtual bool AllowsCSE() const { return true; } |
| - virtual EffectSet Effects() const { return EffectSet::None(); } |
| virtual EffectSet Dependencies() const; |
| + virtual EffectSet Effects() const { return EffectSet::None(); } |
| virtual bool AttributesEqual(Instruction* other) const { return true; } |
| - virtual bool MayThrow() const { return false; } |
| - |
| virtual void PrintOperandsTo(BufferFormatter* f) const; |
| private: |
| @@ -7801,10 +7414,10 @@ class CheckClassIdInstr : public TemplateInstruction<1> { |
| }; |
| -class CheckArrayBoundInstr : public TemplateInstruction<2> { |
| +class CheckArrayBoundInstr : public TemplateInstruction<2, NoThrow, Pure> { |
| public: |
| CheckArrayBoundInstr(Value* length, Value* index, intptr_t deopt_id) |
| - : TemplateInstruction<2>(deopt_id), |
| + : TemplateInstruction(deopt_id), |
| generalized_(false), |
| licm_hoisted_(false) { |
| SetInputAt(kLengthPos, length); |
| @@ -7833,13 +7446,8 @@ class CheckArrayBoundInstr : public TemplateInstruction<2> { |
| static bool IsFixedLengthArrayType(intptr_t class_id); |
| - virtual bool AllowsCSE() const { return true; } |
| - virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual EffectSet Dependencies() const { return EffectSet::None(); } |
| virtual bool AttributesEqual(Instruction* other) const { return true; } |
| - virtual bool MayThrow() const { return false; } |
| - |
| void set_licm_hoisted(bool value) { licm_hoisted_ = value; } |
| // Give a name to the location/input indices. |
| @@ -7856,7 +7464,7 @@ class CheckArrayBoundInstr : public TemplateInstruction<2> { |
| }; |
| -class BoxIntNInstr : public TemplateDefinition<1> { |
| +class BoxIntNInstr : public TemplateDefinition<1, NoThrow, Pure> { |
| public: |
| BoxIntNInstr(Representation representation, Value* value) |
| : from_representation_(representation) { |
| @@ -7882,15 +7490,10 @@ class BoxIntNInstr : public TemplateDefinition<1> { |
| return from_representation_; |
| } |
| - virtual bool AllowsCSE() const { return true; } |
| - virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual EffectSet Dependencies() const { return EffectSet::None(); } |
| virtual bool AttributesEqual(Instruction* other) const { |
| return other->AsBoxIntN()->from_representation_ == from_representation_; |
| } |
| - virtual bool MayThrow() const { return false; } |
| - |
| virtual Definition* Canonicalize(FlowGraph* flow_graph); |
| DEFINE_INSTRUCTION_TYPE_CHECK(BoxIntN) |
| @@ -7929,12 +7532,12 @@ class BoxInt32Instr : public BoxIntNInstr { |
| }; |
| -class UnboxIntNInstr : public TemplateDefinition<1> { |
| +class UnboxIntNInstr : public TemplateDefinition<1, NoThrow, Pure> { |
| public: |
| UnboxIntNInstr(Representation representation, |
| Value* value, |
| intptr_t deopt_id) |
| - : TemplateDefinition<1>(deopt_id), |
| + : TemplateDefinition(deopt_id), |
| representation_(representation), |
| is_truncating_(representation == kUnboxedUint32) { |
| SetInputAt(0, value); |
| @@ -7951,17 +7554,12 @@ class UnboxIntNInstr : public TemplateDefinition<1> { |
| virtual CompileType ComputeType() const; |
| - virtual bool AllowsCSE() const { return true; } |
| - virtual EffectSet Effects() const { return EffectSet::None(); } |
| - virtual EffectSet Dependencies() const { return EffectSet::None(); } |
| virtual bool AttributesEqual(Instruction* other) const { |
| UnboxIntNInstr* other_unbox = other->AsUnboxIntN(); |
| return (other_unbox->representation_ == representation_) && |
| (other_unbox->is_truncating_ == is_truncating_); |
| } |
| - virtual bool MayThrow() const { return false; } |
| - |
| virtual Definition* Canonicalize(FlowGraph* flow_graph); |
| virtual void PrintOperandsTo(BufferFormatter* f) const; |
| @@ -8015,13 +7613,13 @@ class UnboxInt32Instr : public UnboxIntNInstr { |
| }; |
| -class UnboxedIntConverterInstr : public TemplateDefinition<1> { |
| +class UnboxedIntConverterInstr : public TemplateDefinition<1, NoThrow> { |
| public: |
| UnboxedIntConverterInstr(Representation from, |
| Representation to, |
| Value* value, |
| intptr_t deopt_id) |
| - : TemplateDefinition<1>(deopt_id), |
| + : TemplateDefinition(deopt_id), |
| from_representation_(from), |
| to_representation_(to), |
| is_truncating_(to == kUnboxedUint32) { |
| @@ -8067,8 +7665,6 @@ class UnboxedIntConverterInstr : public TemplateDefinition<1> { |
| (converter->is_truncating() == is_truncating()); |
| } |
| - virtual bool MayThrow() const { return false; } |
| - |
| virtual void InferRange(RangeAnalysis* analysis, Range* range); |
| virtual void PrintOperandsTo(BufferFormatter* f) const; |
