| Index: vm/intermediate_language.h
|
| ===================================================================
|
| --- vm/intermediate_language.h (revision 9345)
|
| +++ vm/intermediate_language.h (working copy)
|
| @@ -1707,7 +1707,8 @@
|
| M(Throw) \
|
| M(ReThrow) \
|
| M(Branch) \
|
| - M(ParallelMove)
|
| + M(ParallelMove) \
|
| + M(Parameter)
|
|
|
|
|
| // Forward declarations for Instruction classes.
|
| @@ -1987,13 +1988,13 @@
|
|
|
| virtual void PrepareEntry(FlowGraphCompiler* compiler);
|
|
|
| - ZoneGrowableArray<Value*>* start_env() const { return start_env_; }
|
| - void set_start_env(ZoneGrowableArray<Value*>* env) { start_env_ = env; }
|
| + Environment* start_env() const { return start_env_; }
|
| + void set_start_env(Environment* env) { start_env_ = env; }
|
|
|
| private:
|
| TargetEntryInstr* normal_entry_;
|
| GrowableArray<TargetEntryInstr*> catch_entries_;
|
| - ZoneGrowableArray<Value*>* start_env_;
|
| + Environment* start_env_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(GraphEntryInstr);
|
| };
|
| @@ -2189,6 +2190,21 @@
|
| };
|
|
|
|
|
| +class ParameterInstr: public Definition {
|
| + public:
|
| + explicit ParameterInstr(intptr_t index) : index_(index) { }
|
| +
|
| + intptr_t index() const { return index_; }
|
| +
|
| + DECLARE_INSTRUCTION(Parameter)
|
| +
|
| + private:
|
| + intptr_t index_;
|
| +
|
| + DISALLOW_COPY_AND_ASSIGN(ParameterInstr);
|
| +};
|
| +
|
| +
|
| class ReturnInstr : public InstructionWithInputs {
|
| public:
|
| ReturnInstr(intptr_t token_pos, Value* value)
|
|
|