提交 d2420306 编写于 作者: A asaha

Merge

......@@ -186,7 +186,6 @@ VerificationType StackMapReader::parse_verification_type(u1* flags, TRAPS) {
u2 offset = _stream->get_u2(THREAD);
if (offset >= _code_length ||
_code_data[offset] != ClassVerifier::NEW_OFFSET) {
ResourceMark rm(THREAD);
_verifier->class_format_error(
"StackMapTable format error: bad offset for Uninitialized");
return VerificationType::bogus_type();
......
......@@ -3183,7 +3183,7 @@ void ConnectionGraph::split_unique_types(GrowableArray<Node *> &alloc_worklist)
// Note 2: MergeMem may already contains instance memory slices added
// during find_inst_mem() call when memory nodes were processed above.
igvn->hash_delete(nmm);
uint nslices = nmm->req();
uint nslices = MIN2(nmm->req(), new_index_start);
for (uint i = Compile::AliasIdxRaw+1; i < nslices; i++) {
Node* mem = nmm->in(i);
Node* cur = NULL;
......
......@@ -1107,6 +1107,8 @@ static void do_thread_dump(ThreadDumpResult* dump_result,
bool with_locked_monitors,
bool with_locked_synchronizers,
TRAPS) {
// no need to actually perform thread dump if no TIDs are specified
if (num_threads == 0) return;
// First get an array of threadObj handles.
// A JavaThread may terminate before we get the stack trace.
......
/*
* 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 8134031
* @summary Bad rewiring of memory edges when we split unique types during EA
* @run main/othervm -XX:-BackgroundCompilation -XX:-UseOnStackReplacement -XX:CompileCommand=dontinline,TestEABadMergeMem::m_notinlined TestEABadMergeMem
*
*/
public class TestEABadMergeMem {
static class Box {
int i;
}
static void m_notinlined() {
}
static float dummy1;
static float dummy2;
static int test(Box a, Box c, int i, int j, int k, boolean flag1, boolean flag2) {
Box b = new Box(); // non escaping
a.i = i;
b.i = j;
c.i = k;
m_notinlined();
boolean flag3 = false;
if (flag1) {
for (int ii = 0; ii < 100; ii++) {
if (flag2) {
dummy1 = (float)ii;
} else {
dummy2 = (float)ii;
}
}
flag3 = true;
}
// Memory Phi here with projection of not inlined call as one edge, MergeMem as other
if (flag3) { // will split through Phi during loopopts
int res = c.i + b.i;
m_notinlined(); // prevents split through phi during igvn
return res;
} else {
return 44 + 43;
}
}
static public void main(String[] args) {
for (int i = 0; i < 20000; i++) {
// m(2);
Box a = new Box();
Box c = new Box();
int res = test(a, c, 42, 43, 44, (i%2) == 0, (i%3) == 0);
if (res != 44 + 43) {
throw new RuntimeException("Bad result " + res);
}
}
}
}
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册