Bug 526011 - Backed out changeset ccae3c736aed, premature landing.

--HG--
extra : convert_revision : ba29ca88bc1acdee7ae1a532f202ee99f08ce755

js/src/lirasm/lirasm.cpp

@@ -490,6 +490,7 @@ FragmentAssembler::FragmentAssembler(Lirasm &parent, const string &fragmentName)
                                                   nanojit::LC_FragProfile) ?
                                                   sProfId++ : 0));
     mFragment->lirbuf = mParent.mLirbuf;
+    mFragment->root = mFragment;
     mParent.mFragments[mFragName].fragptr = mFragment;
 
     mLir = mBufWriter  = new LirBufWriter(mParent.mLirbuf);

js/src/nanojit/Fragmento.cpp

@@ -53,11 +53,13 @@ namespace nanojit
     Fragment::Fragment(const void* _ip
                        verbose_only(, uint32_t profFragID))
         :
+          root(NULL),
           lirbuf(NULL),
           lastIns(NULL),
           ip(_ip),
           recordAttempts(0),
           fragEntry(NULL),
+          vmprivate(NULL),
           verbose_only( loopLabel(NULL), )
           verbose_only( profFragID(profFragID), )
           verbose_only( profCount(0), )

js/src/nanojit/Fragmento.h

@@ -63,13 +63,16 @@ namespace nanojit
             NIns*           code()                          { return _code; }
             void            setCode(NIns* codee)            { _code = codee; }
             int32_t&        hits()                          { return _hits; }
+            bool            isRoot() { return root == this; }
 
+            Fragment*      root;
             LirBuffer*     lirbuf;
             LIns*          lastIns;
 
             const void* ip;
             uint32_t recordAttempts;
             NIns* fragEntry;
+            void* vmprivate;
 
             // for fragment entry and exit profiling.  See detailed
             // how-to-use comment below.