--- a/js/src/jstracer.cpp
+++ b/js/src/jstracer.cpp
@@ -1243,22 +1243,16 @@ IsSlotUndemotable(Oracle* oracle, JSCont
 {
     if (slot < f->nStackTypes)
         return oracle->isStackSlotUndemotable(cx, slot, ip);
 
     uint16* gslots = f->globalSlots->data();
     return oracle->isGlobalSlotUndemotable(cx, gslots[slot - f->nStackTypes]);
 }
 
-static JS_REQUIRES_STACK bool
-IsSlotUndemotable(Oracle* oracle, JSContext* cx, LinkableFragment* f, unsigned slot)
-{
-    return IsSlotUndemotable(oracle, cx, f, slot, cx->fp->regs->pc);
-}
-
 class FrameInfoCache
 {
     struct HashPolicy
     {
         typedef FrameInfo *Lookup;
         static HashNumber hash(const FrameInfo* fi) {
             size_t len = sizeof(FrameInfo) + fi->callerHeight * sizeof(TraceType);
             HashNumber h = 0;

--- a/js/src/jstracer.h
+++ b/js/src/jstracer.h
@@ -913,25 +913,25 @@ typedef HashMap<nanojit::LIns*, JSObject
 #else
 # define AbortRecording(cx, reason) AbortRecordingImpl(cx)
 #endif
 
 class TraceRecorder
 {
     /*************************************************************** Recording session constants */
 
-    /* Cached oracle keeps track of hit counts for program counter locations */
-    Oracle*                         oracle;
-
     /* The context in which recording started. */
     JSContext* const                cx;
 
     /* Cached value of JS_TRACE_MONITOR(cx). */
     TraceMonitor* const             traceMonitor;
 
+    /* Cached oracle keeps track of hit counts for program counter locations */
+    Oracle*                         oracle;
+
     /* The Fragment being recorded by this recording session. */
     VMFragment* const               fragment;
 
     /* The root fragment representing the tree. */
     TreeFragment* const             tree;
 
     /* The reason we started recording. */
     RecordReason const              recordReason;