[pypy-commit] pypy default: Port another minor fix from the llvm branch.
Manuel Jacob
noreply at buildbot.pypy.org
Tue Jan 21 14:22:21 CET 2014
Author: Manuel Jacob
Branch:
Changeset: r68805:f6615f79d1cc
Date: 2014-01-21 14:18 +0100
http://bitbucket.org/pypy/pypy/changeset/f6615f79d1cc/
Log: Port another minor fix from the llvm branch.
diff --git a/rpython/jit/backend/llsupport/gc.py b/rpython/jit/backend/llsupport/gc.py
--- a/rpython/jit/backend/llsupport/gc.py
+++ b/rpython/jit/backend/llsupport/gc.py
@@ -454,17 +454,19 @@
unicode_ofs_length = self.unicode_descr.lendescr.offset
def malloc_str(length):
+ type_id = llop.extract_ushort(llgroup.HALFWORD, str_type_id)
return llop1.do_malloc_varsize_clear(
llmemory.GCREF,
- str_type_id, length, str_basesize, str_itemsize,
+ type_id, length, str_basesize, str_itemsize,
str_ofs_length)
self.generate_function('malloc_str', malloc_str,
[lltype.Signed])
def malloc_unicode(length):
+ type_id = llop.extract_ushort(llgroup.HALFWORD, unicode_type_id)
return llop1.do_malloc_varsize_clear(
llmemory.GCREF,
- unicode_type_id, length, unicode_basesize, unicode_itemsize,
+ type_id, length, unicode_basesize, unicode_itemsize,
unicode_ofs_length)
self.generate_function('malloc_unicode', malloc_unicode,
[lltype.Signed])
More information about the pypy-commit
mailing list