[pypy-commit] pypy stmgc-c4: More merge fixes

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: stmgc-c4
Changeset: r66794:92f08aa9fa6c
Date: 2013-09-05 13:43 +0200
http://bitbucket.org/pypy/pypy/changeset/92f08aa9fa6c/

Log:	More merge fixes

diff --git a/rpython/translator/stm/breakfinder.py b/rpython/translator/stm/breakfinder.py
--- a/rpython/translator/stm/breakfinder.py
+++ b/rpython/translator/stm/breakfinder.py
@@ -1,5 +1,4 @@
 from rpython.translator.backendopt import graphanalyze
-from rpython.translator.simplify import get_funcobj
 
 
 TRANSACTION_BREAK = set([
diff --git a/rpython/translator/stm/inevitable.py b/rpython/translator/stm/inevitable.py
--- a/rpython/translator/stm/inevitable.py
+++ b/rpython/translator/stm/inevitable.py
@@ -2,7 +2,6 @@
 from rpython.translator.stm.writebarrier import is_immutable
 from rpython.flowspace.model import SpaceOperation, Constant
 from rpython.translator.unsimplify import varoftype
-from rpython.translator.simplify import get_funcobj
 
 
 ALWAYS_ALLOW_OPERATIONS = set([
@@ -82,7 +81,7 @@
     #
     # Function calls
     if op.opname == 'direct_call':
-        funcptr = get_funcobj(op.args[0].value)
+        funcptr = op.args[0].value._obj
         if not hasattr(funcptr, "external"):
             return False
         if getattr(funcptr, "transactionsafe", False):