Commit 335d98c7 authored by John Zhang's avatar John Zhang

updated pypy.patch

parent a2905ea4
Pipeline #808 failed with stage
in 0 seconds
......@@ -40,9 +40,18 @@ index e973a94..b9752e8 100644
def non_virtual_ref(x):
diff --git a/rpython/rlib/rposix.py b/rpython/rlib/rposix.py
index f35e2b7..6aad4b8 100644
index f35e2b7..fd91235 100644
--- a/rpython/rlib/rposix.py
+++ b/rpython/rlib/rposix.py
@@ -640,7 +640,7 @@ if not _WIN32:
DT_DIR = rffi_platform.ConstantInteger('DT_DIR')
DT_LNK = rffi_platform.ConstantInteger('DT_LNK')
- DIRP = rffi.COpaquePtr('DIR')
+ DIRP = rffi.COpaquePtr('DIR', compilation_info=eci)
dirent_config = rffi_platform.configure(CConfig)
DIRENT = dirent_config['DIRENT']
DIRENTP = lltype.Ptr(DIRENT)
@@ -1778,9 +1778,9 @@ def uname():
lltype.free(l_utsbuf, flavor='raw')
......@@ -109,6 +118,19 @@ index b3bc6ed..4edfcaa 100644
@py.test.mark.skipif("not hasattr(os, 'ttyname')")
class TestOsExpect(ExpectTest):
diff --git a/rpython/rtyper/lltypesystem/lltype.py b/rpython/rtyper/lltypesystem/lltype.py
index e6239b4..64a3490 100644
--- a/rpython/rtyper/lltypesystem/lltype.py
+++ b/rpython/rtyper/lltypesystem/lltype.py
@@ -1623,7 +1623,7 @@ class _interior_ptr(_abstract_ptr):
if ob is None:
raise RuntimeError
return InteriorPtr(typeOf(ob), self._T, self._offsets)
-## _TYPE = property(_get_TYPE)
+ _TYPE = property(_get_TYPE)
def _expose(self, offset, val):
"""XXX A nice docstring here"""
diff --git a/rpython/rtyper/lltypesystem/rffi.py b/rpython/rtyper/lltypesystem/rffi.py
index 1b7a007..48d04d5 100644
--- a/rpython/rtyper/lltypesystem/rffi.py
......@@ -200,16 +222,3 @@ index cafc9b1..380db0d 100644
self._execute_c_compiler(cc, args, exe_name,
cwd=str(exe_name.dirpath()))
return exe_name
diff --git a/rpython/rtyper/lltypesystem/lltype.py b/rpython/rtyper/lltypesystem/lltype.py
index e6239b4324..64a3490e32 100644
--- a/rpython/rtyper/lltypesystem/lltype.py
+++ b/rpython/rtyper/lltypesystem/lltype.py
@@ -1623,7 +1623,7 @@ class _interior_ptr(_abstract_ptr):
if ob is None:
raise RuntimeError
return InteriorPtr(typeOf(ob), self._T, self._offsets)
-## _TYPE = property(_get_TYPE)
+ _TYPE = property(_get_TYPE)
def _expose(self, offset, val):
"""XXX A nice docstring here"""
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment