From 5a449614d790062b9282b3501e2f24694b1407a4 Mon Sep 17 00:00:00 2001
From: Nicholas Nethercote <nnethercote@mozilla.com>
Date: Tue, 29 Sep 2009 11:46:06 +1000
Subject: [PATCH] Bug 519371 - NJ merge: add missing PEDANTIC occurrences. 
 r=dvander.

---
 js/src/nanojit/Assembler.cpp | 7 +++++++
 js/src/nanojit/Assembler.h   | 3 +++
 2 files changed, 10 insertions(+)

diff --git a/js/src/nanojit/Assembler.cpp b/js/src/nanojit/Assembler.cpp
index c86c2219505e..06a72012ea59 100644
--- a/js/src/nanojit/Assembler.cpp
+++ b/js/src/nanojit/Assembler.cpp
@@ -105,6 +105,9 @@ namespace nanojit
         , _labels(alloc)
         , _epilogue(NULL)
         , _err(None)
+    #if PEDANTIC
+        , pedanticTop(NULL)
+    #endif
         , config(core->config)
     {
         VMPI_memset(&_stats, 0, sizeof(_stats));
@@ -337,10 +340,14 @@ namespace nanojit
 
     Register Assembler::getBaseReg(LIns *i, int &d, RegisterMask allow)
     {
+    #if !PEDANTIC
         if (i->isop(LIR_alloc)) {
             d += findMemFor(i);
             return FP;
         }
+    #else
+        (void) d;
+    #endif
         return findRegFor(i, allow);
     }
 
diff --git a/js/src/nanojit/Assembler.h b/js/src/nanojit/Assembler.h
index ccbfab3d0dc3..f574e382d9ed 100644
--- a/js/src/nanojit/Assembler.h
+++ b/js/src/nanojit/Assembler.h
@@ -253,6 +253,9 @@ namespace nanojit
             NIns*       _nExitIns;      // current instruction in exit fragment page
             NIns*       _epilogue;
             AssmError   _err;           // 0 = means assemble() appears ok, otherwise it failed
+        #if PEDANTIC
+            NIns*       pedanticTop;
+        #endif
 
             AR          _activation;
             RegAlloc    _allocator;