[pypy-svn] pypy jitypes2: revert 96964ba376b4, and fix the test in another way: it's better to use logger_noopt because this way the name of the variables are preserved

[antocuni]

Author: Antonio Cuni <anto.cuni at gmail.com>
Branch: jitypes2
Changeset: r41610:5fbf8ac37f9e
Date: 2011-02-04 13:42 +0100
http://bitbucket.org/pypy/pypy/changeset/5fbf8ac37f9e/

Log:	revert 96964ba376b4, and fix the test in another way: it's better to
	use logger_noopt because this way the name of the variables are
	preserved

diff --git a/pypy/jit/metainterp/optimizeopt/fficall.py b/pypy/jit/metainterp/optimizeopt/fficall.py
--- a/pypy/jit/metainterp/optimizeopt/fficall.py
+++ b/pypy/jit/metainterp/optimizeopt/fficall.py
@@ -73,7 +73,7 @@
 
     def setup(self):
         self.funcinfo = None
-        self.logger = self.optimizer.metainterp_sd.logger_ops
+        self.logger = self.optimizer.metainterp_sd.logger_noopt
 
     def propagate_begin_forward(self):
         debug_start('jit-log-ffiopt')

diff --git a/pypy/jit/metainterp/test/test_optimizebasic.py b/pypy/jit/metainterp/test/test_optimizebasic.py
--- a/pypy/jit/metainterp/test/test_optimizebasic.py
+++ b/pypy/jit/metainterp/test/test_optimizebasic.py
@@ -33,6 +33,7 @@
         self.options = Fake()
         self.globaldata = Fake()
         self.logger_ops = FakeLogger()
+        self.logger_noopt = FakeLogger()
 
 def test_store_final_boxes_in_guard():
     from pypy.jit.metainterp.compile import ResumeGuardDescr

diff --git a/.hgsubstate b/.hgsubstate
--- a/.hgsubstate
+++ b/.hgsubstate
@@ -1,4 +1,4 @@
 80037 greenlet
 80037 lib_pypy/pyrepl
-80037 lib_pypy/sqlite3
+80282 lib_pypy/sqlite3
 80037 testrunner