languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-10-14 11:03:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Set DDK to run on Dart-2 VM

Browse source 
Change-Id: I0c0558996c5d6d6c739ded5e5c8b2554a4cd7b04
Reviewed-on: https://dart-review.googlesource.com/53320
Reviewed-by: Jenny Messerly <jmesserly@google.com>
Commit-Queue: Vijay Menon <vsm@google.com>
This commit is contained in:
Vijay Menon 2018-05-24 21:51:25 +00:00 committed by commit-bot@chromium.org
parent 379232a097
commit 30ad3f66ce
8 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkg/build_integration/lib/file_system/multi_root.dart
View file

@ -76,7 +76,7 @@ class MultiRootFileSystemEntity implements FileSystemEntity {
Future<String> readAsString() async => (await delegate).readAsString();
}
_normalize(root) {
Uri _normalize(root) {
Uri uri = root;
return uri.path.endsWith('/') ? uri : uri.replace(path: '${uri.path}/');
}

4
pkg/dev_compiler/lib/src/kernel/compiler.dart
View file

@ -1211,7 +1211,7 @@ class ProgramCompiler extends Object
if (!emitMetadata && member.isStatic) continue;
var name = member.name.name;
var reifiedType = _getMemberRuntimeType(member, c);
var reifiedType = _getMemberRuntimeType(member, c) as FunctionType;
// Don't add redundant signatures for inherited methods whose signature
// did not change. If we are not overriding, or if the thing we are
@ -1310,7 +1310,7 @@ class ProgramCompiler extends Object
field.isFinal ? 'finalFieldType(#)' : 'fieldType(#)', [args]);
}
FunctionType _getMemberRuntimeType(Member member, Class fromClass) {
DartType _getMemberRuntimeType(Member member, Class fromClass) {
var f = member.function;
if (f == null) {
return (member as Field).type;

2
pkg/dev_compiler/tool/ddb
View file

@ -59,7 +59,7 @@ void main(List<String> args) {
ProcessResult runDdc(String command, List<String> args) {
if (debug) {
// Use unbuilt script. This only works from a source checkout.
args.insertAll(0, ['--preview-dart-2', '-c', path.join(ddcPath, 'bin', '${command}.dart')]);
args.insertAll(0, ['--preview-dart-2', '--enable-asserts', path.join(ddcPath, 'bin', '${command}.dart')]);
command = dartBinary;
} else {
// Use built snapshot.

2
sdk/bin/dartdevk
View file

@ -43,4 +43,4 @@ DART_ROOT="$(cd "${SDK_DIR}/.." ; pwd -P)"
DEV_COMPILER="$DART_ROOT/pkg/dev_compiler/bin/dartdevk.dart"
exec "$DART" "--packages=$DART_ROOT/.packages" "${EXTRA_VM_OPTIONS[@]}" "$DEV_COMPILER" "$@"
exec "$DART" "--preview-dart-2" "--packages=$DART_ROOT/.packages" "${EXTRA_VM_OPTIONS[@]}" "$DEV_COMPILER" "$@"

2
sdk/bin/dartdevk.bat
View file

@ -34,7 +34,7 @@ if %DART_ROOT:~-1%==\ set DART_ROOT=%DART_ROOT:~0,-1%
set DEV_COMPILER=%DART_ROOT%\pkg\dev_compiler\bin\dartdevk.dart
"%DART%" "--packages=%DART_ROOT%\.packages" %EXTRA_VM_OPTIONS% "%DEV_COMPILER%" %*
"%DART%" "--preview-dart-2" "--packages=%DART_ROOT%\.packages" %EXTRA_VM_OPTIONS% "%DEV_COMPILER%" %*
endlocal

2
sdk/bin/dartdevk_sdk
View file

@ -26,4 +26,4 @@ SNAPSHOT="$BIN_DIR/snapshots/dartdevk.dart.snapshot"
# We are running the snapshot in the built SDK.
DART="$BIN_DIR/dart"
exec "$DART" "$SNAPSHOT" "--packages=$SDK_DIR/../../../.packages" "$@"
exec "$DART" "--preview-dart-2" "$SNAPSHOT" "--packages=$SDK_DIR/../../../.packages" "$@"

2
sdk/bin/dartdevk_sdk.bat
View file

@ -20,7 +20,7 @@ for %%i in ("%BIN_DIR%\..\") do set SDK_DIR=%%~fi
rem Remove trailing backslash if there is one
if %SDK_DIR:~-1%==\ set SDK_DIR=%SDK_DIR:~0,-1%
"%DART%" "%SNAPSHOT%" "--packages=%SDK_DIR%\..\..\..\.packages" %*
"%DART%" "--preview-dart-2" "%SNAPSHOT%" "--packages=%SDK_DIR%\..\..\..\.packages" %*
endlocal

2
utils/dartdevc/BUILD.gn
View file

@ -35,6 +35,8 @@ application_snapshot("dartdevc") {
}
application_snapshot("dartdevk") {
dart_version = 2
main_dart = "../../pkg/dev_compiler/bin/dartdevk.dart"
training_args = [