darlinghq/darling-openjdk
1
0
Fork 0
mirror of https://github.com/darlinghq/darling-openjdk.git synced 2024-11-23 12:29:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

8213725: JShell NullPointerException due to class file with unexpected package

Browse Source 
Reviewed-by: jlahoda
This commit is contained in:
Robert Field 2018-11-29 17:45:29 -08:00
parent 4dfa364ff1
commit 020877da03
3 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/jdk.jshell/share/classes/jdk/jshell/Eval.java
View File

@ -327,7 +327,7 @@ class Eval {
String initCode = rinit.part(compileSource);
ExpressionInfo ei =
ExpressionToTypeInfo.localVariableTypeForInitializer(initCode, state, false);
if (ei != null) {
if (ei != null && ei.declareTypeName != null) {
typeName = ei.declareTypeName;
fullTypeName = ei.fullTypeName;
displayType = ei.displayTypeName;

2
test/langtools/jdk/jshell/KullaTesting.java
View File

@ -737,7 +737,7 @@ public class KullaTesting {
expectedSubKind, unressz, othersz);
String signature = var.typeName();
assertEquals(signature, expectedTypeName,
"Expected " + var.source() + " to have the name: " +
"Expected " + var.source() + " to have the type name: " +
expectedTypeName + ", got: " + signature);
}

17
test/langtools/jdk/jshell/VariablesTest.java
View File

@ -23,7 +23,7 @@
/*
* @test
* @bug 8144903 8177466 8191842 8211694
* @bug 8144903 8177466 8191842 8211694 8213725
* @summary Tests for EvaluationState.variables
* @library /tools/lib
* @modules jdk.compiler/com.sun.tools.javac.api
@ -492,6 +492,21 @@ public class VariablesTest extends KullaTesting {
assertVarDeclRedefNoInit("String", "s", "\"hi\"", "null");
}
public void badPkgVarDecl() {
Compiler compiler = new Compiler();
Path nopkgdirpath = Paths.get("cp", "xyz");
compiler.compile(nopkgdirpath,
"public class TestZ { public static int V = 0; }\n");
assertDeclareFail("import static xyz.TestZ.V;",
"compiler.err.cant.access");
VarSnippet v1 = varKey(assertEval("var v = xyz.TestZ.V;", IGNORE_VALUE, null,
DiagCheck.DIAG_ERROR, DiagCheck.DIAG_OK, added(RECOVERABLE_NOT_DEFINED)));
assertVariableDeclSnippet(v1, "v", "java.lang.Object", RECOVERABLE_NOT_DEFINED, SubKind.VAR_DECLARATION_WITH_INITIALIZER_SUBKIND, 0, 1);
assertEval("1+1", "2");
}
private void assertVarDeclRedefNoInit(String typeName, String name, String value, String dvalue) {
assertVarDeclRedefNoInit(typeName, name, value, value, dvalue);
}