From b69fa0a44d5767358c991210cd790eaab0f5886c Mon Sep 17 00:00:00 2001
From: Vicente Romero <vromero@openjdk.org>
Date: Mon, 27 Jun 2016 12:29:41 -0700
Subject: [PATCH] 8159439: javac throws NPE with Module attribute and
super_class != 0
Reviewed-by: jjg
---
.../com/sun/tools/javac/comp/Modules.java | 6 ++
.../com/sun/tools/javac/jvm/ClassReader.java | 3 +
.../tools/javac/resources/compiler.properties | 3 +
langtools/test/ProblemList.txt | 1 +
.../tools/javac/diags/examples.not-yet.txt | 1 +
...orModuleInfoWithNonZeroSuperClassTest.java | 9 +++
...ForModuleInfoWithNonZeroSuperClassTest.out | 2 +
.../javac/modules/T8159439/module-info.jcod | 55 +++++++++++++++++++
8 files changed, 80 insertions(+)
create mode 100644 langtools/test/tools/javac/modules/T8159439/NPEForModuleInfoWithNonZeroSuperClassTest.java
create mode 100644 langtools/test/tools/javac/modules/T8159439/NPEForModuleInfoWithNonZeroSuperClassTest.out
create mode 100644 langtools/test/tools/javac/modules/T8159439/module-info.jcod
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Modules.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Modules.java
index 6f68fdb0af9..f464e91d7ee 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Modules.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Modules.java
@@ -50,6 +50,7 @@ import javax.tools.JavaFileObject;
import javax.tools.JavaFileObject.Kind;
import javax.tools.StandardLocation;
+import com.sun.tools.javac.code.ClassFinder;
import com.sun.tools.javac.code.Directive;
import com.sun.tools.javac.code.Directive.ExportsDirective;
import com.sun.tools.javac.code.Directive.RequiresDirective;
@@ -101,6 +102,8 @@ import static com.sun.tools.javac.code.TypeTag.CLASS;
import com.sun.tools.javac.tree.JCTree.JCDirective;
import com.sun.tools.javac.tree.JCTree.Tag;
+import com.sun.tools.javac.util.Abort;
+import com.sun.tools.javac.util.Position;
import static com.sun.tools.javac.code.Flags.ABSTRACT;
import static com.sun.tools.javac.code.Flags.ENUM;
@@ -217,6 +220,9 @@ public class Modules extends JCTree.Visitor {
for (ModuleSymbol msym: roots) {
msym.complete();
}
+ } catch (CompletionFailure ex) {
+ log.error(JCDiagnostic.DiagnosticFlag.NON_DEFERRABLE, Position.NOPOS, "cant.access", ex.sym, ex.getDetailValue());
+ if (ex instanceof ClassFinder.BadClassFile) throw new Abort();
} finally {
depth--;
}
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java
index e242188e9d1..b48bd81db34 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java
@@ -2418,6 +2418,9 @@ public class ClassReader {
// reset and read rest of classinfo
bp = startbp;
int n = nextChar();
+ if ((flags & MODULE) != 0 && n > 0) {
+ throw badClassFile("module.info.invalid.super.class");
+ }
if (ct.supertype_field == null)
ct.supertype_field = (n == 0)
? Type.noType
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
index 231beb22b93..3d3f0292ce6 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
@@ -1850,6 +1850,9 @@ compiler.misc.bad.module-info.name=\
compiler.misc.class.file.wrong.class=\
class file contains wrong class: {0}
+compiler.misc.module.info.invalid.super.class=\
+ module-info with invalid super class
+
compiler.misc.class.file.not.found=\
class file for {0} not found
diff --git a/langtools/test/ProblemList.txt b/langtools/test/ProblemList.txt
index 0d1f870629b..66d46dcf74d 100644
--- a/langtools/test/ProblemList.txt
+++ b/langtools/test/ProblemList.txt
@@ -76,6 +76,7 @@ tools/javac/annotations/typeAnnotations/newlocations/RepeatingTypeAnnotations.ja
tools/javac/annotations/typeAnnotations/referenceinfos/Lambda.java 8057687 generic-all emit correct byte code an attributes for type annotations
tools/javac/annotations/typeAnnotations/referenceinfos/NestedTypes.java 8057687 generic-all emit correct byte code an attributes for type annotations
tools/javac/warnings/suppress/TypeAnnotations.java 8057683 generic-all improve ordering of errors with type annotations
+tools/javac/modules/T8159439/NPEForModuleInfoWithNonZeroSuperClassTest.java 8160396 generic-all current version of jtreg needs a new promotion to include lastes version of ASM
###########################################################################
#
diff --git a/langtools/test/tools/javac/diags/examples.not-yet.txt b/langtools/test/tools/javac/diags/examples.not-yet.txt
index cfe33c94385..02ca2329c77 100644
--- a/langtools/test/tools/javac/diags/examples.not-yet.txt
+++ b/langtools/test/tools/javac/diags/examples.not-yet.txt
@@ -120,6 +120,7 @@ compiler.err.locn.cant.get.module.name.for.jar # bad binary ? Inf
compiler.misc.bad.module-info.name # bad class file
compiler.err.locn.bad.module-info # bad class file
compiler.err.locn.cant.read.file # bad class file
+compiler.misc.module.info.invalid.super.class # bad class file
compiler.err.locn.cant.read.directory # file system issue
compiler.misc.unnamed.module # fragment uninteresting in and of itself
compiler.misc.kindname.module # fragment uninteresting in and of itself
diff --git a/langtools/test/tools/javac/modules/T8159439/NPEForModuleInfoWithNonZeroSuperClassTest.java b/langtools/test/tools/javac/modules/T8159439/NPEForModuleInfoWithNonZeroSuperClassTest.java
new file mode 100644
index 00000000000..062a1c1860a
--- /dev/null
+++ b/langtools/test/tools/javac/modules/T8159439/NPEForModuleInfoWithNonZeroSuperClassTest.java
@@ -0,0 +1,9 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 8159439
+ * @summary javac throws NPE with Module attribute and super_class != 0
+ * @build module-info
+ * @compile/fail/ref=NPEForModuleInfoWithNonZeroSuperClassTest.out -XDrawDiagnostics NPEForModuleInfoWithNonZeroSuperClassTest.java
+ */
+
+class NPEForModuleInfoWithNonZeroSuperClassTest {}
diff --git a/langtools/test/tools/javac/modules/T8159439/NPEForModuleInfoWithNonZeroSuperClassTest.out b/langtools/test/tools/javac/modules/T8159439/NPEForModuleInfoWithNonZeroSuperClassTest.out
new file mode 100644
index 00000000000..6ddc9de8a6c
--- /dev/null
+++ b/langtools/test/tools/javac/modules/T8159439/NPEForModuleInfoWithNonZeroSuperClassTest.out
@@ -0,0 +1,2 @@
+- compiler.err.cant.access: mod.module-info, (compiler.misc.bad.class.file.header: module-info.class, (compiler.misc.module.info.invalid.super.class))
+1 error
diff --git a/langtools/test/tools/javac/modules/T8159439/module-info.jcod b/langtools/test/tools/javac/modules/T8159439/module-info.jcod
new file mode 100644
index 00000000000..77a5a4ffa2c
--- /dev/null
+++ b/langtools/test/tools/javac/modules/T8159439/module-info.jcod
@@ -0,0 +1,55 @@
+module mod {
+ 0xCAFEBABE;
+ 0; // minor version
+ 53; // version
+ [] { // Constant Pool
+ ; // first element is empty
+ Utf8 "mod/module-info"; // #1
+ class #1; // #2
+ Utf8 "java/lang/Object"; // #3
+ class #3; // #4
+ Utf8 "java.base"; // #5
+ Utf8 "pkg"; // #6
+ Utf8 "Module"; // #7
+ Utf8 "Version"; // #8
+ Utf8 "6.0"; // #9
+ } // Constant Pool
+
+ 0x8000; // access
+ #2;// this_cpx
+ #4;// super_cpx
+
+ [] { // Interfaces
+ } // Interfaces
+
+ [] { // fields
+ } // fields
+
+ [] { // methods
+ } // methods
+
+ [] { // Attributes
+ Attr(#7) { // Module
+ [] { // requires
+ #5 0x8020;
+ } // requires
+
+ [] { // exports
+ #6
+ [] { // to
+ }; // end to
+ } // exports
+
+ [] { // uses
+ } // uses
+
+ [] { // provides
+ } // provides
+
+ } // end Module
+ ;
+ Attr(#8) { // Version
+ 0x0009;
+ } // end Version
+ } // Attributes
+} // end module mod