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

Use correct lhs KotlinType & AsmType for is check generation

Browse Source 
There were two problems:
  - For asm type `OBJECT_TYPE` was used, which can be wrong in case of
  inline classes, because it can be an underlying value of some inline class
  - For KotlinType, type from rhs was used
This commit is contained in:
Mikhail Zarechenskiy
2018-07-04 17:36:41 +03:00
parent 4f490ac264
commit 2939d9c8c6
7 changed files with 107 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java
+14 -6
View File
@@ -4487,21 +4487,29 @@ The "returned" value of try expression with no finally is either the last expres
return negated ? StackValue.not(value) : value;
}
private StackValue generateIsCheck(StackValue expressionToGen, KotlinType kotlinType, boolean leaveExpressionOnStack) {
private StackValue generateIsCheck(StackValue expressionToGen, KotlinType rhsKotlinType, boolean leaveExpressionOnStack) {
KotlinType lhsKotlinType = expressionToGen.kotlinType;
Type lhsBoxedType;
if (lhsKotlinType != null && InlineClassesUtilsKt.isInlineClassType(lhsKotlinType)) {
lhsBoxedType = typeMapper.mapTypeAsDeclaration(lhsKotlinType);
}
else {
lhsBoxedType = OBJECT_TYPE;
}
return StackValue.operation(Type.BOOLEAN_TYPE, v -> {
expressionToGen.put(OBJECT_TYPE, kotlinType, v);
expressionToGen.put(lhsBoxedType, expressionToGen.kotlinType, v);
if (leaveExpressionOnStack) {
v.dup();
}
Type type = boxType(typeMapper.mapTypeAsDeclaration(kotlinType));
if (TypeUtils.isReifiedTypeParameter(kotlinType)) {
putReifiedOperationMarkerIfTypeIsReifiedParameter(kotlinType, ReifiedTypeInliner.OperationKind.IS);
Type type = boxType(typeMapper.mapTypeAsDeclaration(rhsKotlinType));
if (TypeUtils.isReifiedTypeParameter(rhsKotlinType)) {
putReifiedOperationMarkerIfTypeIsReifiedParameter(rhsKotlinType, ReifiedTypeInliner.OperationKind.IS);
v.instanceOf(type);
return null;
}
CodegenUtilKt.generateIsCheck(v, kotlinType, type);
CodegenUtilKt.generateIsCheck(v, rhsKotlinType, type);
return null;
});
}