8027571: fatal error: meet not symmetric
Meet of one constant array and one exact array not symmetric. Reviewed-by: kvn
This commit is contained in:
parent
e9b5199781
commit
417b5f07b7
@ -3812,17 +3812,17 @@ const Type *TypeAryPtr::xmeet_helper(const Type *t) const {
|
|||||||
tary = TypeAry::make(Type::BOTTOM, tary->_size, tary->_stable);
|
tary = TypeAry::make(Type::BOTTOM, tary->_size, tary->_stable);
|
||||||
}
|
}
|
||||||
} else // Non integral arrays.
|
} else // Non integral arrays.
|
||||||
// Must fall to bottom if exact klasses in upper lattice
|
// Must fall to bottom if exact klasses in upper lattice
|
||||||
// are not equal or super klass is exact.
|
// are not equal or super klass is exact.
|
||||||
if ( above_centerline(ptr) && klass() != tap->klass() &&
|
if ((above_centerline(ptr) || ptr == Constant) && klass() != tap->klass() &&
|
||||||
// meet with top[] and bottom[] are processed further down:
|
// meet with top[] and bottom[] are processed further down:
|
||||||
tap ->_klass != NULL && this->_klass != NULL &&
|
tap->_klass != NULL && this->_klass != NULL &&
|
||||||
// both are exact and not equal:
|
// both are exact and not equal:
|
||||||
((tap ->_klass_is_exact && this->_klass_is_exact) ||
|
((tap->_klass_is_exact && this->_klass_is_exact) ||
|
||||||
// 'tap' is exact and super or unrelated:
|
// 'tap' is exact and super or unrelated:
|
||||||
(tap ->_klass_is_exact && !tap->klass()->is_subtype_of(klass())) ||
|
(tap->_klass_is_exact && !tap->klass()->is_subtype_of(klass())) ||
|
||||||
// 'this' is exact and super or unrelated:
|
// 'this' is exact and super or unrelated:
|
||||||
(this->_klass_is_exact && !klass()->is_subtype_of(tap->klass())))) {
|
(this->_klass_is_exact && !klass()->is_subtype_of(tap->klass())))) {
|
||||||
tary = TypeAry::make(Type::BOTTOM, tary->_size, tary->_stable);
|
tary = TypeAry::make(Type::BOTTOM, tary->_size, tary->_stable);
|
||||||
return make(NotNull, NULL, tary, lazy_klass, false, off, InstanceBot);
|
return make(NotNull, NULL, tary, lazy_klass, false, off, InstanceBot);
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,107 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) 2013, 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 8027571
|
||||||
|
* @summary meet of TopPTR exact array with constant array is not symmetric
|
||||||
|
* @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:-UseOnStackReplacement -XX:TypeProfileLevel=222 -XX:+UnlockExperimentalVMOptions -XX:+UseTypeSpeculation -XX:-BackgroundCompilation TestMeetTopArrayExactConstantArray
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
public class TestMeetTopArrayExactConstantArray {
|
||||||
|
|
||||||
|
static class A {
|
||||||
|
}
|
||||||
|
|
||||||
|
static class B {
|
||||||
|
}
|
||||||
|
|
||||||
|
static class C extends A {
|
||||||
|
}
|
||||||
|
|
||||||
|
static class D extends C {
|
||||||
|
}
|
||||||
|
|
||||||
|
final static B[] b = new B[10];
|
||||||
|
|
||||||
|
static void m0(Object[] o) {
|
||||||
|
if (o.getClass() == Object[].class) {
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void m1(Object[] o, boolean cond) {
|
||||||
|
if (cond) {
|
||||||
|
o = b;
|
||||||
|
}
|
||||||
|
m0(o);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void m2(Object[] o, boolean cond1, boolean cond2) {
|
||||||
|
if (cond1) {
|
||||||
|
m1(o, cond2);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void m3(C[] o, boolean cond1, boolean cond2, boolean cond3) {
|
||||||
|
if (cond1) {
|
||||||
|
m2(o, cond2, cond3);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static public void main(String[] args) {
|
||||||
|
A[] a = new A[10];
|
||||||
|
D[] d = new D[10];
|
||||||
|
Object[] o = new Object[10];
|
||||||
|
for (int i = 0; i < 5000; i++) {
|
||||||
|
// record in profiling that the if in m0 succeeds
|
||||||
|
m0(o);
|
||||||
|
// record some profiling for m2 and m1
|
||||||
|
m2(a, true, (i%2) == 0);
|
||||||
|
// record some profiling for m3 and conflicting profile for m2
|
||||||
|
m3(d, true, false, (i%2) == 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
// get m3 compiled. The if in m0 will be optimized because of argument profiling in m3
|
||||||
|
C[] c = new C[10];
|
||||||
|
for (int i = 0; i < 20000; i++) {
|
||||||
|
m3(c, true, false, (i%2) == 0);
|
||||||
|
}
|
||||||
|
// make m3 not entrant and the if in m0 fail
|
||||||
|
m3(c, true, true, false);
|
||||||
|
m3(c, true, true, false);
|
||||||
|
m3(c, true, true, false);
|
||||||
|
m3(c, true, true, false);
|
||||||
|
|
||||||
|
// make m3 recompile, this time with if the not optimized
|
||||||
|
// on entry to m3, argument o is of type C[], profiled C[]
|
||||||
|
// on entry to m1, argument o is of type C[], speculative C[] exact, profiled A[]. Speculative becomes AnyNull
|
||||||
|
// after the if in m1, speculative type of o becomes constant from final field b
|
||||||
|
// the true if branch in m0 does a join between the type of o of speculative type constant from final field b and exact klass Object[]
|
||||||
|
for (int i = 0; i < 20000; i++) {
|
||||||
|
m3(c, true, false, (i%2) == 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
System.out.println("TEST PASSED");
|
||||||
|
}
|
||||||
|
}
|
Loading…
x
Reference in New Issue
Block a user