[pypy-svn] r68935 - in pypy/branch/jit-removetypeptr/pypy: config jit/backend/x86/test

[arigo at codespeak.net]

Author: arigo
Date: Tue Nov  3 14:46:09 2009
New Revision: 68935

Modified:
   pypy/branch/jit-removetypeptr/pypy/config/translationoption.py
   pypy/branch/jit-removetypeptr/pypy/jit/backend/x86/test/test_zrpy_gc.py
Log:
'gcremovetypeptr' cannot be enabled for non-framework translations.


Modified: pypy/branch/jit-removetypeptr/pypy/config/translationoption.py
==============================================================================
--- pypy/branch/jit-removetypeptr/pypy/config/translationoption.py	(original)
+++ pypy/branch/jit-removetypeptr/pypy/config/translationoption.py	Tue Nov  3 14:46:09 2009
@@ -65,9 +65,12 @@
                  ["boehm", "ref", "framework", "none"],
                  default="ref", cmdline=None,
                  requires={
-                     "boehm": [("translation.gcrootfinder", "n/a")],
-                     "ref": [("translation.gcrootfinder", "n/a")],
-                     "none": [("translation.gcrootfinder", "n/a")],
+                     "boehm": [("translation.gcrootfinder", "n/a"),
+                               ("translation.gcremovetypeptr", False)],
+                     "ref": [("translation.gcrootfinder", "n/a"),
+                             ("translation.gcremovetypeptr", False)],
+                     "none": [("translation.gcrootfinder", "n/a"),
+                              ("translation.gcremovetypeptr", False)],
                  }),
     BoolOption("gcremovetypeptr", "Remove the typeptr from every object",
                default=False, cmdline="--gcremovetypeptr"),

Modified: pypy/branch/jit-removetypeptr/pypy/jit/backend/x86/test/test_zrpy_gc.py
==============================================================================
--- pypy/branch/jit-removetypeptr/pypy/jit/backend/x86/test/test_zrpy_gc.py	(original)
+++ pypy/branch/jit-removetypeptr/pypy/jit/backend/x86/test/test_zrpy_gc.py	Tue Nov  3 14:46:09 2009
@@ -78,7 +78,8 @@
     #
     t = TranslationContext()
     t.config.translation.gc = gc
-    t.config.translation.gcremovetypeptr = True
+    if gc != 'boehm':
+        t.config.translation.gcremovetypeptr = True
     for name, value in kwds.items():
         setattr(t.config.translation, name, value)
     ann = t.buildannotator(policy=annpolicy.StrictAnnotatorPolicy())