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

Change KotlinClassFileHeader loading interface

Browse Source 
It should be able to load the header based on an abstract KotlinJvmBinaryClass,
not only the VirtualFile-based one
This commit is contained in:
Alexander Udalov
2013-09-25 19:17:02 +04:00
parent 2eebcd91c0
commit a5a80a9ccc
8 changed files with 29 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DeserializedDescriptorResolver.java
+1 -1
View File
@@ -110,7 +110,7 @@ public final class DeserializedDescriptorResolver {
@Nullable
private String[] readData(@NotNull KotlinJvmBinaryClass kotlinClass) {
KotlinClassFileHeader header = KotlinClassFileHeader.readKotlinHeaderFromClassFile(kotlinClass.getFile());
KotlinClassFileHeader header = KotlinClassFileHeader.readKotlinHeaderFromClassFile(kotlinClass);
if (header instanceof SerializedDataHeader) {
return ((SerializedDataHeader) header).getAnnotationData();
}
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/header/KotlinClassFileHeader.java
+4 -4
View File
@@ -16,10 +16,10 @@
package org.jetbrains.jet.lang.resolve.kotlin.header;
import com.intellij.openapi.vfs.VirtualFile;
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;
@@ -28,12 +28,12 @@ import static org.jetbrains.asm4.ClassReader.*;
public abstract class KotlinClassFileHeader {
@Nullable
public static KotlinClassFileHeader readKotlinHeaderFromClassFile(@NotNull VirtualFile virtualFile) {
public static KotlinClassFileHeader readKotlinHeaderFromClassFile(@NotNull KotlinJvmBinaryClass kotlinClass) {
try {
ClassReader reader = new ClassReader(virtualFile.contentsToByteArray());
ClassReader reader = new ClassReader(kotlinClass.getFile().contentsToByteArray());
ReadDataFromAnnotationVisitor visitor = new ReadDataFromAnnotationVisitor();
reader.accept(visitor, SKIP_CODE | SKIP_FRAMES | SKIP_DEBUG);
return visitor.createHeader(virtualFile);
return visitor.createHeader(kotlinClass);
}
catch (IOException e) {
throw new RuntimeException(e);
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/header/ReadDataFromAnnotationVisitor.java
+3 -3
View File
@@ -17,7 +17,6 @@
package org.jetbrains.jet.lang.resolve.kotlin.header;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.vfs.VirtualFile;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.asm4.AnnotationVisitor;
@@ -26,6 +25,7 @@ import org.jetbrains.asm4.Opcodes;
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;
@@ -75,13 +75,13 @@ import static org.jetbrains.jet.lang.resolve.java.AbiVersionUtil.isAbiVersionCom
}
@Nullable
public KotlinClassFileHeader createHeader(@NotNull VirtualFile virtualFile) {
public KotlinClassFileHeader createHeader(@NotNull KotlinJvmBinaryClass kotlinClass) {
if (foundType == null) {
return null;
}
if (fqName == null) {
LOG.error("Class doesn't have a name in the bytecode: " + virtualFile);
LOG.error("Class doesn't have a name in the bytecode: " + kotlinClass);
return null;
}