| Index: src/compiler/opcodes.h
|
| diff --git a/src/compiler/opcodes.h b/src/compiler/opcodes.h
|
| index 28e1d485cda086518e55e5b3b36f0d278753bbef..764d218200322bdb83292f37677bd9b66a84c627 100644
|
| --- a/src/compiler/opcodes.h
|
| +++ b/src/compiler/opcodes.h
|
| @@ -6,27 +6,24 @@
|
| #define V8_COMPILER_OPCODES_H_
|
|
|
| // Opcodes for control operators.
|
| -#define INNER_CONTROL_OP_LIST(V) \
|
| - V(Dead) \
|
| - V(Loop) \
|
| - V(Branch) \
|
| - V(IfTrue) \
|
| - V(IfFalse) \
|
| - V(IfSuccess) \
|
| - V(IfException) \
|
| - V(Switch) \
|
| - V(IfValue) \
|
| - V(IfDefault) \
|
| - V(Merge) \
|
| - V(Deoptimize) \
|
| - V(Return) \
|
| - V(OsrNormalEntry) \
|
| - V(OsrLoopEntry) \
|
| - V(Throw)
|
| -
|
| #define CONTROL_OP_LIST(V) \
|
| - INNER_CONTROL_OP_LIST(V) \
|
| V(Start) \
|
| + V(Dead) \
|
| + V(Loop) \
|
| + V(Branch) \
|
| + V(IfTrue) \
|
| + V(IfFalse) \
|
| + V(IfSuccess) \
|
| + V(IfException) \
|
| + V(Switch) \
|
| + V(IfValue) \
|
| + V(IfDefault) \
|
| + V(Merge) \
|
| + V(Deoptimize) \
|
| + V(Return) \
|
| + V(OsrNormalEntry) \
|
| + V(OsrLoopEntry) \
|
| + V(Throw) \
|
| V(End)
|
|
|
| // Opcodes for constant operators.
|
| @@ -295,12 +292,12 @@ class IrOpcode {
|
|
|
| // Returns true if opcode for common operator.
|
| static bool IsCommonOpcode(Value value) {
|
| - return kDead <= value && value <= kAlways;
|
| + return kStart <= value && value <= kAlways;
|
| }
|
|
|
| // Returns true if opcode for control operator.
|
| static bool IsControlOpcode(Value value) {
|
| - return kDead <= value && value <= kEnd;
|
| + return kStart <= value && value <= kEnd;
|
| }
|
|
|
| // Returns true if opcode for JavaScript operator.
|
|
|