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

Delete getFqName() method from KotlinClassFileHeader

Browse Source 
It's not related to the header. Add getClassName() method to
KotlinJvmBinaryClass, which reads the internal name of the class
This commit is contained in:
Alexander Udalov
2013-09-25 21:18:41 +04:00
parent a5a80a9ccc
commit 8b63665b20
10 changed files with 50 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/VirtualFileKotlinClass.java
+21
View File
@@ -34,6 +34,7 @@ import static org.jetbrains.asm4.Opcodes.ASM4;
public class VirtualFileKotlinClass implements KotlinJvmBinaryClass {
private final VirtualFile file;
private JvmClassName className;
public VirtualFileKotlinClass(@NotNull VirtualFile file) {
this.file = file;
@@ -45,6 +46,26 @@ public class VirtualFileKotlinClass implements KotlinJvmBinaryClass {
return file;
}
@NotNull
@Override
public JvmClassName getClassName() {
if (className == null) {
try {
new ClassReader(file.contentsToByteArray()).accept(new ClassVisitor(ASM4) {
@Override
public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) {
className = JvmClassName.byInternalName(name);
}
}, SKIP_CODE | SKIP_DEBUG | SKIP_FRAMES);
}
catch (IOException e) {
throw ExceptionUtils.rethrow(e);
}
}
return className;
}
@Override
public void loadClassAnnotations(@NotNull final AnnotationVisitor annotationVisitor) {
try {
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DeserializedDescriptorResolver.java
+1 -1
View File
@@ -116,7 +116,7 @@ public final class DeserializedDescriptorResolver {
}
if (header != null) {
errorReporter.reportIncompatibleAbiVersion(header.getFqName(), kotlinClass.getFile(), header.getVersion());
errorReporter.reportIncompatibleAbiVersion(kotlinClass.getClassName().getFqName(), kotlinClass.getFile(), header.getVersion());
}
return null;
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/KotlinJvmBinaryClass.java
+3
View File
@@ -26,6 +26,9 @@ public interface KotlinJvmBinaryClass {
@NotNull
VirtualFile getFile();
@NotNull
JvmClassName getClassName();
void loadClassAnnotations(@NotNull AnnotationVisitor visitor);
void loadMemberAnnotations(@NotNull MemberVisitor visitor);
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/header/IncompatibleAnnotationHeader.java
+2 -5
View File
@@ -16,11 +16,8 @@
package org.jetbrains.jet.lang.resolve.kotlin.header;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.resolve.name.FqName;
public class IncompatibleAnnotationHeader extends KotlinClassFileHeader {
protected IncompatibleAnnotationHeader(int version, @NotNull FqName fqName) {
super(version, fqName);
protected IncompatibleAnnotationHeader(int version) {
super(version);
}
}
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/header/KotlinClassFileHeader.java
+1 -12
View File
@@ -20,7 +20,6 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.asm4.ClassReader;
import org.jetbrains.jet.lang.resolve.kotlin.KotlinJvmBinaryClass;
import org.jetbrains.jet.lang.resolve.name.FqName;
import java.io.IOException;
@@ -41,22 +40,12 @@ public abstract class KotlinClassFileHeader {
}
private final int version;
private final FqName fqName;
protected KotlinClassFileHeader(int version, @NotNull FqName fqName) {
protected KotlinClassFileHeader(int version) {
this.version = version;
this.fqName = fqName;
}
public int getVersion() {
return version;
}
/**
* @return FQ name for class header or package class FQ name for package header (e.g. <code>test.TestPackage</code>)
*/
@NotNull
public FqName getFqName() {
return fqName;
}
}
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/header/PackageFragmentClassFileHeader.java
+2 -6
View File
@@ -16,12 +16,8 @@
package org.jetbrains.jet.lang.resolve.kotlin.header;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.resolve.kotlin.header.KotlinClassFileHeader;
import org.jetbrains.jet.lang.resolve.name.FqName;
public class PackageFragmentClassFileHeader extends KotlinClassFileHeader {
protected PackageFragmentClassFileHeader(int version, @NotNull FqName fqName) {
super(version, fqName);
protected PackageFragmentClassFileHeader(int version) {
super(version);
}
}
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/header/ReadDataFromAnnotationVisitor.java
+7 -20
View File
@@ -26,7 +26,6 @@ import org.jetbrains.jet.lang.resolve.java.AbiVersionUtil;
import org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames;
import org.jetbrains.jet.lang.resolve.java.JvmClassName;
import org.jetbrains.jet.lang.resolve.kotlin.KotlinJvmBinaryClass;
import org.jetbrains.jet.lang.resolve.name.FqName;
import java.util.ArrayList;
import java.util.List;
@@ -67,8 +66,6 @@ import static org.jetbrains.jet.lang.resolve.java.AbiVersionUtil.isAbiVersionCom
private String[] annotationData = null;
@Nullable
private HeaderType foundType = null;
@Nullable
private FqName fqName = null;
public ReadDataFromAnnotationVisitor() {
super(Opcodes.ASM4);
@@ -80,39 +77,29 @@ import static org.jetbrains.jet.lang.resolve.java.AbiVersionUtil.isAbiVersionCom
return null;
}
if (fqName == null) {
LOG.error("Class doesn't have a name in the bytecode: " + kotlinClass);
return null;
}
if (!AbiVersionUtil.isAbiVersionCompatible(version)) {
return new IncompatibleAnnotationHeader(version, fqName);
return new IncompatibleAnnotationHeader(version);
}
switch (foundType) {
case CLASS:
return serializedDataHeader(SerializedDataHeader.Kind.CLASS, fqName);
return serializedDataHeader(SerializedDataHeader.Kind.CLASS, kotlinClass);
case PACKAGE:
return serializedDataHeader(SerializedDataHeader.Kind.PACKAGE, fqName);
return serializedDataHeader(SerializedDataHeader.Kind.PACKAGE, kotlinClass);
case PACKAGE_FRAGMENT:
return new PackageFragmentClassFileHeader(version, fqName);
return new PackageFragmentClassFileHeader(version);
default:
throw new UnsupportedOperationException("Unknown compatible HeaderType: " + foundType);
}
}
@Nullable
private SerializedDataHeader serializedDataHeader(@NotNull SerializedDataHeader.Kind kind, @NotNull FqName fqName) {
private SerializedDataHeader serializedDataHeader(@NotNull SerializedDataHeader.Kind kind, @NotNull KotlinJvmBinaryClass kotlinClass) {
if (annotationData == null) {
LOG.error("Kotlin annotation " + foundType + " is incorrect for class: " + fqName);
LOG.error("Kotlin annotation " + foundType + " is incorrect for class: " + kotlinClass);
return null;
}
return new SerializedDataHeader(version, annotationData, kind, fqName);
}
@Override
public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) {
fqName = JvmClassName.byInternalName(name).getFqName();
return new SerializedDataHeader(version, annotationData, kind);
}
@Override
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/header/SerializedDataHeader.java
+2 -3
View File
@@ -17,7 +17,6 @@
package org.jetbrains.jet.lang.resolve.kotlin.header;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.resolve.name.FqName;
public class SerializedDataHeader extends KotlinClassFileHeader {
public enum Kind {
@@ -28,8 +27,8 @@ public class SerializedDataHeader extends KotlinClassFileHeader {
private final String[] data;
private final Kind kind;
protected SerializedDataHeader(int version, @NotNull String[] annotationData, @NotNull Kind kind, @NotNull FqName fqName) {
super(version, fqName);
protected SerializedDataHeader(int version, @NotNull String[] annotationData, @NotNull Kind kind) {
super(version);
this.data = annotationData;
this.kind = kind;
}
idea/src/org/jetbrains/jet/plugin/libraries/DecompiledDataFactory.java
+8 -3
View File
@@ -52,6 +52,8 @@ public final class DecompiledDataFactory {
@NotNull
private final SerializedDataHeader classFileHeader;
@NotNull
private final FqName classFqName;
@NotNull
private final VirtualFile classFile;
@NotNull
private final Project project;
@@ -63,7 +65,10 @@ public final class DecompiledDataFactory {
new InjectorForJavaDescriptorResolver(project, new BindingTraceContext());
this.javaDescriptorResolver = injector.getJavaDescriptorResolver();
KotlinClassFileHeader header = KotlinClassFileHeader.readKotlinHeaderFromClassFile(new VirtualFileKotlinClass(classFile));
VirtualFileKotlinClass kotlinClass = new VirtualFileKotlinClass(classFile);
this.classFqName = kotlinClass.getClassName().getFqName();
KotlinClassFileHeader header = KotlinClassFileHeader.readKotlinHeaderFromClassFile(kotlinClass);
assert header instanceof SerializedDataHeader : "Decompiled data factory shouldn't be called on an unsupported file: " + classFile;
this.classFileHeader = (SerializedDataHeader) header;
}
@@ -74,7 +79,7 @@ public final class DecompiledDataFactory {
}
private JetDecompiledData build() {
FqName packageFqName = classFileHeader.getFqName().parent();
FqName packageFqName = classFqName.parent();
appendDecompiledTextAndPackageName(packageFqName);
SerializedDataHeader.Kind kind = classFileHeader.getKind();
if (kind == SerializedDataHeader.Kind.PACKAGE) {
@@ -91,7 +96,7 @@ public final class DecompiledDataFactory {
}
}
else if (kind == SerializedDataHeader.Kind.CLASS) {
ClassDescriptor cd = javaDescriptorResolver.resolveClass(classFileHeader.getFqName(), INCLUDE_KOTLIN_SOURCES);
ClassDescriptor cd = javaDescriptorResolver.resolveClass(classFqName, INCLUDE_KOTLIN_SOURCES);
if (cd != null) {
appendDescriptor(cd, "");
}
idea/src/org/jetbrains/jet/plugin/vfilefinder/KotlinClassFileIndex.java
+3 -3
View File
@@ -75,10 +75,10 @@ public final class KotlinClassFileIndex extends ScalarIndexExtension<FqName> {
@Override
public Map<FqName, Void> map(FileContent inputData) {
try {
KotlinClassFileHeader header =
KotlinClassFileHeader.readKotlinHeaderFromClassFile(new VirtualFileKotlinClass(inputData.getFile()));
VirtualFileKotlinClass kotlinClass = new VirtualFileKotlinClass(inputData.getFile());
KotlinClassFileHeader header = KotlinClassFileHeader.readKotlinHeaderFromClassFile(kotlinClass);
if (header != null && !(header instanceof IncompatibleAnnotationHeader)) {
return Collections.singletonMap(header.getFqName(), null);
return Collections.singletonMap(kotlinClass.getClassName().getFqName(), null);
}
}
catch (Throwable e) {