[pypy-commit] pypy py3.6: merge default into py3.6

[mattip]

Author: Matti Picus <matti.picus at gmail.com>
Branch: py3.6
Changeset: r97216:8df39cb01740
Date: 2019-08-19 10:17 +0300
http://bitbucket.org/pypy/pypy/changeset/8df39cb01740/

Log:	merge default into py3.6

diff --git a/rpython/jit/backend/aarch64/opassembler.py b/rpython/jit/backend/aarch64/opassembler.py
--- a/rpython/jit/backend/aarch64/opassembler.py
+++ b/rpython/jit/backend/aarch64/opassembler.py
@@ -168,7 +168,7 @@
         self.emit_int_comp_op(op, arglocs[0], arglocs[1])
         return c.NE
 
-    emit_comp_op_ptr_ne = emit_comp_op_int_ne
+    emit_comp_op_ptr_ne = emit_comp_op_instance_ptr_ne = emit_comp_op_int_ne
 
     def emit_comp_op_uint_lt(self, op, arglocs):
         self.emit_int_comp_op(op, arglocs[0], arglocs[1])
diff --git a/rpython/jit/backend/aarch64/regalloc.py b/rpython/jit/backend/aarch64/regalloc.py
--- a/rpython/jit/backend/aarch64/regalloc.py
+++ b/rpython/jit/backend/aarch64/regalloc.py
@@ -419,7 +419,7 @@
     prepare_comp_op_int_ne = prepare_int_cmp
     prepare_comp_op_int_eq = prepare_int_cmp
     prepare_comp_op_ptr_eq = prepare_comp_op_instance_ptr_eq = prepare_int_cmp
-    prepare_comp_op_ptr_ne = prepare_int_cmp
+    prepare_comp_op_ptr_ne = prepare_comp_op_instance_ptr_ne = prepare_int_cmp
     prepare_comp_op_uint_lt = prepare_int_cmp
     prepare_comp_op_uint_le = prepare_int_cmp
     prepare_comp_op_uint_ge = prepare_int_cmp
diff --git a/rpython/rlib/rvmprof/src/shared/vmprof_common.c b/rpython/rlib/rvmprof/src/shared/vmprof_common.c
--- a/rpython/rlib/rvmprof/src/shared/vmprof_common.c
+++ b/rpython/rlib/rvmprof/src/shared/vmprof_common.c
@@ -244,9 +244,9 @@
         return -1;
     if (thread_count == threads_size) {
         threads_size += threads_size_step;
-        threads = realloc(threads, sizeof(pid_t) * threads_size);
+        threads = realloc(threads, sizeof(pthread_t) * threads_size);
         assert(threads != NULL);
-        memset(threads + thread_count, 0, sizeof(pid_t) * threads_size_step);
+        memset(threads + thread_count, 0, sizeof(pthread_t) * threads_size_step);
     }
     threads[thread_count++] = tid;
     return thread_count;