Skip to content

Commit 69c4c9b

Browse files
committed
Fix scalac classfile parser crash
As diagnosed by Jason Zaugg, this was caused by `pickleMarkerForeign` accidentally being changed to emit the attribute "ScalaSig" instead of "Scala" in 3d66b0d
1 parent fd40234 commit 69c4c9b

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

src/compiler/scala/tools/nsc/backend/jvm/BCodeHelpers.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ trait BCodeHelpers extends BCodeIdiomatic with BytecodeWriters {
176176
* can-multi-thread
177177
*/
178178
def pickleMarkerForeign = {
179-
createJAttribute(ScalaSignatureATTRName, new Array[Byte](0), 0, 0)
179+
createJAttribute(ScalaATTRName, new Array[Byte](0), 0, 0)
180180
}
181181
} // end of trait BCPickles
182182

src/compiler/scala/tools/nsc/backend/jvm/BackendInterface.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -697,6 +697,7 @@ abstract class BackendInterfaceDefinitions { self: BackendInterface =>
697697
lazy val LambdaMetaFactory = getClassIfDefined("java.lang.invoke.LambdaMetafactory")
698698
lazy val MethodHandle = getClassIfDefined("java.lang.invoke.MethodHandle")
699699

700+
val ScalaATTRName: String = "Scala"
700701
val ScalaSignatureATTRName: String = "ScalaSig"
701702
val MetafactoryName: String = "metafactory"
702703

0 commit comments

Comments
 (0)