@@ -55,12 +55,12 @@ sealed class CallReference extends Reference {
5555 DeserializationContext context,
5656 ) => switch (syntax) {
5757 TearoffCallSyntax () => CallTearoff (
58- loadingUnit: context.loadingUnits[syntax.loadingUnitIndex ],
58+ loadingUnit: context.loadingUnits[syntax.loadingUnitIndices.first ],
5959 ),
6060 WithArgumentsCallSyntax (
6161 : final named,
6262 : final positional,
63- : final loadingUnitIndex ,
63+ : final loadingUnitIndices ,
6464 ) =>
6565 CallWithArguments (
6666 positionalArguments: (positional ?? [])
@@ -69,7 +69,7 @@ sealed class CallReference extends Reference {
6969 namedArguments: (named ?? {}).map (
7070 (name, index) => MapEntry (name, _argumentFromSyntax (index, context)),
7171 ),
72- loadingUnit: context.loadingUnits[loadingUnitIndex ],
72+ loadingUnit: context.loadingUnits[loadingUnitIndices.first ],
7373 ),
7474 _ => throw UnimplementedError ('Unknown CallSyntax type' ),
7575 };
@@ -129,7 +129,7 @@ final class CallWithArguments extends CallReference {
129129 }
130130
131131 return WithArgumentsCallSyntax (
132- loadingUnitIndex : context.loadingUnits[loadingUnit! ]! ,
132+ loadingUnitIndices : [ context.loadingUnits[loadingUnit! ]! ] ,
133133 named: namedArgs.isNotEmpty ? namedArgs : null ,
134134 positional: positionalArguments.isEmpty
135135 ? null
@@ -240,7 +240,9 @@ final class CallTearoff extends CallReference {
240240
241241 @override
242242 TearoffCallSyntax _toSyntax (SerializationContext context) =>
243- TearoffCallSyntax (loadingUnitIndex: context.loadingUnits[loadingUnit! ]! );
243+ TearoffCallSyntax (
244+ loadingUnitIndices: [context.loadingUnits[loadingUnit! ]! ],
245+ );
244246
245247 @override
246248 @visibleForTesting
@@ -274,16 +276,16 @@ sealed class InstanceReference extends Reference {
274276 ) => switch (syntax) {
275277 ConstantInstanceSyntax (
276278 : final constantIndex,
277- : final loadingUnitIndex ,
279+ : final loadingUnitIndices ,
278280 ) =>
279281 InstanceConstantReference (
280282 instanceConstant: context.constants[constantIndex] as InstanceConstant ,
281- loadingUnit: context.loadingUnits[loadingUnitIndex ],
283+ loadingUnit: context.loadingUnits[loadingUnitIndices.first ],
282284 ),
283285 CreationInstanceSyntax (
284286 : final named,
285287 : final positional,
286- : final loadingUnitIndex ,
288+ : final loadingUnitIndices ,
287289 ) =>
288290 InstanceCreationReference (
289291 positionalArguments: (positional ?? [])
@@ -295,11 +297,11 @@ sealed class InstanceReference extends Reference {
295297 CallReference ._argumentFromSyntax (index, context),
296298 ),
297299 ),
298- loadingUnit: context.loadingUnits[loadingUnitIndex ],
300+ loadingUnit: context.loadingUnits[loadingUnitIndices.first ],
299301 ),
300- TearoffInstanceSyntax (: final loadingUnitIndex ) =>
302+ TearoffInstanceSyntax (: final loadingUnitIndices ) =>
301303 ConstructorTearoffReference (
302- loadingUnit: context.loadingUnits[loadingUnitIndex ],
304+ loadingUnit: context.loadingUnits[loadingUnitIndices.first ],
303305 ),
304306 _ => throw UnimplementedError ('Unknown InstanceSyntax type' ),
305307 };
@@ -333,7 +335,7 @@ final class InstanceConstantReference extends InstanceReference {
333335 ConstantInstanceSyntax _toSyntax (SerializationContext context) =>
334336 ConstantInstanceSyntax (
335337 constantIndex: context.constants[instanceConstant]! ,
336- loadingUnitIndex : context.loadingUnits[loadingUnit! ]! ,
338+ loadingUnitIndices : [ context.loadingUnits[loadingUnit! ]! ] ,
337339 );
338340
339341 @override
@@ -394,7 +396,7 @@ final class InstanceCreationReference extends InstanceReference {
394396 }
395397
396398 return CreationInstanceSyntax (
397- loadingUnitIndex : context.loadingUnits[loadingUnit! ]! ,
399+ loadingUnitIndices : [ context.loadingUnits[loadingUnit! ]! ] ,
398400 named: namedArgs.isNotEmpty ? namedArgs : null ,
399401 positional: positionalArguments.isEmpty
400402 ? null
@@ -479,7 +481,7 @@ final class ConstructorTearoffReference extends InstanceReference {
479481 @override
480482 TearoffInstanceSyntax _toSyntax (SerializationContext context) =>
481483 TearoffInstanceSyntax (
482- loadingUnitIndex : context.loadingUnits[loadingUnit! ]! ,
484+ loadingUnitIndices : [ context.loadingUnits[loadingUnit! ]! ] ,
483485 );
484486
485487 @override
0 commit comments