From d09fc9b6b79f4d6a0fbfa7a70e26cd7d33b90de6 Mon Sep 17 00:00:00 2001
From: Nicholas Nethercote <nnethercote@mozilla.com>
Date: Wed, 3 Nov 2010 15:04:51 -0700
Subject: [PATCH] Bug 609129 - TM: fix emitIf(), re-enable implicit guard
 optimization (NJ-specific part).  r=dvander.

--HG--
extra : convert_revision : f348fd5b02118c7151d991f51d76abe69976952e
---
 js/src/nanojit/LIR.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/js/src/nanojit/LIR.cpp b/js/src/nanojit/LIR.cpp
index b0f86a20818..46edd35fd4c 100644
--- a/js/src/nanojit/LIR.cpp
+++ b/js/src/nanojit/LIR.cpp
@@ -2574,9 +2574,7 @@ namespace nanojit
             ins = out->ins2(op, a, b);
             addNL(LIns2, ins, k);
         } else if (ins->isCmp()) {
-            // XXX: temporarily disabled because it exposed latent problems
-            // that caused bug 607856.  See also bug 609129.
-            if (0 && knownCmpValues.containsKey(ins)) {
+            if (knownCmpValues.containsKey(ins)) {
                 // We've seen this comparison before, and it was previously
                 // used in a guard, so we know what its value must be at this
                 // point.  Replace it with a constant.