[pypy-commit] pypy llvm-translation-backend: hg merge default

[mjacob]

Author: Manuel Jacob <me at manueljacob.de>
Branch: llvm-translation-backend
Changeset: r76620:9f1f8c424c2b
Date: 2015-03-29 16:01 +0200
http://bitbucket.org/pypy/pypy/changeset/9f1f8c424c2b/

Log:	hg merge default

diff --git a/rpython/memory/gctransform/framework.py b/rpython/memory/gctransform/framework.py
--- a/rpython/memory/gctransform/framework.py
+++ b/rpython/memory/gctransform/framework.py
@@ -521,7 +521,6 @@
         custom_trace_funcs_unrolled = unrolling_iterable(
             [(self.get_type_id(TP), func) for TP, func in custom_trace_funcs])
 
-        @rgc.no_collect
         @specialize.arg(2)
         def custom_trace_dispatcher(obj, typeid, callback, arg):
             for type_id_exp, func in custom_trace_funcs_unrolled: