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

java.lang.String in signature should serialized and mapped back to java.lang.String

Browse Source
This commit is contained in:
Stepan Koltsov
2012-01-24 00:38:26 +04:00
parent f21ad2f536
commit 614ee5d690
20 changed files with 82 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/BothSignatureWriter.java
+3 -3
View File
@@ -142,7 +142,7 @@ public class BothSignatureWriter {
public void writeAsmType(Type asmType, boolean nullable) {
switch (asmType.getSort()) {
case Type.OBJECT:
writeClassBegin(asmType.getInternalName(), nullable);
writeClassBegin(asmType.getInternalName(), nullable, false);
writeClassEnd();
return;
case Type.ARRAY:
@@ -182,9 +182,9 @@ public class BothSignatureWriter {
}
}
public void writeClassBegin(String internalName, boolean nullable) {
public void writeClassBegin(String internalName, boolean nullable, boolean real) {
signatureVisitor().visitClassType(internalName);
jetSignatureWriter.visitClassType(internalName, nullable);
jetSignatureWriter.visitClassType(internalName, nullable, real);
writeAsmType0(Type.getObjectType(internalName));
}
compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java
+1 -1
View File
@@ -144,7 +144,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
{ // superclass
signatureVisitor.writeSuperclass();
if (superClassType == null) {
signatureVisitor.writeClassBegin(superClass, false);
signatureVisitor.writeClassBegin(superClass, false, false);
signatureVisitor.writeClassEnd();
} else {
typeMapper.mapType(superClassType, OwnerKind.IMPLEMENTATION, signatureVisitor, true);
compiler/backend/src/org/jetbrains/jet/codegen/JetTypeMapper.java
+20 -3
View File
@@ -13,7 +13,9 @@ import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.lang.resolve.DescriptorUtils;
import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver;
import org.jetbrains.jet.lang.resolve.java.JavaNamespaceDescriptor;
import org.jetbrains.jet.lang.resolve.java.JavaTypeTransformer;
import org.jetbrains.jet.lang.resolve.java.JvmAbi;
import org.jetbrains.jet.lang.resolve.java.JvmClassName;
import org.jetbrains.jet.lang.resolve.java.JvmPrimitiveType;
import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverDescriptor;
import org.jetbrains.jet.lang.types.*;
@@ -160,6 +162,13 @@ public class JetTypeMapper {
return null;
}
public JvmClassName getClassFQName(ClassDescriptor classDescriptor) {
return JvmClassName.byInternalName(getFQName(classDescriptor));
}
/**
* @return Internal name
*/
public String getFQName(DeclarationDescriptor descriptor) {
descriptor = descriptor.getOriginal();
@@ -285,6 +294,7 @@ public class JetTypeMapper {
if (descriptor instanceof ClassDescriptor) {
Type asmType;
boolean forceReal;
if (standardLibrary.getComparable().equals(descriptor)) {
if (jetType.getArguments().size() != 1) {
@@ -292,13 +302,15 @@ public class JetTypeMapper {
}
asmType = JL_COMPARABLE_TYPE;
forceReal = false;
} else {
String name = getFQName(descriptor);
asmType = Type.getObjectType(name + (kind == OwnerKind.TRAIT_IMPL ? JvmAbi.TRAIT_IMPL_SUFFIX : ""));
JvmClassName name = getClassFQName((ClassDescriptor) descriptor);
asmType = Type.getObjectType(name.getInternalName() + (kind == OwnerKind.TRAIT_IMPL ? JvmAbi.TRAIT_IMPL_SUFFIX : ""));
forceReal = isForceReal(name);
}
if (signatureVisitor != null) {
signatureVisitor.writeClassBegin(asmType.getInternalName(), jetType.isNullable());
signatureVisitor.writeClassBegin(asmType.getInternalName(), jetType.isNullable(), forceReal);
for (TypeProjection proj : jetType.getArguments()) {
// TODO: +-
signatureVisitor.writeTypeArgument(proj.getProjectionKind());
@@ -790,6 +802,11 @@ public class JetTypeMapper {
knowTypes.put(standardLibrary.getNullablePrimitiveArrayJetType(primitiveType), jvmPrimitiveType.getAsmArrayType());
}
}
private boolean isForceReal(JvmClassName className) {
return JvmPrimitiveType.getByWrapperClass(className) != null
|| className.getFqName().equals("java.lang.String") || className.getFqName().equals("java.lang.Object");
}
public String isKnownTypeInfo(JetType jetType) {
return knowTypeNames.get(jetType);