luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Minimal support for class file formats 51.0, 52.0 in incremental compiler. Fixes #842. 

It is not currently possible to use a newer class file format than the one for the jvm sbt is running in.
This commit is contained in:
Mark Harrah 2013-09-26 08:14:33 -04:00
parent b2599c1bb1
commit ce348c4aea
2 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
util/classfile/src/main/scala/sbt/classfile/ClassFile.scala
View File

@ -62,5 +62,8 @@ private[sbt] object Constants
final val ConstantMethod = 10 final val ConstantMethod = 10
final val ConstantInterfaceMethod = 11 final val ConstantInterfaceMethod = 11
final val ConstantNameAndType = 12 final val ConstantNameAndType = 12
final val ConstantMethodHandle = 15
final val ConstantMethodType = 16
final val ConstantInvokeDynamic = 18
final val ClassDescriptor = 'L' final val ClassDescriptor = 'L'
} }

38
util/classfile/src/main/scala/sbt/classfile/Parser.scala
View File

@ -76,7 +76,7 @@ private[sbt] object Parser
new AttributeInfo(name, value) new AttributeInfo(name, value)
} }
def types = Set((fieldTypes ++ methodTypes ++ classConstantReferences) : _*) def types = (classConstantReferences ++ fieldTypes ++ methodTypes).toSet
private def getTypes(fieldsOrMethods: Array[FieldOrMethodInfo]) = private def getTypes(fieldsOrMethods: Array[FieldOrMethodInfo]) =
fieldsOrMethods.flatMap { fieldOrMethod => fieldsOrMethods.flatMap { fieldOrMethod =>
@ -114,8 +114,8 @@ private[sbt] object Parser
next(1, Nil) next(1, Nil)
} }
} }
} }
private def array[T : scala.reflect.Manifest](size: Int)(f: => T) = Array.tabulate(size)(_ => f) private def array[T : scala.reflect.Manifest](size: Int)(f: => T) = Array.tabulate(size)(_ => f)
private def parseConstantPool(in: DataInputStream) = private def parseConstantPool(in: DataInputStream) =
{ {
val constantPoolSize = in.readUnsignedShort() val constantPoolSize = in.readUnsignedShort()
@ -133,20 +133,32 @@ private[sbt] object Parser
pool pool
} }
private def getConstant(in: DataInputStream): Constant = private def getConstant(in: DataInputStream): Constant =
{ {
val tag = in.readByte() val tag = in.readByte()
// No switch for byte scrutinees! Stupid compiler. // No switch for byte scrutinees! Stupid compiler.
((tag: Int): @switch) match { ((tag: Int): @switch) match {
case ConstantClass | ConstantString => new Constant(tag, in.readUnsignedShort()) case ConstantClass | ConstantString => new Constant(tag, in.readUnsignedShort())
case ConstantField | ConstantMethod | ConstantInterfaceMethod | ConstantNameAndType => case ConstantField | ConstantMethod | ConstantInterfaceMethod | ConstantNameAndType =>
new Constant(tag, in.readUnsignedShort(), in.readUnsignedShort()) new Constant(tag, in.readUnsignedShort(), in.readUnsignedShort())
case ConstantInteger => new Constant(tag, new java.lang.Integer(in.readInt())) case ConstantInteger => new Constant(tag, new java.lang.Integer(in.readInt()))
case ConstantFloat => new Constant(tag, new java.lang.Float(in.readFloat())) case ConstantFloat => new Constant(tag, new java.lang.Float(in.readFloat()))
case ConstantLong => new Constant(tag, new java.lang.Long(in.readLong())) case ConstantLong => new Constant(tag, new java.lang.Long(in.readLong()))
case ConstantDouble => new Constant(tag, new java.lang.Double(in.readDouble())) case ConstantDouble => new Constant(tag, new java.lang.Double(in.readDouble()))
case ConstantUTF8 => new Constant(tag, in.readUTF()) case ConstantUTF8 => new Constant(tag, in.readUTF())
// TODO: proper support
case ConstantMethodHandle =>
val kind = in.readByte()
val ref = in.readUnsignedShort()
new Constant(tag, -1, -1, None)
case ConstantMethodType =>
val descriptorIndex = in.readUnsignedShort()
new Constant(tag, -1, -1, None)
case ConstantInvokeDynamic =>
val bootstrapIndex = in.readUnsignedShort()
val nameAndTypeIndex = in.readUnsignedShort()
new Constant(tag, -1, -1, None)
case _ => sys.error("Unknown constant: " + tag) case _ => sys.error("Unknown constant: " + tag)
} }
} }