stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8327512: JShell does not work correctly when a class named Object or Throwable is defined

Browse Source 
Reviewed-by: asotona
This commit is contained in:
Jan Lahoda 2024-04-26 07:23:49 +00:00
parent ea06129851
commit a407dc9cbb
6 changed files with 82 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/jdk.jshell/share/classes/jdk/jshell/ExpressionToTypeInfo.java
View File

@ -71,7 +71,8 @@ import jdk.jshell.TypePrinter.AnonymousTypeKind;
*/
class ExpressionToTypeInfo {
private static final String OBJECT_TYPE_NAME = "Object";
//only used in erroneous/non-standard circumstances; OK to use a FQN:
private static final String OBJECT_TYPE_NAME = "java.lang.Object";
final AnalyzeTask at;
final CompilationUnitTree cu;
@ -394,8 +395,8 @@ class ExpressionToTypeInfo {
break;
case NULL:
ei.isNonVoid = true;
ei.typeName = OBJECT_TYPE_NAME;
ei.accessibleTypeName = OBJECT_TYPE_NAME;
ei.typeName = varTypeName(syms.objectType, false, AnonymousTypeKind.SUPER);
ei.accessibleTypeName = ei.typeName;
break;
default: {
ei.isNonVoid = true;

4
src/jdk.jshell/share/classes/jdk/jshell/KeyMap.java
View File

@ -99,4 +99,8 @@ class KeyMap {
Stream<ImportKey> importKeys() {
return importMap.values().stream();
}
Stream<TypeDeclKey> typeDeclKeys() {
return classMap.values().stream();
}
}

11
src/jdk.jshell/share/classes/jdk/jshell/SnippetMaps.java
View File

@ -158,6 +158,15 @@ final class SnippetMaps {
if (mat.lookingAt()) {
return full.substring(mat.end());
}
String simpleName = full.substring(full.lastIndexOf(".") + 1);
Stream<String> declaredInSnippets = state.keyMap.typeDeclKeys()
.map(key -> (TypeDeclSnippet) getSnippet(key))
.map(decl -> decl.name());
if (declaredInSnippets.anyMatch(clazz -> simpleName.equals(clazz))) {
//simple name of full clashes with a name of a user-defined class,
//use the fully-qualified name:
return full;
}
state.debug(DBG_DEP, "SM %s %s\n", full, pkg);
List<String> klasses = importSnippets()
.filter(isi -> !isi.isStar)
@ -165,7 +174,7 @@ final class SnippetMaps {
.toList();
for (String k : klasses) {
if (k.equals(full)) {
return full.substring(full.lastIndexOf(".")+1);
return simpleName;
}
}
if (pkg.isEmpty()) {

3
src/jdk.jshell/share/classes/jdk/jshell/TypePrinter.java
View File

@ -47,7 +47,8 @@ import java.util.stream.Collectors;
*/
class TypePrinter extends Printer {
private static final String OBJECT = "Object";
//only used in erroneous/non-standard circumstances; OK to use a FQN:
private static final String OBJECT = "java.lang.Object";
private final JavacMessages messages;
private final Types types;

6
src/jdk.jshell/share/classes/jdk/jshell/Wrap.java
View File

@ -113,9 +113,9 @@ abstract class Wrap implements GeneralWrap {
scratchName += "$";
}
Wrap waux = new CompoundWrap(
" private static <" + scratchName + "> " + scratchName +" ", DOIT_METHOD_NAME + "Aux", "() throws Throwable {\n",
" private static <" + scratchName + "> " + scratchName +" ", DOIT_METHOD_NAME + "Aux", "() throws java.lang.Throwable {\n",
wtype, brackets + " ", scratchName, "_ =\n ", winit, semi(winit),
" @SuppressWarnings(\"unchecked\") ", scratchName, " ", scratchName, "__ = (", scratchName, ")", scratchName, "_;\n",
" @java.lang.SuppressWarnings(\"unchecked\") ", scratchName, " ", scratchName, "__ = (", scratchName, ")", scratchName, "_;\n",
" return ", scratchName, "__;\n",
"}"
);
@ -550,7 +550,7 @@ abstract class Wrap implements GeneralWrap {
private static class DoitMethodWrap extends CompoundWrap {
DoitMethodWrap(Wrap w) {
super(" public static Object " + DOIT_METHOD_NAME + "() throws Throwable {\n"
super(" public static java.lang.Object " + DOIT_METHOD_NAME + "() throws java.lang.Throwable {\n"
+ " ", w,
" }\n");
}

59
test/langtools/jdk/jshell/JLCollisionTest.java Normal file
View File

@ -0,0 +1,59 @@
/*
* Copyright (c) 2024, 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 8327512
* @summary Clashes between java.lang classes and custom-defined classes with
* the same simple names
* @modules jdk.jshell/jdk.jshell
* @build KullaTesting
* @run testng JLCollisionTest
*/
import org.testng.annotations.Test;
@Test
public class JLCollisionTest extends KullaTesting {
public void testObject() {
assertEval("class Object {}");
assertEval("1");
assertEval("null");
assertEval("$2 = \"\"");
}
public void testThrowable() {
assertEval("class Throwable {}");
assertEval("1");
//var with an "enhanced" (non-denotable) type:
assertEval("var _ = new Object() {};");
}
public void testSuppressWarnings() {
assertEval("class SuppressWarnings {}");
//var with an "enhanced" (non-denotable) type:
assertEval("var _ = new Object() {};");
}
}