8259820: JShell does not handle -source 8 properly

Reviewed-by: sundar
This commit is contained in:
Jan Lahoda 2021-01-15 12:45:22 +00:00
parent b01a15e4f0
commit 0ec2c969df
2 changed files with 58 additions and 2 deletions
src/jdk.jshell/share/classes/jdk/jshell
test/langtools/jdk/jshell

@ -70,6 +70,7 @@ import com.sun.tools.javac.code.ClassFinder;
import com.sun.tools.javac.code.Kinds;
import com.sun.tools.javac.code.Symbol;
import com.sun.tools.javac.code.Symbol.ClassSymbol;
import com.sun.tools.javac.code.Symbol.ModuleSymbol;
import com.sun.tools.javac.code.Symbol.PackageSymbol;
import com.sun.tools.javac.code.Symbol.TypeSymbol;
import com.sun.tools.javac.code.Symbol.VarSymbol;
@ -215,11 +216,13 @@ class TaskFactory {
//additional cleanup: purge the REPL package:
Symtab syms = Symtab.instance(context);
Names names = Names.instance(context);
PackageSymbol repl = syms.getPackage(syms.unnamedModule, names.fromString(Util.REPL_PACKAGE));
ModuleSymbol replModule = syms.java_base == syms.noModule ? syms.noModule
: syms.unnamedModule;
PackageSymbol repl = syms.getPackage(replModule, names.fromString(Util.REPL_PACKAGE));
if (repl != null) {
for (ClassSymbol clazz : syms.getAllClasses()) {
if (clazz.packge() == repl) {
syms.removeClass(syms.unnamedModule, clazz.flatName());
syms.removeClass(replModule, clazz.flatName());
}
}
repl.members_field = null;

@ -0,0 +1,53 @@
/*
* 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 8259820
* @summary Check JShell can handle -source 8
* @modules jdk.jshell
* @run testng SourceLevelTest
*/
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
public class SourceLevelTest extends ReplToolTesting {
@DataProvider(name="sourceLevels")
public Object[][] sourceLevels() {
return new Object[][] {
new Object[] {"8"},
new Object[] {"11"}
};
}
@Test(dataProvider="sourceLevels")
public void testSourceLevel(String sourceLevel) {
test(new String[] {"-C", "-source", "-C", sourceLevel},
(a) -> assertCommand(a, "1 + 1", "$1 ==> 2"),
(a) -> assertCommand(a, "1 + 2", "$2 ==> 3")
);
}
}