From 2a28baa1542c585836706819814ef042e3bd15a9 Mon Sep 17 00:00:00 2001
From: Yan Zhulanow <yan.zhulanow@jetbrains.com>
Date: Fri, 23 Oct 2015 20:27:41 +0300
Subject: [PATCH] Remove ACC_STATIC from DefaultImpls

---
 .../org/jetbrains/kotlin/codegen/InterfaceImplBodyCodegen.kt   | 3 +--
 .../asJava/lightClasses/nullabilityAnnotations/Generic.java    | 2 +-
 .../asJava/lightClasses/nullabilityAnnotations/Primitives.java | 2 +-
 .../lightClasses/nullabilityAnnotations/PrivateInTrait.java    | 2 +-
 .../asJava/lightClasses/nullabilityAnnotations/Trait.java      | 2 +-
 .../nullabilityAnnotations/TraitClassObjectField.java          | 2 +-
 6 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/InterfaceImplBodyCodegen.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/InterfaceImplBodyCodegen.kt
index bbe086b9a7f..22c5770a407 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/InterfaceImplBodyCodegen.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/InterfaceImplBodyCodegen.kt
@@ -36,7 +36,6 @@ import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodSignature
 import org.jetbrains.kotlin.resolve.scopes.KtScope
 import org.jetbrains.org.objectweb.asm.Opcodes.ACC_FINAL
 import org.jetbrains.org.objectweb.asm.Opcodes.ACC_PUBLIC
-import org.jetbrains.org.objectweb.asm.Opcodes.ACC_STATIC
 import org.jetbrains.org.objectweb.asm.Opcodes.V1_6
 import java.util.*
 
@@ -50,7 +49,7 @@ public class InterfaceImplBodyCodegen(
 
     override fun generateDeclaration() {
         v.defineClass(
-                myClass, V1_6, ACC_PUBLIC or ACC_FINAL or ACC_STATIC,
+                myClass, V1_6, ACC_PUBLIC or ACC_FINAL,
                 typeMapper.mapDefaultImpls(descriptor).internalName,
                 null, "java/lang/Object", ArrayUtil.EMPTY_STRING_ARRAY
         )
diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Generic.java b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Generic.java
index c244cb91ca6..fcdf54af243 100644
--- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Generic.java
+++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Generic.java
@@ -10,6 +10,6 @@ public interface Generic <N, NN> {
     @org.jetbrains.annotations.Nullable
     NN b1(@org.jetbrains.annotations.Nullable NN nn);
 
-    static final class DefaultImpls {
+    final class DefaultImpls {
     }
 }
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Primitives.java b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Primitives.java
index c6d2f74b16f..80f58ec04a5 100644
--- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Primitives.java
+++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Primitives.java
@@ -41,6 +41,6 @@ public interface Primitives {
 
     double getDouble();
 
-    static final class DefaultImpls {
+    final class DefaultImpls {
     }
 }
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/PrivateInTrait.java b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/PrivateInTrait.java
index 2f44384c4ba..c85d32d6619 100644
--- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/PrivateInTrait.java
+++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/PrivateInTrait.java
@@ -1,5 +1,5 @@
 public interface PrivateInTrait {
-    static final class DefaultImpls {
+    final class DefaultImpls {
         @org.jetbrains.annotations.NotNull
         static java.lang.String getNn(PrivateInTrait $this) { /* compiled code */ }
 
diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Trait.java b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Trait.java
index f689dd4a2d7..04ba23bc534 100644
--- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Trait.java
+++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Trait.java
@@ -35,6 +35,6 @@ public interface Trait {
 
     void setNotNullVar(@org.jetbrains.annotations.NotNull java.lang.String p);
 
-    static final class DefaultImpls {
+    final class DefaultImpls {
     }
 }
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/TraitClassObjectField.java b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/TraitClassObjectField.java
index 45196f6920f..bee69f590c9 100644
--- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/TraitClassObjectField.java
+++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/TraitClassObjectField.java
@@ -23,6 +23,6 @@ public interface TraitClassObjectField {
         private Companion() { /* compiled code */ }
     }
 
-    static final class DefaultImpls {
+    final class DefaultImpls {
     }
 }
\ No newline at end of file