-
Notifications
You must be signed in to change notification settings - Fork 5.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Compute substitution map on kernel objects instead of builders
Fixes dart-lang/sdk#34856 Change-Id: I150a390ea19e684e7951c1354c09fd40845e4328 Reviewed-on: https://dart-review.googlesource.com/c/81006 Reviewed-by: Kevin Millikin <kmillikin@google.com> Commit-Queue: Peter von der Ahé <ahe@google.com>
- Loading branch information
1 parent
704a435
commit 2c6eabd
Showing
5 changed files
with
134 additions
and
103 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,108 @@ | ||
| // Copyright (c) 2018, the Dart project authors. Please see the AUTHORS file | ||
| // for details. All rights reserved. Use of this source code is governed by a | ||
| // BSD-style license that can be found in the LICENSE file. | ||
|
|
||
| import 'dart:io' show File; | ||
|
|
||
| import 'package:async_helper/async_helper.dart' show asyncTest; | ||
|
|
||
| import 'package:front_end/src/api_prototype/compiler_options.dart' | ||
| show CompilerOptions; | ||
|
|
||
| import 'package:front_end/src/api_prototype/kernel_generator.dart' | ||
| show kernelForComponent; | ||
|
|
||
| import 'package:front_end/src/api_prototype/memory_file_system.dart' | ||
| show MemoryFileSystem; | ||
|
|
||
| import 'package:front_end/src/base/processed_options.dart' | ||
| show ProcessedOptions; | ||
|
|
||
| import 'package:front_end/src/compute_platform_binaries_location.dart' | ||
| show computePlatformBinariesLocation; | ||
|
|
||
| import 'package:front_end/src/fasta/compiler_context.dart' show CompilerContext; | ||
|
|
||
| import 'package:front_end/src/fasta/kernel/utils.dart' show serializeComponent; | ||
|
|
||
| import 'package:front_end/src/fasta/kernel/verifier.dart' show verifyComponent; | ||
|
|
||
| import 'package:kernel/ast.dart' show Component; | ||
|
|
||
| const Map<String, String> files = const <String, String>{ | ||
| "repro.dart": """ | ||
| import 'lib.dart'; | ||
| abstract class M<M_K, M_V> implements Map<M_K, Set<M_V>> {} | ||
| abstract class C<C_K, C_V> extends UnmodifiableMapView<C_K, Set<C_V>> | ||
| with M<C_K, C_V> { | ||
| C._() : super(null); | ||
| } | ||
| """, | ||
| "lib.dart": """abstract class MapView<K, V> { | ||
| const MapView(Map<K, V> map); | ||
| } | ||
| abstract class _UnmodifiableMapMixin<K, V> {} | ||
| abstract class UnmodifiableMapView<K, V> extends MapView<K, V> | ||
| with _UnmodifiableMapMixin<K, V> { | ||
| UnmodifiableMapView(Map<K, V> map) : super(map); | ||
| }""", | ||
| }; | ||
|
|
||
| Future<void> test() async { | ||
| final String platformBaseName = "vm_platform_strong.dill"; | ||
| final Uri base = Uri.parse("org-dartlang-test:///"); | ||
| final Uri platformDill = base.resolve(platformBaseName); | ||
| final List<int> platformDillBytes = await new File.fromUri( | ||
| computePlatformBinariesLocation(forceBuildDir: true) | ||
| .resolve(platformBaseName)) | ||
| .readAsBytes(); | ||
| MemoryFileSystem fs = new MemoryFileSystem(base); | ||
| fs.entityForUri(platformDill).writeAsBytesSync(platformDillBytes); | ||
| fs | ||
| .entityForUri(base.resolve("lib.dart")) | ||
| .writeAsStringSync(files["lib.dart"]); | ||
| CompilerOptions options = new CompilerOptions() | ||
| ..fileSystem = fs | ||
| ..sdkSummary = platformDill; | ||
|
|
||
| Component component = | ||
| await kernelForComponent(<Uri>[base.resolve("lib.dart")], options); | ||
|
|
||
| fs = new MemoryFileSystem(base); | ||
| fs.entityForUri(platformDill).writeAsBytesSync(platformDillBytes); | ||
| fs | ||
| .entityForUri(base.resolve("lib.dart.dill")) | ||
| .writeAsBytesSync(serializeComponent(component)); | ||
| fs | ||
| .entityForUri(base.resolve("repro.dart")) | ||
| .writeAsStringSync(files["repro.dart"]); | ||
|
|
||
| options = new CompilerOptions() | ||
| ..fileSystem = fs | ||
| ..linkedDependencies = <Uri>[base.resolve("lib.dart.dill")] | ||
| ..sdkSummary = platformDill; | ||
|
|
||
| List<Uri> inputs = <Uri>[base.resolve("repro.dart")]; | ||
|
|
||
| component = await kernelForComponent(inputs, options); | ||
|
|
||
| List<Object> errors = await CompilerContext.runWithOptions( | ||
| new ProcessedOptions(options: options, inputs: inputs), | ||
| (_) => new Future<List<Object>>.value( | ||
| verifyComponent(component, skipPlatform: true))); | ||
|
|
||
| serializeComponent(component); | ||
|
|
||
| if (errors.isNotEmpty) { | ||
| throw "Verification failed"; | ||
| } | ||
| } | ||
|
|
||
| main() { | ||
| asyncTest(test); | ||
| } |