| Index: pkg/compiler/lib/src/ssa/type_builder.dart
|
| diff --git a/pkg/compiler/lib/src/ssa/type_builder.dart b/pkg/compiler/lib/src/ssa/type_builder.dart
|
| index a565bd2df7d0317104e7f3439776004293fb827c..8ef448ac111e3f8a8dd5dda7e879699d9465d83e 100644
|
| --- a/pkg/compiler/lib/src/ssa/type_builder.dart
|
| +++ b/pkg/compiler/lib/src/ssa/type_builder.dart
|
| @@ -71,7 +71,7 @@ class TypeBuilder {
|
|
|
| /// Helper to create an instruction that gets the value of a type variable.
|
| HInstruction addTypeVariableReference(
|
| - ResolutionTypeVariableType type, Element member,
|
| + ResolutionTypeVariableType type, MemberElement member,
|
| {SourceInformation sourceInformation}) {
|
| assert(assertTypeInContext(type));
|
| if (type is MethodTypeVariableType) {
|
| @@ -80,8 +80,8 @@ class TypeBuilder {
|
| bool isClosure = member.enclosingElement.isClosure;
|
| if (isClosure) {
|
| ClosureClassElement closureClass = member.enclosingElement;
|
| - member = closureClass.methodElement;
|
| - member = member.outermostEnclosingMemberOrTopLevel;
|
| + LocalFunctionElement localFunction = closureClass.methodElement;
|
| + member = localFunction.outermostEnclosingMemberOrTopLevel;
|
| }
|
| bool isInConstructorContext =
|
| member.isConstructor || member.isGenerativeConstructorBody;
|
| @@ -144,7 +144,7 @@ class TypeBuilder {
|
| }
|
|
|
| HInstruction buildTypeArgumentRepresentations(
|
| - ResolutionDartType type, Element sourceElement) {
|
| + ResolutionDartType type, MemberElement sourceElement) {
|
| assert(!type.isTypeVariable);
|
| // Compute the representation of the type arguments, including access
|
| // to the runtime type information for type variables as instructions.
|
| @@ -178,7 +178,7 @@ class TypeBuilder {
|
| }
|
|
|
| HInstruction analyzeTypeArgument(
|
| - ResolutionDartType argument, Element sourceElement,
|
| + ResolutionDartType argument, MemberElement sourceElement,
|
| {SourceInformation sourceInformation}) {
|
| assert(assertTypeInContext(argument));
|
| argument = argument.unaliased;
|
|
|