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

JS: fix support of throwable constructors without message and/or cause parameters

Browse Source
This commit is contained in:
Alexey Andreev
2016-12-29 15:52:47 +03:00
parent 6f4d8decc7
commit 115f6ced87
11 changed files with 99 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/box/specialBuiltins/exceptionCause.kt
Vendored
+25
View File
@@ -0,0 +1,25 @@
class CustomException : Throwable {
constructor(message: String?, cause: Throwable?) : super(message, cause)
constructor(message: String?) : super(message, null)
constructor(cause: Throwable?) : super(cause)
constructor() : super()
}
fun box(): String {
var t = CustomException("O", Throwable("K"))
if (t.message != "O" || t.cause?.message != "K") return "fail1"
t = CustomException(Throwable("OK"))
if (t.message == null || t.message == "OK" || t.cause?.message != "OK") return "fail2"
t = CustomException("OK")
if (t.message != "OK" || t.cause != null) return "fail3"
t = CustomException()
if (t.message != null || t.cause != null) return "fail4"
return "OK"
}
compiler/testData/codegen/box/specialBuiltins/throwableCause.kt
Vendored
+7 -1
View File
@@ -3,7 +3,13 @@ fun box(): String {
if (t.message != "O" || t.cause?.message != "K") return "fail1"
t = Throwable(Throwable("OK"))
if (t.message != null || t.cause?.message != "OK") return "fail2"
if (t.message == null || t.message == "OK" || t.cause?.message != "OK") return "fail2"
t = Throwable("OK")
if (t.message != "OK" || t.cause != null) return "fail3"
t = Throwable()
if (t.message != null || t.cause != null) return "fail4"
return "OK"
}
compiler/testData/codegen/light-analysis/specialBuiltins/exceptionCause.txt
Vendored
+10
View File
@@ -0,0 +1,10 @@
public final class CustomException {
public method <init>(): void
public method <init>(@org.jetbrains.annotations.Nullable p0: java.lang.String): void
public method <init>(@org.jetbrains.annotations.Nullable p0: java.lang.String, @org.jetbrains.annotations.Nullable p1: java.lang.Throwable): void
public method <init>(@org.jetbrains.annotations.Nullable p0: java.lang.Throwable): void
}
public final class ExceptionCauseKt {
public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
}
compiler/testData/codegen/light-analysis/specialBuiltins/throwableImplWithSecondaryConstructor.txt
Vendored
+10
View File
@@ -0,0 +1,10 @@
public final class MyThrowable {
private final @org.jetbrains.annotations.NotNull field x: java.lang.String
public method <init>(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: java.lang.String, @org.jetbrains.annotations.Nullable p2: java.lang.Throwable): void
public synthetic method <init>(p0: java.lang.String, p1: java.lang.String, p2: java.lang.Throwable, p3: int, p4: kotlin.jvm.internal.DefaultConstructorMarker): void
public final @org.jetbrains.annotations.NotNull method getX(): java.lang.String
}
public final class ThrowableImplWithSecondaryConstructorKt {
public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
}
compiler/tests-ir-jvm/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java
+6
View File
@@ -16169,6 +16169,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
doTest(fileName);
}
@TestMetadata("exceptionCause.kt")
public void testExceptionCause() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/specialBuiltins/exceptionCause.kt");
doTest(fileName);
}
@TestMetadata("explicitSuperCall.kt")
public void testExplicitSuperCall() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/specialBuiltins/explicitSuperCall.kt");
compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java
+6
View File
@@ -16169,6 +16169,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
doTest(fileName);
}
@TestMetadata("exceptionCause.kt")
public void testExceptionCause() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/specialBuiltins/exceptionCause.kt");
doTest(fileName);
}
@TestMetadata("explicitSuperCall.kt")
public void testExplicitSuperCall() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/specialBuiltins/explicitSuperCall.kt");
compiler/tests/org/jetbrains/kotlin/codegen/LightAnalysisModeCodegenTestGenerated.java
+6
View File
@@ -16169,6 +16169,12 @@ public class LightAnalysisModeCodegenTestGenerated extends AbstractLightAnalysis
doTest(fileName);
}
@TestMetadata("exceptionCause.kt")
public void testExceptionCause() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/specialBuiltins/exceptionCause.kt");
doTest(fileName);
}
@TestMetadata("explicitSuperCall.kt")
public void testExplicitSuperCall() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/specialBuiltins/explicitSuperCall.kt");
js/js.libraries/src/core/builtins.kt
+1 -1
View File
@@ -61,7 +61,7 @@ internal fun captureStack(baseClass: JsClass<in Throwable>, instance: Throwable)
@JsName("newThrowable")
internal fun newThrowable(message: String?, cause: Throwable?): Throwable {
val throwable = js("new Error()")
throwable.message = message
throwable.message = if (jsTypeOf(message) == "undefined" && cause != null) cause.toString() else message
throwable.cause = cause
return throwable
}
js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java
+6
View File
@@ -20421,6 +20421,12 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
doTest(fileName);
}
@TestMetadata("exceptionCause.kt")
public void testExceptionCause() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/specialBuiltins/exceptionCause.kt");
doTest(fileName);
}
@TestMetadata("explicitSuperCall.kt")
public void testExplicitSuperCall() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/specialBuiltins/explicitSuperCall.kt");
js/js.translator/src/org/jetbrains/kotlin/js/translate/initializer/ClassInitializerTranslator.java
+21 -5
View File
@@ -269,7 +269,7 @@ public final class ClassInitializerTranslator extends AbstractTranslator {
List<JsStatement> statements = context.getCurrentBlock().getStatements();
statements.add(JsAstUtils.asSyntheticStatement(superInvocation));
JsExpression messageArgument = JsLiteral.NULL;
JsExpression messageArgument = Namer.getUndefinedExpression();
JsExpression causeArgument = JsLiteral.NULL;
for (ValueParameterDescriptor param : superCall.getResultingDescriptor().getValueParameters()) {
ResolvedValueArgument argument = superCall.getValueArguments().get(param);
@@ -283,10 +283,10 @@ public final class ClassInitializerTranslator extends AbstractTranslator {
JsExpression jsValue = Translation.translateAsExpression(value, context);
if (KotlinBuiltIns.isStringOrNullableString(param.getType())) {
messageArgument = jsValue;
messageArgument = context.cacheExpressionIfNeeded(jsValue);
}
else if (TypeUtilsKt.isConstructedFromClassWithGivenFqName(param.getType(), KotlinBuiltIns.FQ_NAMES.throwable)) {
causeArgument = jsValue;
causeArgument = context.cacheExpressionIfNeeded(jsValue);
}
else {
statements.add(JsAstUtils.asSyntheticStatement(jsValue));
@@ -296,12 +296,28 @@ public final class ClassInitializerTranslator extends AbstractTranslator {
PropertyDescriptor messageProperty = DescriptorUtils.getPropertyByName(
classDescriptor.getUnsubstitutedMemberScope(), Name.identifier("message"));
JsExpression messageRef = pureFqn(context.getNameForBackingField(messageProperty), receiver.deepCopy());
statements.add(JsAstUtils.asSyntheticStatement(JsAstUtils.assignment(messageRef, messageArgument)));
JsExpression messageIsUndefined = JsAstUtils.typeOfIs(messageArgument, context.program().getStringLiteral("undefined"));
JsExpression causeIsNull = new JsBinaryOperation(JsBinaryOperator.NEQ, causeArgument, JsLiteral.NULL);
JsExpression causeToStringCond = JsAstUtils.and(messageIsUndefined, causeIsNull);
JsExpression causeToString = new JsInvocation(pureFqn("toString", Namer.kotlinObject()), causeArgument.deepCopy());
JsExpression correctedMessage;
if (causeArgument == JsLiteral.NULL) {
correctedMessage = messageArgument.deepCopy();
}
else {
if (JsAstUtils.isUndefinedExpression(messageArgument)) {
causeToStringCond = causeIsNull;
}
correctedMessage = new JsConditional(causeToStringCond, causeToString, messageArgument);
}
statements.add(JsAstUtils.asSyntheticStatement(JsAstUtils.assignment(messageRef, correctedMessage)));
PropertyDescriptor causeProperty = DescriptorUtils.getPropertyByName(
classDescriptor.getUnsubstitutedMemberScope(), Name.identifier("cause"));
JsExpression causeRef = pureFqn(context.getNameForBackingField(causeProperty), receiver.deepCopy());
statements.add(JsAstUtils.asSyntheticStatement(JsAstUtils.assignment(causeRef, causeArgument)));
statements.add(JsAstUtils.asSyntheticStatement(JsAstUtils.assignment(causeRef, causeArgument.deepCopy())));
}
@NotNull
js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/ThrowableConstructorIntrinsicFactory.kt
+1 -1
View File
@@ -47,7 +47,7 @@ object ThrowableConstructorIntrinsicFactory : FunctionIntrinsicFactory {
}
if (constructor.valueParameters.size == 1 && hasCauseParameter) {
argumentsToPass.add(0, JsLiteral.NULL)
argumentsToPass.add(0, Namer.getUndefinedExpression())
}
return JsInvocation(JsAstUtils.pureFqn("newThrowable", Namer.kotlinObject()), argumentsToPass)