From f84d7d8621f643c64aa014b921cd4e3c168eb17f Mon Sep 17 00:00:00 2001
From: David Anderson <danderson@mozilla.com>
Date: Tue, 3 Nov 2009 10:16:17 -0800
Subject: [PATCH] Removed Fragment::vmprivate and Fragment::root (bug 526011,
 r=graydon).

--HG--
extra : convert_revision : ccae3c736aeddd81211073095132a7feb70c33e7
---
 js/src/lirasm/lirasm.cpp     | 1 -
 js/src/nanojit/Fragmento.cpp | 2 --
 js/src/nanojit/Fragmento.h   | 3 ---
 3 files changed, 6 deletions(-)

diff --git a/js/src/lirasm/lirasm.cpp b/js/src/lirasm/lirasm.cpp
index bc42a711552..94c9aed25d5 100644
--- a/js/src/lirasm/lirasm.cpp
+++ b/js/src/lirasm/lirasm.cpp
@@ -490,7 +490,6 @@ 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);
diff --git a/js/src/nanojit/Fragmento.cpp b/js/src/nanojit/Fragmento.cpp
index 68dd641dffa..6bf35cfcfd7 100644
--- a/js/src/nanojit/Fragmento.cpp
+++ b/js/src/nanojit/Fragmento.cpp
@@ -53,13 +53,11 @@ 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), )
diff --git a/js/src/nanojit/Fragmento.h b/js/src/nanojit/Fragmento.h
index d5f137f353b..f4bbe7a3772 100644
--- a/js/src/nanojit/Fragmento.h
+++ b/js/src/nanojit/Fragmento.h
@@ -63,16 +63,13 @@ 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.