[INFER] Fix merge botch.
authorBrian Hackett <bhackett1024@gmail.com>
Sat, 28 May 2011 22:44:33 -0700
changeset 75122 56eeb8e6d7c2a62d733de7f15198ebd1503526dd
parent 75121 96fae421af850f50749d0d5787d0d0cb90eef2fd
child 75123 68620d37fb23a0a5237e42842546f20143f3d824
push id2
push userbsmedberg@mozilla.com
push dateFri, 19 Aug 2011 14:38:13 +0000
milestone6.0a1
[INFER] Fix merge botch.
js/src/methodjit/PolyIC.cpp
--- a/js/src/methodjit/PolyIC.cpp
+++ b/js/src/methodjit/PolyIC.cpp
@@ -2130,16 +2130,19 @@ ic::CallName(VMFrame &f, ic::PICInfo *pi
         THROW();
 
     Value rval, thisval;
     if (!cc.retrieve(&rval, &thisval))
         THROW();
 
     f.regs.sp[0] = rval;
     f.regs.sp[1] = thisval;
+
+    if (status == Lookup_Cacheable && !cc.updateTypes())
+        THROW();
     f.script()->typeMonitor(f.cx, f.pc(), rval);
 }
 
 static void JS_FASTCALL
 DisabledBindNameIC(VMFrame &f, ic::PICInfo *pic)
 {
     stubs::BindName(f);
 }