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

Removed JvmPropertyAccessorSignature.getJvmMethodSignature() method

Browse Source
This commit is contained in:
Mikhael Bogdanov
2013-04-26 13:12:25 +04:00
parent 83d8930c02
commit b1c2d9035a
3 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java
+7 -7
View File
@@ -654,7 +654,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
private Type genPropertyOnStack(InstructionAdapter iv, PropertyDescriptor propertyDescriptor, int index) {
iv.load(index, classAsmType);
Method
method = typeMapper.mapGetterSignature(propertyDescriptor, OwnerKind.IMPLEMENTATION).getJvmMethodSignature().getAsmMethod();
method = typeMapper.mapGetterSignature(propertyDescriptor, OwnerKind.IMPLEMENTATION).getAsmMethod();
iv.invokevirtual(classAsmType.getInternalName(), method.getName(), method.getDescriptor());
return method.getReturnType();
@@ -853,9 +853,9 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
PropertyDescriptor original = (PropertyDescriptor) entry.getKey();
{
Method method = typeMapper.mapGetterSignature(bridge, OwnerKind.IMPLEMENTATION).getJvmMethodSignature().getAsmMethod();
Method method = typeMapper.mapGetterSignature(bridge, OwnerKind.IMPLEMENTATION).getAsmMethod();
JvmPropertyAccessorSignature originalSignature = typeMapper.mapGetterSignature(original, OwnerKind.IMPLEMENTATION);
Method originalMethod = originalSignature.getJvmMethodSignature().getAsmMethod();
Method originalMethod = originalSignature.getAsmMethod();
MethodVisitor mv =
v.newMethod(null, ACC_BRIDGE | ACC_SYNTHETIC | ACC_STATIC, method.getName(), method.getDescriptor(), null, null);
PropertyGetterDescriptor getter = bridge.getGetter();
@@ -890,9 +890,9 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
}
if (bridge.isVar()) {
Method method = typeMapper.mapSetterSignature(bridge, OwnerKind.IMPLEMENTATION).getJvmMethodSignature().getAsmMethod();
Method method = typeMapper.mapSetterSignature(bridge, OwnerKind.IMPLEMENTATION).getAsmMethod();
JvmPropertyAccessorSignature originalSignature2 = typeMapper.mapSetterSignature(original, OwnerKind.IMPLEMENTATION);
Method originalMethod = originalSignature2.getJvmMethodSignature().getAsmMethod();
Method originalMethod = originalSignature2.getAsmMethod();
MethodVisitor mv =
v.newMethod(null, ACC_STATIC | ACC_BRIDGE | ACC_FINAL, method.getName(), method.getDescriptor(), null, null);
PropertySetterDescriptor setter = bridge.getSetter();
@@ -1353,13 +1353,13 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
JvmPropertyAccessorSignature toGenerate = typeMapper.mapGetterSignature(property, OwnerKind.IMPLEMENTATION);
JvmPropertyAccessorSignature inTrait = typeMapper.mapGetterSignature(original, OwnerKind.IMPLEMENTATION);
return new TraitImplDelegateInfo(
toGenerate.getJvmMethodSignature().getAsmMethod(), inTrait.getJvmMethodSignature().getAsmMethod());
toGenerate.getAsmMethod(), inTrait.getAsmMethod());
}
else if (fun instanceof PropertySetterDescriptor) {
JvmPropertyAccessorSignature toGenerate = typeMapper.mapSetterSignature(property, OwnerKind.IMPLEMENTATION);
JvmPropertyAccessorSignature inTrait = typeMapper.mapSetterSignature(original, OwnerKind.IMPLEMENTATION);
return new TraitImplDelegateInfo(
toGenerate.getJvmMethodSignature().getAsmMethod(), inTrait.getJvmMethodSignature().getAsmMethod());
toGenerate.getAsmMethod(), inTrait.getAsmMethod());
}
else {
throw new IllegalStateException("Accessor is neither getter, nor setter, what is it? " + fun);
compiler/backend/src/org/jetbrains/jet/codegen/PropertyCodegen.java
+6 -6
View File
@@ -135,7 +135,7 @@ public class PropertyCodegen extends GenerationStateAware {
? new DefaultPropertyAccessorStrategy(getterDescriptor)
: new FunctionGenerationStrategy.FunctionDefault(state, getterDescriptor, getter);
functionCodegen.generateMethod(getter != null ? getter : p,
signature.getJvmMethodSignature(),
signature,
true,
getterDescriptor,
strategy);
@@ -158,7 +158,7 @@ public class PropertyCodegen extends GenerationStateAware {
? new DefaultPropertyAccessorStrategy(setterDescriptor)
: new FunctionGenerationStrategy.FunctionDefault(state, setterDescriptor, setter);
functionCodegen.generateMethod(setter != null ? setter : p,
signature.getJvmMethodSignature(),
signature,
true,
setterDescriptor,
strategy);
@@ -257,13 +257,13 @@ public class PropertyCodegen extends GenerationStateAware {
ClassDescriptor toClass = (ClassDescriptor) overridden.getContainingDeclaration();
functionCodegen.genDelegate(delegate.getGetter(), toClass, field,
typeMapper.mapGetterSignature(delegate, OwnerKind.IMPLEMENTATION).getJvmMethodSignature(),
typeMapper.mapGetterSignature(overridden.getOriginal(), OwnerKind.IMPLEMENTATION).getJvmMethodSignature());
typeMapper.mapGetterSignature(delegate, OwnerKind.IMPLEMENTATION),
typeMapper.mapGetterSignature(overridden.getOriginal(), OwnerKind.IMPLEMENTATION));
if (delegate.isVar()) {
functionCodegen.genDelegate(delegate.getSetter(), toClass, field,
typeMapper.mapSetterSignature(delegate, OwnerKind.IMPLEMENTATION).getJvmMethodSignature(),
typeMapper.mapSetterSignature(overridden.getOriginal(), OwnerKind.IMPLEMENTATION).getJvmMethodSignature());
typeMapper.mapSetterSignature(delegate, OwnerKind.IMPLEMENTATION),
typeMapper.mapSetterSignature(overridden.getOriginal(), OwnerKind.IMPLEMENTATION));
}
}
}
compiler/backend/src/org/jetbrains/jet/codegen/signature/JvmPropertyAccessorSignature.java
-5
View File
@@ -40,11 +40,6 @@ public class JvmPropertyAccessorSignature extends JvmMethodSignature {
this.isGetter = isGetter;
}
@NotNull
public JvmMethodSignature getJvmMethodSignature() {
return this;
}
@NotNull
public String getPropertyTypeKotlinSignature() {
return isGetter ? getKotlinReturnType() : getKotlinParameterType(getParameterCount() - 1);