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
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)