Author: Maciej Fijalkowski <[email protected]>
Branch: optresult
Changeset: r77823:5c532c9ba4cf
Date: 2015-06-03 16:02 +0200
http://bitbucket.org/pypy/pypy/changeset/5c532c9ba4cf/
Log: unify the interface
diff --git a/rpython/jit/backend/llgraph/runner.py
b/rpython/jit/backend/llgraph/runner.py
--- a/rpython/jit/backend/llgraph/runner.py
+++ b/rpython/jit/backend/llgraph/runner.py
@@ -219,7 +219,7 @@
def get_arraydescr(self):
return self.arraydescr
- def get_fielddescr(self):
+ def get_field_descr(self):
return self.fielddescr
def __repr__(self):
diff --git a/rpython/jit/backend/llsupport/descr.py
b/rpython/jit/backend/llsupport/descr.py
--- a/rpython/jit/backend/llsupport/descr.py
+++ b/rpython/jit/backend/llsupport/descr.py
@@ -314,6 +314,9 @@
def get_arraydescr(self):
return self.arraydescr
+ def get_field_descr(self):
+ return self.fielddescr
+
def sort_key(self):
return self.fielddescr.sort_key()
diff --git a/rpython/jit/metainterp/optimizeopt/info.py
b/rpython/jit/metainterp/optimizeopt/info.py
--- a/rpython/jit/metainterp/optimizeopt/info.py
+++ b/rpython/jit/metainterp/optimizeopt/info.py
@@ -352,7 +352,7 @@
if all_fdescrs is None:
return 0 # annotation hack
one_size = len(all_fdescrs)
- return index * one_size + fielddescr.fielddescr.get_index()
+ return index * one_size + fielddescr.get_field_descr().get_index()
def setinteriorfield_virtual(self, index, fielddescr, fld):
index = self._compute_index(index, fielddescr)
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
