Skip to content
Permalink
Browse files

Automatic merge of jdk:master into master

  • Loading branch information
duke
duke committed Jul 22, 2020
2 parents 9c18156 + dff37f8 commit 6fa39fe9001aac0df87e7f6e07861f47868b45f6
@@ -2284,7 +2284,6 @@ void LIR_Assembler::emit_arraycopy(LIR_OpArrayCopy* op) {
assert(default_type != NULL && default_type->is_array_klass() && default_type->is_loaded(), "must be true at this point");

int elem_size = type2aelembytes(basic_type);
int shift_amount;
int scale = exact_log2(elem_size);

Address src_length_addr = Address(src, arrayOopDesc::length_offset_in_bytes());
@@ -697,7 +697,6 @@ class StubGenerator: public StubCodeGenerator {
int unit = wordSize * direction;
int bias = (UseSIMDForMemoryOps ? 4:2) * wordSize;

int offset;
const Register t0 = r3, t1 = r4, t2 = r5, t3 = r6,
t4 = r7, t5 = r10, t6 = r11, t7 = r12;
const Register stride = r13;

0 comments on commit 6fa39fe

Please sign in to comment.