[Core Libraries] Eliminate the fork in the core libraries.

Move the nnbd core libraries from sdk_nnbd to sdk, and updates
references in build files and elsewhere accordingly.

Change-Id: I09760fe1e006657aacdfe80f3b22fdf6f7e30a9f
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/151121
Commit-Queue: Leaf Petersen <[email protected]>
Reviewed-by: Bob Nystrom <[email protected]>

Author: leafpetersen

BUILD.gn

@@ -80,24 +80,12 @@ group("runtime_precompiled") {
   ]
 }
 
-if (dont_use_nnbd) {
-  group("create_sdk") {
-    public_deps = [ "sdk:create_sdk" ]
-  }
-} else {
-  group("create_sdk") {
-    public_deps = [ "sdk_nnbd:create_sdk" ]
-  }
+group("create_sdk") {
+  public_deps = [ "sdk:create_sdk" ]
 }
 
-if (dont_use_nnbd) {
-  group("create_platform_sdk") {
-    public_deps = [ "sdk:create_platform_sdk" ]
-  }
-} else {
-  group("create_platform_sdk") {
-    public_deps = [ "sdk_nnbd:create_platform_sdk" ]
-  }
+group("create_platform_sdk") {
+  public_deps = [ "sdk:create_platform_sdk" ]
 }
 
 group("dart2js") {

PRESUBMIT.py

@@ -19,49 +19,6 @@ def is_cpp_file(path):
     return path.endswith('.cc') or path.endswith('.h')
 
 
-def _CheckNnbdSdkSync(input_api, output_api):
-    files = [git_file.LocalPath() for git_file in input_api.AffectedTextFiles()]
-    unsynchronized_files = []
-    for file in files:
-        if file.startswith('sdk/'):
-            nnbd_file = 'sdk_nnbd/' + file[4:]
-            if not nnbd_file in files:
-                unsynchronized_files.append(nnbd_file)
-    if unsynchronized_files:
-        return [
-            output_api.PresubmitPromptWarning(
-                'Changes were made to sdk/ that were not made to sdk_nnbd/\n'
-                'Please update these files as well:\n'
-                '\n'
-                '%s' % ('\n'.join(unsynchronized_files)))
-        ]
-    return []
-
-
-def _CheckSdkDdcRuntimeSync(input_api, output_api):
-    files = [git_file.LocalPath() for git_file in input_api.AffectedTextFiles()]
-    unsynchronized_files = []
-    runtime_lib = 'lib/_internal/js_dev_runtime/private/ddc_runtime/'
-    for nnbd_file in files:
-        if nnbd_file.startswith('sdk_nnbd/' + runtime_lib):
-            file = 'sdk/' + nnbd_file[9:]
-            if not file in files:
-                unsynchronized_files.append(file)
-    if unsynchronized_files:
-        return [
-            output_api.PresubmitPromptWarning(
-                'Changes were made to '
-                'sdk_nnbd/lib/_internal/js_dev_runtime/private/ddc_runtime/ '
-                'that were not made to '
-                'sdk/lib/_internal/js_dev_runtime/private/ddc_runtime/ '
-                'Please copy those changes (without Null Safety syntax) to '
-                'these files as well:\n'
-                '\n'
-                '%s' % ('\n'.join(unsynchronized_files)))
-        ]
-    return []
-
-
 def _CheckNnbdTestSync(input_api, output_api):
     """Make sure that any forked SDK tests are kept in sync. If a CL touches
     a test, the test's counterpart (if it exists at all) should be in the CL
@@ -369,8 +326,6 @@ def test_matrix_filter(affected_file):
 
 def _CommonChecks(input_api, output_api):
     results = []
-    results.extend(_CheckNnbdSdkSync(input_api, output_api))
-    results.extend(_CheckSdkDdcRuntimeSync(input_api, output_api))
     results.extend(_CheckNnbdTestSync(input_api, output_api))
     results.extend(_CheckValidHostsInDEPS(input_api, output_api))
     results.extend(_CheckDartFormat(input_api, output_api))

WATCHLISTS

@@ -28,15 +28,13 @@
       'filepath': (
         '^pkg/compiler|'
         '^sdk/lib/_internal/js_runtime|'
-        '^sdk_nnbd/lib/_internal/js_runtime|'
         '^tests/compiler/dart2js'
       )
     },
     'dartdevc': {
       'filepath': (
         '^pkg/dev_compiler|'
         '^sdk/lib/_internal/js_dev_runtime|'
-        '^sdk_nnbd/lib/_internal/js_dev_runtime|'
         '^tests/compiler/dartdevc_native'
       )
     },

pkg/compiler/test/helpers/memory_compiler.dart

@@ -29,7 +29,7 @@ export 'diagnostic_helper.dart';
 bool isDart2jsNnbd =
     !Platform.environment['DART_CONFIGURATION'].endsWith('Legacy');
 
-String sdkPath = isDart2jsNnbd ? 'sdk_nnbd/lib' : 'sdk/lib';
+String sdkPath = 'sdk/lib';
 
 String sdkLibrariesSpecificationPath = '$sdkPath/libraries.json';
 

pkg/compiler/tool/modular_test_suite.dart

@@ -132,10 +132,7 @@ class SourceToDillStep implements IOModularStep {
         return;
       }
       sources = ['dart:core'];
-      extraArgs = [
-        '--libraries-file',
-        '$rootScheme:///sdk_nnbd/lib/libraries.json'
-      ];
+      extraArgs = ['--libraries-file', '$rootScheme:///sdk/lib/libraries.json'];
       assert(transitiveDependencies.isEmpty);
     } else {
       sources = module.sources.map(sourceToImportUri).toList();
@@ -342,7 +339,7 @@ class RunD8 implements IOModularStep {
     if (_options.verbose) print("\nstep: d8 on $module");
     List<String> d8Args = [
       sdkRoot
-          .resolve('sdk_nnbd/lib/_internal/js_runtime/lib/preambles/d8.js')
+          .resolve('sdk/lib/_internal/js_runtime/lib/preambles/d8.js')
           .toFilePath(),
       root.resolveUri(toUri(module, jsId)).toFilePath(),
     ];

pkg/dev_compiler/lib/src/compiler/shared_command.dart

@@ -339,9 +339,7 @@ Map placeSourceMap(Map sourceMap, String sourceMapPath, String multiRootScheme,
         // TODO(sigmund): extract all source-map normalization outside ddc. This
         // custom logic is BUILD specific and could be shared with other tools
         // like dart2js.
-        var shortPath = uri.path
-            .replaceAll('/sdk/', '/dart-sdk/')
-            .replaceAll('/sdk_nnbd/', '/dart-sdk/');
+        var shortPath = uri.path.replaceAll('/sdk/', '/dart-sdk/');
         var multiRootPath = "${multiRootOutputPath ?? ''}$shortPath";
         multiRootPath = p.url.relative(multiRootPath, from: sourceMapDir);
         return multiRootPath;

pkg/dev_compiler/test/modular_suite.dart

@@ -77,7 +77,7 @@ class SourceToSummaryDillStep implements IOModularStep {
       sources = ['dart:core'];
       extraArgs = [
         '--libraries-file',
-        '$rootScheme:///sdk_nnbd/lib/libraries.json',
+        '$rootScheme:///sdk/lib/libraries.json',
         '--enable-experiment',
         'non-nullable',
       ];
@@ -157,7 +157,7 @@ class DDCStep implements IOModularStep {
       extraArgs = [
         '--compile-sdk',
         '--libraries-file',
-        '$rootScheme:///sdk_nnbd/lib/libraries.json',
+        '$rootScheme:///sdk/lib/libraries.json',
         '--enable-experiment',
         'non-nullable',
       ];

pkg/dev_compiler/test/modular_suite_nnbd.dart

@@ -77,7 +77,7 @@ class SourceToSummaryDillStep implements IOModularStep {
       sources = ['dart:core'];
       extraArgs = [
         '--libraries-file',
-        '$rootScheme:///sdk_nnbd/lib/libraries.json',
+        '$rootScheme:///sdk/lib/libraries.json',
       ];
       assert(transitiveDependencies.isEmpty);
     } else {
@@ -159,7 +159,7 @@ class DDCStep implements IOModularStep {
       extraArgs = [
         '--compile-sdk',
         '--libraries-file',
-        '$rootScheme:///sdk_nnbd/lib/libraries.json',
+        '$rootScheme:///sdk/lib/libraries.json',
       ];
       assert(transitiveDependencies.isEmpty);
     } else {

pkg/dev_compiler/tool/check_nnbd_sdk.dart

@@ -37,7 +37,7 @@ void main(List<String> argv) {
 
   var librariesJson = args['libraries'] != null
       ? resolveInputUri(args['libraries'] as String)
-      : Platform.script.resolve('../../../sdk_nnbd/lib/libraries.json');
+      : Platform.script.resolve('../../../sdk/lib/libraries.json');
   var target = args['target'] as String;
   patch.main([
     '--libraries',
@@ -115,8 +115,7 @@ main() {}
   var result = Process.runSync(dart.toFilePath(), [
     // The NNBD dart binaries / snapshots require this flag to be enabled at
     // VM level.
-    if (analyzerSnapshot.contains('NNBD'))
-      '--enable-experiment=non-nullable',
+    if (analyzerSnapshot.contains('NNBD')) '--enable-experiment=non-nullable',
     analyzerSnapshot,
     '--dart-sdk=${sdkDir}',
     '--format',
@@ -198,7 +197,7 @@ main() {}
 final _parser = ArgParser()
   ..addOption('libraries',
       help: 'Path to the nnbd libraries.json (defaults to the one under '
-          'sdk_nnbd/lib/libraries.json.')
+          'sdk/lib/libraries.json.')
   ..addOption('out',
       help: 'Path to an output folder (defaults to a new tmp folder).')
   ..addOption('target',

pkg/front_end/lib/src/api_prototype/experimental_flags.dart

@@ -9,7 +9,7 @@ part 'experimental_flags_generated.dart';
 /// The set of experiments enabled for SDK and packages.
 ///
 /// This are derived from an `allowed_experiments.json` file whose default is
-/// located in `sdk_nnbd/lib/_internal/allowed_experiments.json`.
+/// located in `sdk/lib/_internal/allowed_experiments.json`.
 class AllowedExperimentalFlags {
   /// The set of experiments that are enabled for all SDK libraries other than
   /// for those which are specified in [sdkLibraryExperiments].