Merge pull request scala#24 from SethTisue/defaults

fix regression in handling of Java-defined classes
SethTisue · Aug 7, 2015 · 08b1bbe · 08b1bbe
2 parents af7f421 + 20d109b
commit 08b1bbe
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/compiler/scala/tools/nsc/backend/jvm/BCodeAsmCommon.scala b/src/compiler/scala/tools/nsc/backend/jvm/BCodeAsmCommon.scala
@@ -262,7 +262,7 @@ final class BCodeAsmCommon[G <: Global](val global: G) {
       if (classSym.isPublic)                                     ACC_PUBLIC    else 0,
       if (classSym.isFinal)                                      ACC_FINAL     else 0,
       // see the link above. javac does the same: ACC_SUPER for all classes, but not interfaces.
-      if (classSym.isInterface && !classSym.isTrait)                                  ACC_INTERFACE else ACC_SUPER,
+      if (classSym.isInterface)                                  ACC_INTERFACE else ACC_SUPER,
       // for Java enums, we cannot trust `hasAbstractFlag` (see comment in enumFlags)
       if (!classSym.hasJavaEnumFlag && classSym.hasAbstractFlag) ACC_ABSTRACT  else 0,
       if (classSym.isArtifact)                                   ACC_SYNTHETIC else 0,