Rebase of partial ia32 implementation of optimized try/catch (started by Kevin Millikin, continued …

src/hydrogen-instructions.h

Index: src/hydrogen-instructions.h
diff --git a/src/hydrogen-instructions.h b/src/hydrogen-instructions.h
index 6de90deb5b3309ff9069abff3f85af5951deaf8f..a751616f3ea9d74fbe8f5f947d0d3731ecdd31e4 100644
--- a/src/hydrogen-instructions.h
+++ b/src/hydrogen-instructions.h
@@ -71,8 +71,8 @@ class LChunkBuilder;
   V(ArgumentsElements)                         \
   V(ArgumentsLength)                           \
   V(ArgumentsObject)                           \
-  V(Bitwise)                                   \
   V(BitNot)                                    \
+  V(Bitwise)                                   \
   V(BlockEntry)                                \
   V(BoundsCheck)                               \
   V(BoundsCheckBaseIndexInformation)           \
@@ -95,11 +95,11 @@ class LChunkBuilder;
   V(CheckPrototypeMaps)                        \
   V(ClampToUint8)                              \
   V(ClassOfTestAndBranch)                      \
-  V(CompareIDAndBranch)                        \
+  V(CompareConstantEqAndBranch)                \
   V(CompareGeneric)                            \
-  V(CompareObjectEqAndBranch)                  \
+  V(CompareIDAndBranch)                        \
   V(CompareMap)                                \
-  V(CompareConstantEqAndBranch)                \
+  V(CompareObjectEqAndBranch)                  \
   V(Constant)                                  \
   V(Context)                                   \
   V(DebugBreak)                                \
@@ -110,6 +110,7 @@ class LChunkBuilder;
   V(DummyUse)                                  \
   V(ElementsKind)                              \
   V(EnterInlined)                              \
+  V(EnterTry)                                  \
   V(EnvironmentMarker)                         \
   V(FixedArrayBaseLength)                      \
   V(ForceRepresentation)                       \
@@ -129,10 +130,11 @@ class LChunkBuilder;
   V(InvokeFunction)                            \
   V(IsConstructCallAndBranch)                  \
   V(IsObjectAndBranch)                         \
-  V(IsStringAndBranch)                         \
   V(IsSmiAndBranch)                            \
+  V(IsStringAndBranch)                         \
   V(IsUndetectableAndBranch)                   \
   V(LeaveInlined)                              \
+  V(LeaveTry)                                  \
   V(LoadContextSlot)                           \
   V(LoadExternalArrayPointer)                  \
   V(LoadFunctionPrototype)                     \
@@ -1353,6 +1355,24 @@ class HTemplateInstruction : public HInstruction {
 };
 
 
+template <>
+class HTemplateInstruction<0> : public HInstruction {
+ public:
+  int OperandCount() { return 0; }
+  virtual HValue* OperandAt(int i) const {
+    UNREACHABLE();
+    return NULL;
+  }
+
+  virtual Representation RequiredInputRepresentation(int index) {
+    return Representation::None();
+  }
+
+ protected:
+  void InternalSetOperandAt(int i, HValue* value) { UNREACHABLE(); }
+};
+
+
 class HControlInstruction: public HInstruction {
  public:
   virtual HBasicBlock* SuccessorAt(int i) = 0;
@@ -2015,6 +2035,29 @@ class HStackCheck: public HTemplateInstruction<1> {
 };
 
 
+class HEnterTry: public HTemplateInstruction<0> {
+ public:
+  explicit HEnterTry(int index) : index_(index) {
+    SetAllSideEffects();
+  }
+
+  DECLARE_CONCRETE_INSTRUCTION(EnterTry)
+
+  int index() { return index_; }
+
+ private:
+  int index_;
+};
+
+
+class HLeaveTry: public HTemplateInstruction<0> {
+ public:
+  HLeaveTry() { SetAllSideEffects(); }
+
+  DECLARE_CONCRETE_INSTRUCTION(LeaveTry)
+};
+
+
 enum InliningKind {
   NORMAL_RETURN,          // Normal function/method call and return.
   DROP_EXTRA_ON_RETURN,   // Drop an extra value from the environment on return.