diff --git a/js/src/jstracer.cpp b/js/src/jstracer.cpp index f4232e130b99..a264ad4943e1 100644 --- a/js/src/jstracer.cpp +++ b/js/src/jstracer.cpp @@ -5000,7 +5000,6 @@ AttemptToExtendTree(JSContext* cx, VMSideExit* anchor, VMSideExit* exitedFrom, j " LINE=%d ANCHOR=%p OFFS=%d\n", f, c, cx->fp->regs->pc, cx->fp->script->filename, js_FramePCToLineNumber(cx, cx->fp), anchor, FramePCOffset(cx->fp)); - c->spawnedFrom = anchor; c->parent = f; anchor->target = c; c->root = f; diff --git a/js/src/nanojit/Assembler.cpp b/js/src/nanojit/Assembler.cpp index 23a44bab4895..a95b35f6b99d 100644 --- a/js/src/nanojit/Assembler.cpp +++ b/js/src/nanojit/Assembler.cpp @@ -735,7 +735,6 @@ namespace nanojit prev = &vbr; ) - verbose_only(_thisfrag->compileNbr++; ) _inExit = false; LabelStateMap labels(alloc); diff --git a/js/src/nanojit/Fragmento.cpp b/js/src/nanojit/Fragmento.cpp index bde86e9559f3..f16eb330553f 100644 --- a/js/src/nanojit/Fragmento.cpp +++ b/js/src/nanojit/Fragmento.cpp @@ -53,22 +53,6 @@ namespace nanojit // Fragment::Fragment(const void* _ip) : -#ifdef NJ_VERBOSE - _called(0), - _native(0), - _exitNative(0), - _lir(0), - _lirbytes(0), - _token(NULL), - traceTicks(0), - interpTicks(0), - eot_target(NULL), - sid(0), - compileNbr(0), -#endif - treeBranches(NULL), - branches(NULL), - nextbranch(NULL), anchor(NULL), root(NULL), parent(NULL), @@ -76,11 +60,8 @@ namespace nanojit peer(NULL), lirbuf(NULL), lastIns(NULL), - spawnedFrom(NULL), kind(LoopTrace), ip(_ip), - guardCount(0), - xjumpCount(0), recordAttempts(0), fragEntry(NULL), loopEntry(NULL), diff --git a/js/src/nanojit/Fragmento.h b/js/src/nanojit/Fragmento.h index 34b96db94f4c..d1cc9154d508 100644 --- a/js/src/nanojit/Fragmento.h +++ b/js/src/nanojit/Fragmento.h @@ -65,41 +65,22 @@ namespace nanojit public: Fragment(const void*); - NIns* code() { return _code; } - void setCode(NIns* codee) { _code = codee; } - int32_t& hits() { return _hits; } + NIns* code() { return _code; } + void setCode(NIns* codee) { _code = codee; } + int32_t& hits() { return _hits; } bool isAnchor() { return anchor == this; } bool isRoot() { return root == this; } - verbose_only( uint32_t _called; ) - verbose_only( uint32_t _native; ) - verbose_only( uint32_t _exitNative; ) - verbose_only( uint32_t _lir; ) - verbose_only( uint32_t _lirbytes; ) - verbose_only( const char* _token; ) - verbose_only( uint64_t traceTicks; ) - verbose_only( uint64_t interpTicks; ) - verbose_only( DWB(Fragment*) eot_target; ) - verbose_only( uint32_t sid;) - verbose_only( uint32_t compileNbr;) - - DWB(Fragment*) treeBranches; - DWB(Fragment*) branches; - DWB(Fragment*) nextbranch; - DWB(Fragment*) anchor; - DWB(Fragment*) root; - DWB(Fragment*) parent; - DWB(Fragment*) first; - DWB(Fragment*) peer; + Fragment* anchor; + Fragment* root; + Fragment* parent; + Fragment* first; + Fragment* peer; LirBuffer* lirbuf; LIns* lastIns; - SideExit* spawnedFrom; - GuardRecord* outbound; TraceKind kind; const void* ip; - uint32_t guardCount; - uint32_t xjumpCount; uint32_t recordAttempts; NIns* fragEntry; NIns* loopEntry;