Simplify decision about whether to emit ACC_ABSTRACT

retronym · retronym · commit 0637c3b3b819 · 2016-02-18T17:01:21.000+10:00
Look at the RHS of the DefDef, rather than at flags of the Symbol
diff --git a/src/compiler/scala/tools/nsc/backend/jvm/BCodeSkelBuilder.scala b/src/compiler/scala/tools/nsc/backend/jvm/BCodeSkelBuilder.scala
@@ -563,7 +563,7 @@ abstract class BCodeSkelBuilder extends BCodeHelpers {
       }
 
       val isNative         = methSymbol.hasAnnotation(definitions.NativeAttr)
-      val isAbstractMethod = (methSymbol.isDeferred || methSymbol.owner.isInterface) && !methSymbol.hasFlag(Flags.JAVA_DEFAULTMETHOD)
+      val isAbstractMethod = rhs == EmptyTree
       val flags = GenBCode.mkFlags(
         javaFlags(methSymbol),
         if (isAbstractMethod)        asm.Opcodes.ACC_ABSTRACT   else 0,

Original file line number	Diff line number	Diff line change
`@@ -563,7 +563,7 @@ abstract class BCodeSkelBuilder extends BCodeHelpers {`
`563`	`563`	`}`
`564`	`564`
`565`	`565`	`val isNative = methSymbol.hasAnnotation(definitions.NativeAttr)`
`566`		`- val isAbstractMethod = (methSymbol.isDeferred \|\| methSymbol.owner.isInterface) && !methSymbol.hasFlag(Flags.JAVA_DEFAULTMETHOD)`
	`566`	`+ val isAbstractMethod = rhs == EmptyTree`
`567`	`567`	`val flags = GenBCode.mkFlags(`
`568`	`568`	`javaFlags(methSymbol),`
`569`	`569`	`if (isAbstractMethod) asm.Opcodes.ACC_ABSTRACT else 0,`