Merge pull request #522 from retronym/topic/jdk-9-10-parser

WIP Support new constants in JDK 9 and 10
sbt · Apr 9, 2018 · 37d1a77 · 37d1a77
2 parents 88480f8 + c71ab53
commit 37d1a77
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 5 deletions.
diff --git a/internal/zinc-classfile/src/main/scala/sbt/internal/inc/classfile/Analyze.scala b/internal/zinc-classfile/src/main/scala/sbt/internal/inc/classfile/Analyze.scala
@@ -27,10 +27,15 @@ private[sbt] object Analyze {
       readAPI: (File, Seq[Class[_]]) => Set[(String, String)]): Unit = {
     val sourceMap = sources.toSet[File].groupBy(_.getName)
 
-    def load(tpe: String, errMsg: => Option[String]): Option[Class[_]] =
-      try { Some(Class.forName(tpe, false, loader)) } catch {
-        case e: Throwable => errMsg.foreach(msg => log.warn(msg + " : " + e.toString)); None
-      }
+    def load(tpe: String, errMsg: => Option[String]): Option[Class[_]] = {
+      if (tpe.endsWith("module-info")) None
+      else
+        try {
+          Some(Class.forName(tpe, false, loader))
+        } catch {
+          case e: Throwable => errMsg.foreach(msg => log.warn(msg + " : " + e.toString)); None
+        }
+    }
 
     val classNames = mutable.Set.empty[String]
     val sourceToClassFiles = mutable.HashMap[File, Buffer[ClassFile]](
@@ -48,7 +53,8 @@ private[sbt] object Analyze {
          _ <- classFile.sourceFile orElse guessSourceName(newClass.getName);
          source <- guessSourcePath(sourceMap, classFile, log);
          binaryClassName = classFile.className;
-         loadedClass <- load(binaryClassName, Some("Error reading API from class file"))) {
+         loadedClass <- load(binaryClassName,
+                             Some("Error reading API from class file: " + binaryClassName))) {
       binaryClassNameToLoadedClass.update(binaryClassName, loadedClass)
 
       def loadEnclosingClass(clazz: Class[_]): Option[String] = {

diff --git a/internal/zinc-classfile/src/main/scala/sbt/internal/inc/classfile/ClassFile.scala b/internal/zinc-classfile/src/main/scala/sbt/internal/inc/classfile/ClassFile.scala
@@ -106,5 +106,8 @@ private[sbt] object Constants {
   final val ConstantMethodHandle = 15
   final val ConstantMethodType = 16
   final val ConstantInvokeDynamic = 18
+  final val ConstantModule = 19
+  final val ConstantPackage = 20
+  final val ConstantDynamic = 17 // http://openjdk.java.net/jeps/309
   final val ClassDescriptor = 'L'
 }
diff --git a/internal/zinc-classfile/src/main/scala/sbt/internal/inc/classfile/Parser.scala b/internal/zinc-classfile/src/main/scala/sbt/internal/inc/classfile/Parser.scala
@@ -160,6 +160,16 @@ private[sbt] object Parser {
         in.readUnsignedShort()
         in.readUnsignedShort()
         Constant(tag, -1, -1, None)
+      case ConstantModule =>
+        in.readUnsignedShort()
+        Constant(tag, -1, -1, None)
+      case ConstantPackage =>
+        in.readUnsignedShort()
+        Constant(tag, -1, -1, None)
+      case ConstantDynamic =>
+        in.readUnsignedShort()
+        in.readUnsignedShort()
+        Constant(tag, -1, -1, None)
       case _ => sys.error("Unknown constant: " + tag)
     }
   }