[vm] Plumb enable_asserts to CFE through VM and kernel_front_end

mraleph · commit-bot@chromium.org · commit cb93b8d813b4 · 2019-07-11T11:32:13.000Z
When constant-update-2018 is enable it would be CFE's responsibility to report compile time errors when assert in a constant fails. Change-Id: Icfa5e9c1756439cdd46bdbaf5c7fb8124c24becf Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/108723 Reviewed-by: Samir Jindel <sjindel@google.com> Commit-Queue: Vyacheslav Egorov <vegorov@google.com> Auto-Submit: Vyacheslav Egorov <vegorov@google.com>
diff --git a/pkg/vm/bin/kernel_service.dart b/pkg/vm/bin/kernel_service.dart
@@ -70,17 +70,19 @@ bool allowDartInternalImport = false;
 abstract class Compiler {
   final FileSystem fileSystem;
   final Uri platformKernelPath;
-  bool suppressWarnings;
-  List<String> experimentalFlags;
-  bool bytecode;
-  String packageConfig;
+  final bool suppressWarnings;
+  final bool enableAsserts;
+  final List<String> experimentalFlags;
+  final bool bytecode;
+  final String packageConfig;
 
   final List<String> errors = new List<String>();
 
   CompilerOptions options;
 
   Compiler(this.fileSystem, this.platformKernelPath,
       {this.suppressWarnings: false,
+      this.enableAsserts: false,
       this.experimentalFlags: null,
       this.bytecode: false,
       this.packageConfig: null}) {
@@ -116,6 +118,7 @@ abstract class Compiler {
       ..experimentalFlags =
           parseExperimentalFlags(expFlags, (msg) => errors.add(msg))
       ..environmentDefines = new EnvironmentMap()
+      ..enableAsserts = enableAsserts
       ..onDiagnostic = (DiagnosticMessage message) {
         bool printMessage;
         switch (message.severity) {
@@ -148,11 +151,10 @@ abstract class Compiler {
         await runWithFrontEndCompilerContext(script, options, component, () {
           // TODO(alexmarkov): disable source positions, local variables info,
           //  debugger stops and source files in VM PRODUCT mode.
-          // TODO(alexmarkov): disable asserts if they are not enabled in VM.
           // TODO(rmacnak): disable annotations if mirrors are not enabled.
           generateBytecode(component,
               options: new BytecodeOptions(
-                  enableAsserts: true,
+                  enableAsserts: enableAsserts,
                   environmentDefines: options.environmentDefines,
                   emitSourcePositions: true,
                   emitLocalVarInfo: true,
@@ -210,11 +212,13 @@ class IncrementalCompilerWrapper extends Compiler {
 
   IncrementalCompilerWrapper(FileSystem fileSystem, Uri platformKernelPath,
       {bool suppressWarnings: false,
+      bool enableAsserts: false,
       List<String> experimentalFlags: null,
       bool bytecode: false,
       String packageConfig: null})
       : super(fileSystem, platformKernelPath,
             suppressWarnings: suppressWarnings,
+            enableAsserts: enableAsserts,
             experimentalFlags: experimentalFlags,
             bytecode: bytecode,
             packageConfig: packageConfig);
@@ -235,6 +239,7 @@ class IncrementalCompilerWrapper extends Compiler {
     IncrementalCompilerWrapper clone = IncrementalCompilerWrapper(
         fileSystem, platformKernelPath,
         suppressWarnings: suppressWarnings,
+        enableAsserts: enableAsserts,
         experimentalFlags: experimentalFlags,
         bytecode: bytecode,
         packageConfig: packageConfig);
@@ -263,11 +268,13 @@ class SingleShotCompilerWrapper extends Compiler {
   SingleShotCompilerWrapper(FileSystem fileSystem, Uri platformKernelPath,
       {this.requireMain: false,
       bool suppressWarnings: false,
+      bool enableAsserts: false,
       List<String> experimentalFlags: null,
       bool bytecode: false,
       String packageConfig: null})
       : super(fileSystem, platformKernelPath,
             suppressWarnings: suppressWarnings,
+            enableAsserts: enableAsserts,
             experimentalFlags: experimentalFlags,
             bytecode: bytecode,
             packageConfig: packageConfig);
@@ -292,6 +299,7 @@ IncrementalCompilerWrapper lookupIncrementalCompiler(int isolateId) {
 Future<Compiler> lookupOrBuildNewIncrementalCompiler(int isolateId,
     List sourceFiles, Uri platformKernelPath, List<int> platformKernel,
     {bool suppressWarnings: false,
+    bool enableAsserts: false,
     List<String> experimentalFlags: null,
     bool bytecode: false,
     String packageConfig: null,
@@ -321,6 +329,7 @@ Future<Compiler> lookupOrBuildNewIncrementalCompiler(int isolateId,
       // isolate was shut down. Message should be handled here in this script.
       compiler = new IncrementalCompilerWrapper(fileSystem, platformKernelPath,
           suppressWarnings: suppressWarnings,
+          enableAsserts: enableAsserts,
           experimentalFlags: experimentalFlags,
           bytecode: bytecode,
           packageConfig: packageConfig);
@@ -499,12 +508,13 @@ Future _processLoadRequest(request) async {
   final int isolateId = request[6];
   final List sourceFiles = request[7];
   final bool suppressWarnings = request[8];
+  final bool enableAsserts = request[9];
   final List<String> experimentalFlags =
-      request[9] != null ? request[9].cast<String>() : null;
-  final bool bytecode = request[10];
-  final String packageConfig = request[11];
-  final String multirootFilepaths = request[12];
-  final String multirootScheme = request[13];
+      request[10] != null ? request[10].cast<String>() : null;
+  final bool bytecode = request[11];
+  final String packageConfig = request[12];
+  final String multirootFilepaths = request[13];
+  final String multirootScheme = request[14];
 
   if (bytecode) {
     // Bytecode generator is hooked into kernel service after kernel component
@@ -568,6 +578,7 @@ Future _processLoadRequest(request) async {
     compiler = await lookupOrBuildNewIncrementalCompiler(
         isolateId, sourceFiles, platformKernelPath, platformKernel,
         suppressWarnings: suppressWarnings,
+        enableAsserts: enableAsserts,
         experimentalFlags: experimentalFlags,
         bytecode: bytecode,
         packageConfig: packageConfig,
@@ -579,6 +590,7 @@ Future _processLoadRequest(request) async {
     compiler = new SingleShotCompilerWrapper(fileSystem, platformKernelPath,
         requireMain: false,
         suppressWarnings: suppressWarnings,
+        enableAsserts: enableAsserts,
         experimentalFlags: experimentalFlags,
         bytecode: bytecode,
         packageConfig: packageConfig);
@@ -704,6 +716,7 @@ train(String scriptUri, String platformKernelPath) {
     1 /* isolateId chosen randomly */,
     [] /* source files */,
     false /* suppress warnings */,
+    false /* enable asserts */,
     null /* experimental_flags */,
     false /* generate bytecode */,
     null /* package_config */,
diff --git a/pkg/vm/lib/kernel_front_end.dart b/pkg/vm/lib/kernel_front_end.dart
@@ -215,6 +215,7 @@ Future<int> runCompiler(ArgResults options, String usage) async {
     ..linkedDependencies = linkedDependencies
     ..packagesFileUri = packagesUri
     ..experimentalFlags = parseExperimentalFlags(experimentalFlags, print)
+    ..enableAsserts = enableAsserts
     ..onDiagnostic = (DiagnosticMessage m) {
       errorDetector(m);
     }
diff --git a/runtime/vm/kernel_isolate.cc b/runtime/vm/kernel_isolate.cc
@@ -485,23 +485,6 @@ class KernelCompilationRequest : public ValueObject {
     isolate_id.value.as_int64 =
         isolate != NULL ? static_cast<int64_t>(isolate->main_port()) : 0;
 
-    Dart_CObject suppress_warnings;
-    suppress_warnings.type = Dart_CObject_kBool;
-    suppress_warnings.value.as_bool = FLAG_suppress_fe_warnings;
-
-    intptr_t num_experimental_flags = experimental_flags->length();
-    Dart_CObject** experimental_flags_array =
-        new Dart_CObject*[num_experimental_flags];
-    for (intptr_t i = 0; i < num_experimental_flags; ++i) {
-      experimental_flags_array[i] = new Dart_CObject;
-      experimental_flags_array[i]->type = Dart_CObject_kString;
-      experimental_flags_array[i]->value.as_string = (*experimental_flags)[i];
-    }
-    Dart_CObject experimental_flags_object;
-    experimental_flags_object.type = Dart_CObject_kArray;
-    experimental_flags_object.value.as_array.values = experimental_flags_array;
-    experimental_flags_object.value.as_array.length = num_experimental_flags;
-
     Dart_CObject message;
     message.type = Dart_CObject_kArray;
     Dart_CObject* message_arr[] = {&tag,
@@ -512,9 +495,7 @@ class KernelCompilationRequest : public ValueObject {
                                    &type_definitions_object,
                                    &library_uri_object,
                                    &class_object,
-                                   &is_static_object,
-                                   &suppress_warnings,
-                                   &experimental_flags_object};
+                                   &is_static_object};
     message.value.as_array.values = message_arr;
     message.value.as_array.length = ARRAY_SIZE(message_arr);
 
@@ -542,11 +523,6 @@ class KernelCompilationRequest : public ValueObject {
     }
     delete[] type_definitions_array;
 
-    for (intptr_t i = 0; i < num_experimental_flags; ++i) {
-      delete experimental_flags_array[i];
-    }
-    delete[] experimental_flags_array;
-
     return result_;
   }
 
@@ -563,8 +539,7 @@ class KernelCompilationRequest : public ValueObject {
       const char* multiroot_filepaths,
       const char* multiroot_scheme,
       const MallocGrowableArray<char*>* experimental_flags) {
-    // Build the [null, send_port, script_uri, platform_kernel,
-    // incremental_compile, isolate_id, [files]] message for the Kernel isolate.
+    // Build the message for the Kernel isolate.
     // tag is used to specify which operation the frontend should perform.
     Dart_CObject tag;
     tag.type = Dart_CObject_kInt32;
@@ -632,6 +607,11 @@ class KernelCompilationRequest : public ValueObject {
     suppress_warnings.type = Dart_CObject_kBool;
     suppress_warnings.value.as_bool = FLAG_suppress_fe_warnings;
 
+    Dart_CObject enable_asserts;
+    enable_asserts.type = Dart_CObject_kBool;
+    enable_asserts.value.as_bool =
+        isolate != NULL ? isolate->asserts() : FLAG_enable_asserts;
+
     intptr_t num_experimental_flags = experimental_flags->length();
     Dart_CObject** experimental_flags_array =
         new Dart_CObject*[num_experimental_flags];
@@ -700,6 +680,7 @@ class KernelCompilationRequest : public ValueObject {
                                    &isolate_id,
                                    &files,
                                    &suppress_warnings,
+                                   &enable_asserts,
                                    &experimental_flags_object,
                                    &bytecode,
                                    &package_config_uri,

Original file line number	Diff line number	Diff line change
`@@ -215,6 +215,7 @@ Future<int> runCompiler(ArgResults options, String usage) async {`
`215`	`215`	`..linkedDependencies = linkedDependencies`
`216`	`216`	`..packagesFileUri = packagesUri`
`217`	`217`	`..experimentalFlags = parseExperimentalFlags(experimentalFlags, print)`
	`218`	`+ ..enableAsserts = enableAsserts`
`218`	`219`	`..onDiagnostic = (DiagnosticMessage m) {`
`219`	`220`	`errorDetector(m);`
`220`	`221`	`}`