languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-10-06 13:35:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

dart2js-kernel: Handle some more 'is' cases

Browse source 
Adds type variables and function types.
Still missing parameterized interface types.

R=sigmund@google.com

Review URL: https://codereview.chromium.org/2542783002 .
This commit is contained in:
Stephen Adams 2016-12-01 09:28:02 -08:00
parent 53b04631bc
commit f62009a3aa
2 changed files with 49 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
pkg/compiler/lib/src/ssa/builder_kernel.dart
View file

@ -385,11 +385,11 @@ class KernelSsaBuilder extends ir.Visitor with GraphBuilder {
HInstruction nullValue = graph.addConstantNull(compiler);
HInstruction errorMessage =
graph.addConstantString(new DartString.literal(message), compiler);
HInstruction trap = new HForeignCode(
js.js.parseForeignJS("#.#"),
backend.dynamicType,
<HInstruction>[nullValue, errorMessage]);
trap.sideEffects..setAllSideEffects()..setDependsOnSomething();
HInstruction trap = new HForeignCode(js.js.parseForeignJS("#.#"),
backend.dynamicType, <HInstruction>[nullValue, errorMessage]);
trap.sideEffects
..setAllSideEffects()
..setDependsOnSomething();
push(trap);
}
@ -952,10 +952,10 @@ class KernelSsaBuilder extends ir.Visitor with GraphBuilder {
} else {
if (_isLazyStatic(staticTarget)) {
push(new HLazyStatic(astAdapter.getField(staticTarget),
astAdapter.inferredTypeOf(staticTarget)));
astAdapter.inferredTypeOf(staticTarget)));
} else {
push(new HStatic(astAdapter.getMember(staticTarget),
astAdapter.inferredTypeOf(staticTarget)));
astAdapter.inferredTypeOf(staticTarget)));
}
}
}
@ -1641,8 +1641,44 @@ class KernelSsaBuilder extends ir.Visitor with GraphBuilder {
isExpression.operand.accept(this);
HInstruction expression = pop();
// TODO(sra): Convert the type testing logic here to use ir.DartType.
DartType type = astAdapter.getDartType(isExpression.type);
type = localsHandler.substInContext(type).unaliased;
if (type is MethodTypeVariableType) {
push(graph.addConstantBool(true, compiler));
return;
}
if (type is MalformedType) {
ErroneousElement element = type.element;
generateTypeError(isExpression, element.message);
push(new HIs.compound(type, expression, pop(), backend.boolType));
return;
}
if (type.isFunctionType) {
List arguments = <HInstruction>[buildFunctionType(type), expression];
_pushDynamicInvocation(isExpression, backend.boolType, arguments,
selector: new Selector.call(
new PrivateName('_isTest', astAdapter.jsHelperLibrary),
CallStructure.ONE_ARG));
push(new HIs.compound(type, expression, pop(), backend.boolType));
return;
}
if (type.isTypeVariable) {
HInstruction runtimeType =
typeBuilder.addTypeVariableReference(type, sourceElement);
_pushStaticInvocation(astAdapter.checkSubtypeOfRuntimeType,
<HInstruction>[expression, runtimeType], backend.boolType);
push(new HIs.variable(type, expression, pop(), backend.boolType));
return;
}
// TODO(sra): Type with type parameters.
if (backend.hasDirectCheckFor(type)) {
push(new HIs.direct(type, expression, backend.boolType));
return;

6
pkg/compiler/lib/src/ssa/kernel_ast_adapter.dart
View file

@ -326,6 +326,12 @@ class KernelAstAdapter {
TypeMaskFactory.inferredReturnTypeForElement(
_backend.helpers.checkConcurrentModificationError, _compiler);
ir.Procedure get checkSubtype =>
kernel.functions[_backend.helpers.checkSubtype];
ir.Procedure get checkSubtypeOfRuntimeType =>
kernel.functions[_backend.helpers.checkSubtypeOfRuntimeType];
ir.Procedure get assertHelper =>
kernel.functions[_backend.helpers.assertHelper];