[INFER] Replace assert removed by rev 261101d210dc, bug 618849.
authorBrian Hackett <bhackett1024@gmail.com>
Mon, 13 Dec 2010 12:03:24 -0800
changeset 74660 8492590010d7d06670817d2c4cd6e5d9e62201da
parent 74659 261101d210dc025392f919e020c97905b61432e4
child 74661 6e0795e82953f4f462fc19dbfb3a2011341e01f2
push id2
push userbsmedberg@mozilla.com
push dateFri, 19 Aug 2011 14:38:13 +0000
bugs618849
milestone2.0b8pre
[INFER] Replace assert removed by rev 261101d210dc, bug 618849.
js/src/methodjit/FrameState-inl.h
--- a/js/src/methodjit/FrameState-inl.h
+++ b/js/src/methodjit/FrameState-inl.h
@@ -815,16 +815,19 @@ FrameState::learnType(FrameEntry *fe, JS
     fe->setType(type);
     if (unsync)
         fe->type.unsync();
 }
 
 inline void
 FrameState::learnType(FrameEntry *fe, JSValueType type, RegisterID data)
 {
+    /* The copied bit may be set on an entry, but there should not be any actual copies. */
+    JS_ASSERT_IF(fe->isCopied(), !isEntryCopied(fe));
+
     forgetAllRegs(fe);
     fe->copy = NULL;
 
     fe->type.setConstant();
     fe->knownType = type;
 
     fe->data.setRegister(data);
     regstate(data).associate(fe, RematInfo::DATA);