[pypy-svn] r39796 - in pypy/dist/pypy/translator: . llvm llvm/test

[rxe at codespeak.net]

Author: rxe
Date: Sat Mar  3 14:09:17 2007
New Revision: 39796

Modified:
   pypy/dist/pypy/translator/driver.py
   pypy/dist/pypy/translator/llvm/genllvm.py
   pypy/dist/pypy/translator/llvm/test/test_gc.py
Log:
(mwh, rxe) get rid of a redundant and misleading gcpolicy option

Modified: pypy/dist/pypy/translator/driver.py
==============================================================================
--- pypy/dist/pypy/translator/driver.py	(original)
+++ pypy/dist/pypy/translator/driver.py	Sat Mar  3 14:09:17 2007
@@ -474,9 +474,7 @@
 
         from pypy.translator.llvm import genllvm
 
-        # XXX Need more options for policies/llvm-backendoptions here?
-        self.llvmgen = genllvm.GenLLVM(translator, self.config.translation.gc,
-                                       self.standalone)
+        self.llvmgen = genllvm.GenLLVM(translator, self.standalone)
 
         llvm_filename = self.llvmgen.gen_llvm_source(self.entry_point)
         self.log.info("written: %s" % (llvm_filename,))

Modified: pypy/dist/pypy/translator/llvm/genllvm.py
==============================================================================
--- pypy/dist/pypy/translator/llvm/genllvm.py	(original)
+++ pypy/dist/pypy/translator/llvm/genllvm.py	Sat Mar  3 14:09:17 2007
@@ -24,18 +24,12 @@
     # see create_codewriter() below
     function_count = {}
 
-    def __init__(self, translator, gcpolicy, standalone,
+    def __init__(self, translator, standalone,
                  debug=False, logging=True, stackless=False):
     
         # reset counters
         LLVMNode.nodename_count = {}    
 
-        if gcpolicy is None:
-            gcpolicy = "boehm"
-        
-        self.gcpolicy = gcpolicy
-        
-
         self.standalone = standalone
         self.translator = translator
         
@@ -76,15 +70,16 @@
             create ll file for c file
             create codewriter """
 
-        # please dont ask!
+        # XXX please dont ask!
         from pypy.translator.c.genc import CStandaloneBuilder
-        from pypy.translator.c import gc
         cbuild = CStandaloneBuilder(self.translator, func, config=self.config)
         cbuild.stackless = self.stackless
         c_db = cbuild.generate_graphs_for_llinterp()
 
         self.db = Database(self, self.translator)
-        self.db.gcpolicy = GcPolicy.new(self.db, self.gcpolicy)
+
+        # XXX hardcoded for now
+        self.db.gcpolicy = GcPolicy.new(self.db, 'boehm')
 
         # get entry point
         entry_point = self.get_entry_point(func)
@@ -354,7 +349,6 @@
 
     # create genllvm
     gen = GenLLVM(translator,
-                  gcpolicy,
                   standalone,
                   debug=debug,
                   logging=logging,

Modified: pypy/dist/pypy/translator/llvm/test/test_gc.py
==============================================================================
--- pypy/dist/pypy/translator/llvm/test/test_gc.py	(original)
+++ pypy/dist/pypy/translator/llvm/test/test_gc.py	Sat Mar  3 14:09:17 2007
@@ -1,9 +1,11 @@
 import sys
 
 import py
-
 from pypy.translator.llvm.test.runtest import *
 
+def setup_module(mod):
+    py.test.skip('skipping somewhat futile tests')
+
 def test_GC_malloc(): 
     def tuple_getitem(n): 
         x = 666