Skip to content
Permalink
Browse files
8200145: Conditional expression mistakenly treated as standalone
Reviewed-by: mcimadamore
  • Loading branch information
lgxbslgx authored and mcimadamore committed Apr 21, 2021
1 parent 41fc7dd commit 07a7510d870819a2ff9827368f6d3f7302a1979d
Show file tree
Hide file tree
Showing 3 changed files with 46 additions and 1 deletion.
@@ -4319,6 +4319,8 @@ public Type boxedTypeOrType(Type t) {
* Return the primitive type corresponding to a boxed type.
*/
public Type unboxedType(Type t) {
if (t.hasTag(ERROR))
return Type.noType;
for (int i=0; i<syms.boxedName.length; i++) {
Name box = syms.boxedName[i];
if (box != null &&
@@ -1968,7 +1968,7 @@ private boolean isBooleanOrNumeric(Env<AttrContext> env, JCExpression tree) {
}
//where
boolean primitiveOrBoxed(Type t) {
return (!t.hasTag(TYPEVAR) && types.unboxedTypeOrType(t).isPrimitive());
return (!t.hasTag(TYPEVAR) && !t.isErroneous() && types.unboxedTypeOrType(t).isPrimitive());
}

TreeTranslator removeClassParams = new TreeTranslator() {
@@ -0,0 +1,43 @@
/*
* Copyright (c) 2021, 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 8200145
* @summary Conditional expression mistakenly treated as standalone
* @run compile T8200145.java
*/

public class T8200145 {
static class Outer {
class Inner<T> implements Runnable { public void run() {} }
}

void test(Outer outer) {
boolean test = 1 == 1 ;
Outer.Inner<String> inner1 = outer.new Inner<>();
Outer.Inner<String> inner2 = test ? outer.new Inner<>() : null;
Outer.Inner<String> inner3 = test ? null: outer.new Inner<>();
Outer.Inner<String> inner4 = test ? outer.new Inner<>() : outer.new Inner<>();
}
}

1 comment on commit 07a7510

@openjdk-notifier
Copy link

@openjdk-notifier openjdk-notifier bot commented on 07a7510 Apr 21, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.