Author: Ronan Lamy <[email protected]>
Branch: llconst
Changeset: r80105:24ea9240be59
Date: 2015-10-11 01:16 +0100
http://bitbucket.org/pypy/pypy/changeset/24ea9240be59/
Log: fixes
diff --git a/rpython/memory/test/test_transformed_gc.py
b/rpython/memory/test/test_transformed_gc.py
--- a/rpython/memory/test/test_transformed_gc.py
+++ b/rpython/memory/test/test_transformed_gc.py
@@ -741,7 +741,7 @@
def fix_graph_of_g(translator):
from rpython.translator.translator import graphof
- from rpython.flowspace.model import LLConstant
+ from rpython.rtyper.rmodel import LLConstant
from rpython.rtyper.lltypesystem import rffi
layoutbuilder = cls.ensure_layoutbuilder(translator)
@@ -779,7 +779,7 @@
return 0
def fix_graph_of_g(translator):
from rpython.translator.translator import graphof
- from rpython.flowspace.model import LLConstant
+ from rpython.rtyper.rmodel import LLConstant
from rpython.rtyper.lltypesystem import rffi
layoutbuilder = cls.ensure_layoutbuilder(translator)
type_id = layoutbuilder.get_type_id(P)
diff --git a/rpython/rlib/jit_hooks.py b/rpython/rlib/jit_hooks.py
--- a/rpython/rlib/jit_hooks.py
+++ b/rpython/rlib/jit_hooks.py
@@ -5,7 +5,7 @@
cast_base_ptr_to_instance, llstr)
from rpython.rtyper.extregistry import ExtRegistryEntry
from rpython.rtyper.lltypesystem import llmemory, lltype
-from rpython.flowspace.model import Constant
+from rpython.rtyper.rmodel import LLConstant
from rpython.rtyper import rclass
@@ -152,8 +152,8 @@
return resulttype
def specialize_call(self, hop):
- c_jitdriver = Constant(hop.args_s[0].const,
concretetype=lltype.Void)
- c_name = Constant(name, concretetype=lltype.Void)
+ c_jitdriver = LLConstant(hop.args_s[0].const, lltype.Void)
+ c_name = LLConstant(name, lltype.Void)
hop.exception_cannot_occur()
args_v = [hop.inputarg(arg, arg=i + 1)
for i, arg in enumerate(hop.args_r[1:])]
diff --git a/rpython/translator/c/test/test_database.py
b/rpython/translator/c/test/test_database.py
--- a/rpython/translator/c/test/test_database.py
+++ b/rpython/translator/c/test/test_database.py
@@ -1,9 +1,9 @@
-import sys
from rpython.rtyper.lltypesystem.lltype import *
from rpython.translator.translator import TranslationContext
from rpython.translator.c.database import LowLevelDatabase
-from rpython.flowspace.model import Constant, Variable, SpaceOperation
-from rpython.flowspace.model import Block, Link, FunctionGraph
+from rpython.flowspace.model import (
+ Variable, SpaceOperation, Block, Link, FunctionGraph)
+from rpython.rtyper.rmodel import ll_const
from rpython.rtyper.lltypesystem.lltype import getfunctionptr
from rpython.rtyper.lltypesystem.rffi import VOIDP, INT_real, INT, CArrayPtr
@@ -127,8 +127,7 @@
x.concretetype = Signed
result = Variable("result")
result.concretetype = Signed
- one = Constant(1)
- one.concretetype = Signed
+ one = ll_const(1)
op = SpaceOperation("int_add", [x, one], result)
block = Block([x])
graph = FunctionGraph("f", block)
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
