From f44b7b56623dcaa8e828fb5e30f68c44cfbebfdd Mon Sep 17 00:00:00 2001
From: Jonah Williams <jonahwilliams@google.com>
Date: Fri, 14 Jun 2019 20:50:22 -0700
Subject: [PATCH] Catch errors during production of kernel dill (#9248)

---
 web_sdk/flutter_kernel_sdk.dart | 34 ++++++++++++++++++++++++++-------
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/web_sdk/flutter_kernel_sdk.dart b/web_sdk/flutter_kernel_sdk.dart
index 512768f938d..ba2f15ee175 100644
--- a/web_sdk/flutter_kernel_sdk.dart
+++ b/web_sdk/flutter_kernel_sdk.dart
@@ -2,16 +2,26 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+// These packages exist in the third_party/dart .package, but not locally
+// which confuses the analyzer.
+// ignore_for_file: uri_does_not_exist
 import 'dart:async';
 import 'dart:convert' show json;
 import 'dart:io';
 import 'package:args/args.dart' show ArgParser;
-import 'package:dev_compiler/src/compiler/module_builder.dart'; // ignore: uri_does_not_exist
-import 'package:dev_compiler/src/compiler/shared_command.dart' show SharedCompilerOptions; // ignore: uri_does_not_exist
-import 'package:dev_compiler/src/kernel/target.dart'; // ignore: uri_does_not_exist
-import 'package:dev_compiler/src/kernel/command.dart'; // ignore: uri_does_not_exist
-import 'package:dev_compiler/src/kernel/compiler.dart'; // ignore: uri_does_not_exist
-import 'package:front_end/src/api_unstable/ddc.dart' show CompilerOptions, kernelForComponent;
+import 'package:dev_compiler/src/compiler/module_builder.dart';
+import 'package:dev_compiler/src/compiler/shared_command.dart'
+    show SharedCompilerOptions;
+import 'package:dev_compiler/src/kernel/target.dart';
+import 'package:dev_compiler/src/kernel/command.dart';
+import 'package:dev_compiler/src/kernel/compiler.dart';
+import 'package:front_end/src/api_unstable/ddc.dart'
+    show
+        CompilerOptions,
+        kernelForComponent,
+        DiagnosticMessage,
+        printDiagnosticMessage,
+        Severity;
 import 'package:kernel/kernel.dart';
 import 'package:kernel/target/targets.dart';
 import 'package:path/path.dart' as path;
@@ -36,14 +46,24 @@ Future main(List<String> args) async {
   }
 
   var librarySpecPath = parserOptions['libraries'] as String;
+  var packagesPath = path.join(ddcPath, '../third_party/dart/.packages');
+  void onDiagnostic(DiagnosticMessage message) {
+    printDiagnosticMessage(message, print);
+    if (message.severity == Severity.error ||
+        message.severity == Severity.internalProblem) {
+      exitCode = 1;
+    }
+  }
 
   var target = FlutterDevCompilerTarget();
   var options = CompilerOptions()
     ..compileSdk = true
     // TODO(sigmund): remove this unnecessary option when possible.
     ..sdkRoot = Uri.base
+    ..packagesFileUri = Uri.base.resolveUri(Uri.file(packagesPath))
     ..librariesSpecificationUri = Uri.base.resolveUri(Uri.file(librarySpecPath))
-    ..target = target;
+    ..target = target
+    ..onDiagnostic = onDiagnostic;
 
   var inputs = target.extraRequiredLibraries.map(Uri.parse).toList();
   var component = await kernelForComponent(inputs, options);