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

KT-2823 TypeCastException has no message

Browse Source 
#KT-2823 Fixed
This commit is contained in:
Natalia.Ukhorskaya
2012-10-10 14:45:43 +04:00
parent a31b748092
commit 78d22e9f81
4 changed files with 39 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
+16 -3
View File
@@ -57,6 +57,7 @@ import org.jetbrains.jet.lang.types.checker.JetTypeChecker;
import org.jetbrains.jet.lang.types.lang.JetStandardClasses;
import org.jetbrains.jet.lang.types.lang.JetStandardLibrary;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.jet.resolve.DescriptorRenderer;
import java.util.*;
@@ -3156,7 +3157,9 @@ The "returned" value of try expression with no finally is either the last expres
v.dup();
Label nonnull = new Label();
v.ifnonnull(nonnull);
throwNewException(CLASS_TYPE_CAST_EXCEPTION);
throwNewException(CLASS_TYPE_CAST_EXCEPTION, DescriptorRenderer.TEXT.renderType(leftType) +
" cannot be cast to " +
DescriptorRenderer.TEXT.renderType(rightType));
v.mark(nonnull);
}
}
@@ -3376,10 +3379,20 @@ The "returned" value of try expression with no finally is either the last expres
return false;
}
private void throwNewException(final String className) {
private void throwNewException(@NotNull final String className) {
throwNewException(className, null);
}
private void throwNewException(@NotNull final String className, @Nullable final String message) {
v.anew(Type.getObjectType(className));
v.dup();
v.invokespecial(className, "<init>", "()V");
if (message != null) {
v.visitLdcInsn(message);
v.invokespecial(className, "<init>", "(Ljava/lang/String;)V");
}
else {
v.invokespecial(className, "<init>", "()V");
}
v.athrow();
}