archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-19 18:44:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8080699: Assert failed: Not a Java pointer in JCK test

Browse source 
Eliminated arraycopy node still reachable through exception edges

Reviewed-by: kvn
This commit is contained in:
Roland Westrelin 2015-05-22 09:14:18 +02:00
parent 149c6327be
commit 0296c2894b
3 changed files with 73 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
hotspot/src/share/vm/opto/arraycopynode.cpp
View file

@ -599,10 +599,14 @@ Node *ArrayCopyNode::Ideal(PhaseGVN *phase, bool can_reshape) {
}
bool ArrayCopyNode::may_modify(const TypeOopPtr *t_oop, PhaseTransform *phase) {
const TypeOopPtr* dest_t = phase->type(in(ArrayCopyNode::Dest))->is_oopptr();
Node* dest = in(ArrayCopyNode::Dest);
if (dest->is_top()) {
return false;
}
const TypeOopPtr* dest_t = phase->type(dest)->is_oopptr();
assert(!dest_t->is_known_instance() || _dest_type->is_known_instance(), "result of EA not recorded");
const TypeOopPtr* src_t = phase->type(in(ArrayCopyNode::Src))->is_oopptr();
assert(!src_t->is_known_instance() || _src_type->is_known_instance(), "result of EA not recorded");
assert(in(ArrayCopyNode::Src)->is_top() || !phase->type(in(ArrayCopyNode::Src))->is_oopptr()->is_known_instance() ||
_src_type->is_known_instance(), "result of EA not recorded");
if (_dest_type != TypeOopPtr::BOTTOM || t_oop->is_known_instance()) {
assert(_dest_type == TypeOopPtr::BOTTOM || _dest_type->is_known_instance(), "result of EA is known instance");

2
hotspot/src/share/vm/opto/callnode.cpp
View file

@ -1946,7 +1946,7 @@ bool CallLeafNode::may_modify(const TypeOopPtr *t_oop, PhaseTransform *phase) {
}
}
}
if (may_modify_arraycopy_helper(phase->type(dest)->is_oopptr(), t_oop, phase)) {
if (!dest->is_top() && may_modify_arraycopy_helper(phase->type(dest)->is_oopptr(), t_oop, phase)) {
return true;
}
return false;

65
hotspot/test/compiler/arraycopy/TestDeadArrayCopyOnMemChain.java Normal file
View file

@ -0,0 +1,65 @@
/*
* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* @test
* @bug 8080699
* @summary eliminated arraycopy node still reachable through exception edges
* @run main/othervm -XX:-UseOnStackReplacement -XX:-BackgroundCompilation TestDeadArrayCopyOnMemChain
*
*/
public class TestDeadArrayCopyOnMemChain {
static class A {
int f;
}
static void test_helper(Object o) {
}
static void test(int src_off, boolean flag) {
// dst is eliminated first. Eliminating dst causes src to be
// eliminated. When working on the safepoint at the uncommon
// trap in the exception handler, the eliminated ArrayCopyNode
// is reached through the exception edges.
Object[] dst = new Object[10];
Object[] src = new Object[10];
// src_off causes the exception handler to be run sometimes
try {
System.arraycopy(src, src_off, dst, 0, 10);
} catch (IndexOutOfBoundsException ioobe) {
// flag always false so test becomes uncommon trap. Make
// sure src is live at the unc.
if (flag) {
test_helper(src);
}
}
}
static public void main(String[] args) {
for (int i = 0; i < 20000; i++) {
test((i%2) == 0 ? 0 : -1, false);
}
}
}