7053059: VerifyError with double Assignment using a Generic Member of a Superclass
Reviewed-by: mcimadamore
This commit is contained in:
parent
bbae50582f
commit
33f5aae0ff
@ -172,10 +172,13 @@ public class TransTypes extends TreeTranslator {
|
|||||||
JCExpression retype(JCExpression tree, Type erasedType, Type target) {
|
JCExpression retype(JCExpression tree, Type erasedType, Type target) {
|
||||||
// System.err.println("retype " + tree + " to " + erasedType);//DEBUG
|
// System.err.println("retype " + tree + " to " + erasedType);//DEBUG
|
||||||
if (!erasedType.isPrimitive()) {
|
if (!erasedType.isPrimitive()) {
|
||||||
if (target != null && target.isPrimitive())
|
if (target != null && target.isPrimitive()) {
|
||||||
target = erasure(tree.type);
|
target = erasure(tree.type);
|
||||||
|
}
|
||||||
tree.type = erasedType;
|
tree.type = erasedType;
|
||||||
if (target != null) return coerce(tree, target);
|
if (target != null) {
|
||||||
|
return coerce(tree, target);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return tree;
|
return tree;
|
||||||
}
|
}
|
||||||
@ -686,8 +689,8 @@ public class TransTypes extends TreeTranslator {
|
|||||||
public void visitAssign(JCAssign tree) {
|
public void visitAssign(JCAssign tree) {
|
||||||
tree.lhs = translate(tree.lhs, null);
|
tree.lhs = translate(tree.lhs, null);
|
||||||
tree.rhs = translate(tree.rhs, erasure(tree.lhs.type));
|
tree.rhs = translate(tree.rhs, erasure(tree.lhs.type));
|
||||||
tree.type = erasure(tree.type);
|
tree.type = erasure(tree.lhs.type);
|
||||||
result = tree;
|
result = retype(tree, tree.type, pt);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void visitAssignop(JCAssignOp tree) {
|
public void visitAssignop(JCAssignOp tree) {
|
||||||
|
@ -0,0 +1,51 @@
|
|||||||
|
/*
|
||||||
|
* 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 7053059
|
||||||
|
* @summary VerifyError with double Assignment using a Generic Member of a Superclass
|
||||||
|
* @run main VerifyErrorWithDoubleAssignmentTest
|
||||||
|
*/
|
||||||
|
|
||||||
|
public class VerifyErrorWithDoubleAssignmentTest {
|
||||||
|
|
||||||
|
static class A<D> {
|
||||||
|
D d;
|
||||||
|
|
||||||
|
D getD() {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static class B extends A<Integer> {
|
||||||
|
Integer y;
|
||||||
|
B() {
|
||||||
|
y = d = getD();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void main(String[] args) {
|
||||||
|
new B();
|
||||||
|
}
|
||||||
|
}
|
Loading…
x
Reference in New Issue
Block a user