Mercurial > hg > graal-jvmci-8

comparison src/cpu/x86/vm/c1_LIRGenerator_x86.cpp @ 23660:b5f3a471e646

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge.
author Doug Simon <doug.simon@oracle.com>
date Wed, 01 Jun 2016 00:11:44 +0200
parents 7848fc12602b 32b682649973
children f13e777eb255
comparison
equal deleted inserted replaced
23411:d7cf78885a3a 23660:b5f3a471e646
1 /* 1 /*
2 * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 * 4 *
5 * This code is free software; you can redistribute it and/or modify it 5 * This code is free software; you can redistribute it and/or modify it
6 * under the terms of the GNU General Public License version 2 only, as 6 * under the terms of the GNU General Public License version 2 only, as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
281 if (use_length && needs_range_check) { 281 if (use_length && needs_range_check) {
282 length.set_instruction(x->length()); 282 length.set_instruction(x->length());
283 length.load_item(); 283 length.load_item();
284 284
285 } 285 }
286 if (needs_store_check) { 286 if (needs_store_check || x->check_boolean()) {
287 value.load_item(); 287 value.load_item();
288 } else { 288 } else {
289 value.load_for_store(x->elt_type()); 289 value.load_for_store(x->elt_type());
290 } 290 }
291 291
329 true /* do_load */, false /* patch */, NULL); 329 true /* do_load */, false /* patch */, NULL);
330 __ move(value.result(), array_addr, null_check_info); 330 __ move(value.result(), array_addr, null_check_info);
331 // Seems to be a precise 331 // Seems to be a precise
332 post_barrier(LIR_OprFact::address(array_addr), value.result()); 332 post_barrier(LIR_OprFact::address(array_addr), value.result());
333 } else { 333 } else {
334 __ move(value.result(), array_addr, null_check_info); 334 LIR_Opr result = maybe_mask_boolean(x, array.result(), value.result(), null_check_info);
335 __ move(result, array_addr, null_check_info);
335 } 336 }
336 } 337 }
337 338
338 339
339 void LIRGenerator::do_MonitorEnter(MonitorEnter* x) { 340 void LIRGenerator::do_MonitorEnter(MonitorEnter* x) {