From 7731c39c8622030c8459d2c1b2db0237c549dbcf Mon Sep 17 00:00:00 2001
From: Jan de Mooij <jdemooij@mozilla.com>
Date: Fri, 8 May 2015 15:18:03 +0200
Subject: [PATCH] Bug 1157239 - Give MGuardShape and friends a resultTypeSet.
 r=h4writer

--HG--
extra : rebase_source : a60092660cbce30e855bf6e6c960bb5929991439
---
 js/src/jit/MIR.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/js/src/jit/MIR.h b/js/src/jit/MIR.h
index 7267964d2eea..08bdf0438226 100644
--- a/js/src/jit/MIR.h
+++ b/js/src/jit/MIR.h
@@ -4464,6 +4464,7 @@ class MGuardObject
         setGuard();
         setMovable();
         setResultType(MIRType_Object);
+        setResultTypeSet(ins->resultTypeSet());
     }
 
   public:
@@ -4510,6 +4511,7 @@ class MPolyInlineGuard
     {
         setGuard();
         setResultType(MIRType_Object);
+        setResultTypeSet(ins->resultTypeSet());
     }
 
   public:
@@ -10366,6 +10368,7 @@ class MGuardShape
         setGuard();
         setMovable();
         setResultType(MIRType_Object);
+        setResultTypeSet(obj->resultTypeSet());
 
         // Disallow guarding on unboxed object shapes. The group is better to
         // guard on, and guarding on the shape can interact badly with
@@ -10419,6 +10422,7 @@ class MGuardReceiverPolymorphic
         setGuard();
         setMovable();
         setResultType(MIRType_Object);
+        setResultTypeSet(obj->resultTypeSet());
     }
 
   public: