Don't write Kotlin metadata in light classes mode

This was already happening for classes and packages, now will also for
interface DefaultImpls and any other possible classes
This commit is contained in:
Alexander Udalov
2015-10-03 01:03:35 +03:00
parent cb6d16d224
commit f310d4c10e
9 changed files with 3 additions and 18 deletions
@@ -44,8 +44,6 @@ import org.jetbrains.kotlin.lexer.JetTokens;
import org.jetbrains.kotlin.load.java.JvmAbi;
import org.jetbrains.kotlin.load.java.JvmAnnotationNames;
import org.jetbrains.kotlin.load.java.descriptors.JavaCallableMemberDescriptor;
import org.jetbrains.kotlin.name.FqName;
import org.jetbrains.kotlin.name.FqNameUnsafe;
import org.jetbrains.kotlin.name.Name;
import org.jetbrains.kotlin.psi.*;
import org.jetbrains.kotlin.resolve.BindingContext;
@@ -253,8 +251,6 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
@Override
protected void generateKotlinAnnotation() {
if (state.getClassBuilderMode() != ClassBuilderMode.FULL) return;
if (!isTopLevelOrInnerClass(descriptor)) {
AnnotationVisitor av = v.getVisitor().visitAnnotation(
asmDescByFqNameWithoutInnerClasses(JvmAnnotationNames.KOTLIN_LOCAL_CLASS), true
@@ -117,7 +117,9 @@ public abstract class MemberCodegen<T extends JetElement/* TODO: & JetDeclaratio
generateSyntheticParts();
generateKotlinAnnotation();
if (state.getClassBuilderMode() == ClassBuilderMode.FULL) {
generateKotlinAnnotation();
}
done();
}
@@ -69,10 +69,6 @@ public class MultifileClassPartCodegen(
}
override fun generateKotlinAnnotation() {
if (state.classBuilderMode != ClassBuilderMode.FULL) {
return
}
val members = ArrayList<DeclarationDescriptor>()
for (declaration in element.declarations) {
when (declaration) {
@@ -107,10 +107,6 @@ public class PackagePartCodegen extends MemberCodegen<JetFile> {
@Override
protected void generateKotlinAnnotation() {
if (state.getClassBuilderMode() != ClassBuilderMode.FULL) {
return;
}
List<DeclarationDescriptor> members = new ArrayList<DeclarationDescriptor>();
for (JetDeclaration declaration : element.getDeclarations()) {
if (declaration instanceof JetNamedFunction) {
@@ -10,7 +10,6 @@ public interface Generic <N, NN> {
@org.jetbrains.annotations.Nullable
NN b1(@org.jetbrains.annotations.Nullable NN nn);
@kotlin.jvm.internal.KotlinSyntheticClass(version = {0, 27, 0}, abiVersion = 27)
static final class DefaultImpls {
}
}
@@ -41,7 +41,6 @@ public interface Primitives {
double getDouble();
@kotlin.jvm.internal.KotlinSyntheticClass(version = {0, 27, 0}, abiVersion = 27)
static final class DefaultImpls {
}
}
@@ -1,5 +1,4 @@
public interface PrivateInTrait {
@kotlin.jvm.internal.KotlinSyntheticClass(version = {0, 27, 0}, abiVersion = 27)
static final class DefaultImpls {
@org.jetbrains.annotations.NotNull
static java.lang.String getNn(PrivateInTrait $this) { /* compiled code */ }
@@ -35,7 +35,6 @@ public interface Trait {
void setNotNullVar(@org.jetbrains.annotations.NotNull java.lang.String p);
@kotlin.jvm.internal.KotlinSyntheticClass(version = {0, 27, 0}, abiVersion = 27)
static final class DefaultImpls {
}
}
@@ -16,7 +16,6 @@ public interface TraitClassObjectField {
private Companion() { /* compiled code */ }
}
@kotlin.jvm.internal.KotlinSyntheticClass(version = {0, 27, 0}, abiVersion = 27)
static final class DefaultImpls {
}
}