azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed backend visibility modifiers for internal classes. They still are public in JVM, but have special flag.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-06-14 20:31:13 +04:00
parent 18db494bc1
commit cfd56b4c2a
2 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java
+7 -1
View File
@@ -165,9 +165,15 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
AnnotationCodegen.forClass(v.getVisitor(), typeMapper).genAnnotations(descriptor); AnnotationCodegen.forClass(v.getVisitor(), typeMapper).genAnnotations(descriptor);
if (signature.getKotlinGenericSignature() != null) { if (signature.getKotlinGenericSignature() != null || descriptor.getVisibility() != Visibilities.PUBLIC) {
AnnotationVisitor annotationVisitor = v.newAnnotation(myClass, JvmStdlibNames.JET_CLASS.getDescriptor(), true); AnnotationVisitor annotationVisitor = v.newAnnotation(myClass, JvmStdlibNames.JET_CLASS.getDescriptor(), true);
annotationVisitor.visit(JvmStdlibNames.JET_CLASS_SIGNATURE, signature.getKotlinGenericSignature()); annotationVisitor.visit(JvmStdlibNames.JET_CLASS_SIGNATURE, signature.getKotlinGenericSignature());
if (descriptor.getVisibility() == Visibilities.INTERNAL) {
annotationVisitor.visit(JvmStdlibNames.JET_CLASS_FLAGS_FIELD, 1 << JvmStdlibNames.FLAG_INTERNAL_BIT);
}
else if (descriptor.getVisibility() == Visibilities.PRIVATE) {
annotationVisitor.visit(JvmStdlibNames.JET_CLASS_FLAGS_FIELD, 1 << JvmStdlibNames.FLAG_PRIVATE_BIT);
}
annotationVisitor.visitEnd(); annotationVisitor.visitEnd();
} }
} }
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/JetClassAnnotation.java
+16
View File
@@ -22,6 +22,8 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.resolve.java.JvmStdlibNames; import org.jetbrains.jet.lang.resolve.java.JvmStdlibNames;
import java.util.BitSet;
/** /**
* @author Stepan Koltsov * @author Stepan Koltsov
*/ */
@@ -38,6 +40,20 @@ public class JetClassAnnotation extends PsiAnnotationWrapper {
} }
return signature; return signature;
} }
private BitSet flags = null;
public BitSet flags() {
if (flags == null) {
int flagsValue = getIntAttribute(JvmStdlibNames.JET_CLASS_FLAGS_FIELD, JvmStdlibNames.FLAGS_DEFAULT_VALUE);
flags = new BitSet(JvmStdlibNames.FLAGS_BITS);
for (int bit = 0; bit < JvmStdlibNames.FLAGS_BITS; bit++) {
flags.set(bit, (flagsValue & (1 << bit)) != 0);
}
}
return flags;
}
@NotNull @NotNull
public static JetClassAnnotation get(PsiClass psiClass) { public static JetClassAnnotation get(PsiClass psiClass) {