| Index: sdk/lib/_internal/compiler/implementation/ssa/codegen.dart
|
| diff --git a/sdk/lib/_internal/compiler/implementation/ssa/codegen.dart b/sdk/lib/_internal/compiler/implementation/ssa/codegen.dart
|
| index d51850f9278c5bdf8c0d734084f33b01ffe699b8..e6e66f04c7b9406e1cb169e142ff87e30cda7542 100644
|
| --- a/sdk/lib/_internal/compiler/implementation/ssa/codegen.dart
|
| +++ b/sdk/lib/_internal/compiler/implementation/ssa/codegen.dart
|
| @@ -2423,15 +2423,19 @@ abstract class SsaCodeGenerator implements HVisitor, HBlockInformationVisitor {
|
| use(node.typeInfoCall);
|
| int index = RuntimeTypeInformation.getTypeVariableIndex(typeVariable);
|
| js.PropertyAccess field = new js.PropertyAccess.indexed(pop(), index);
|
| - RuntimeTypeInformation rti = backend.rti;
|
| - String typeName = rti.getStringRepresentation(arguments.head);
|
| - js.Expression genericName = new js.LiteralString("'$typeName'");
|
| - js.Binary eqTest = new js.Binary('===', field, genericName);
|
| // Also test for 'undefined' in case the object does not have
|
| // any type variable.
|
| js.Prefix undefinedTest = new js.Prefix('!', field);
|
| - result = new js.Binary(
|
| - '&&', result, new js.Binary('||', undefinedTest, eqTest));
|
| + if (arguments.head == compiler.types.dynamicType) {
|
| + result = new js.Binary('&&', result, undefinedTest);
|
| + } else {
|
| + RuntimeTypeInformation rti = backend.rti;
|
| + String typeName = rti.getStringRepresentation(arguments.head);
|
| + js.Expression genericName = new js.LiteralString("'$typeName'");
|
| + js.Binary eqTest = new js.Binary('===', field, genericName);
|
| + result = new js.Binary(
|
| + '&&', result, new js.Binary('||', undefinedTest, eqTest));
|
| + }
|
| arguments = arguments.tail;
|
| }
|
| push(result, node);
|
|
|