VM: [Kernel] Relax assertion in Script::GetTokenLocation().

runtime/vm/kernel_reader.cc

 // Copyright (c) 2016, 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.
 
 #include "vm/kernel_reader.h"
 
 #include <string.h>
 
 #include "vm/dart_api_impl.h"
 #include "vm/longjump.h"
@@ skipping 142 matching lines @@
   // The bootstrapper will take care of creating the native wrapper classes, but
   // we will add the synthetic constructors to them here.
   if (library.name() ==
       Symbols::Symbol(Symbols::kDartNativeWrappersLibNameId).raw()) {
     ASSERT(library.LoadInProgress());
   } else {
     library.SetLoadInProgress();
   }
   // Setup toplevel class (which contains library fields/procedures).
 
   // TODO(27590): Figure out why we need this script stuff here.

[kustermann, 2016/11/18 09:45:51]

We need a valid [Script] for example because the [Script] object contains e.g.
cached constants

Maybe remove this comment?

[Vyacheslav Egorov (Google), 2016/11/18 14:49:46]

Done.

-  Script& script = Script::Handle(
-      Z,
-      Script::New(H.DartString(""), H.DartString(""), RawScript::kScriptTag));
+  Script& script =
+      Script::Handle(Z, Script::New(Symbols::KernelScriptUri(),
+                                    H.DartString(""), RawScript::kScriptTag));

[rmacnak, 2016/11/17 20:13:31]

There's a Symbols::Empty() btw.

[Vyacheslav Egorov (Google), 2016/11/18 14:49:46]

Done.

   script.SetLocationOffset(0, 0);
   script.Tokenize(H.DartString("nop() {}"));
   dart::Class& toplevel_class = dart::Class::Handle(
       Z, dart::Class::New(library, Symbols::TopLevel(), script,
                           TokenPosition::kNoSource));
   toplevel_class.set_is_cycle_free();
   library.set_toplevel_class(toplevel_class);
   if (bootstrapping_) {
     GrowableObjectArray::Handle(Z, I->object_store()->pending_classes())
         .Add(toplevel_class, Heap::kOld);
@@ skipping 443 matching lines @@
       // The class needs to have a script because all the functions in the class
       // will inherit it.  The predicate Function::IsOptimizable uses the
       // absence of a script to detect test functions that should not be
       // optimized.  Use a dummy script.
       //
       // TODO(27590): We shouldn't need a dummy script per class.  At the
       // least we could have a singleton.  At best, we'd change IsOptimizable to
       // detect test functions some other way (like simply not setting the
       // optimizable bit on those functions in the first place).
       TokenPosition pos(0);
-      Script& script =
-          Script::Handle(Z, Script::New(H.DartString(""), H.DartString(""),
-                                        RawScript::kScriptTag));
+      Script& script = Script::Handle(
+          Z, Script::New(Symbols::KernelScriptUri(), H.DartString(""),
+                         RawScript::kScriptTag));
       handle =
           &dart::Class::Handle(Z, dart::Class::New(library, name, script, pos));
       library.AddClass(*handle);
     } else if (handle->script() == Script::null()) {
       // When bootstrapping we can encounter classes that do not yet have a
       // dummy script.
       TokenPosition pos(0);
-      Script& script =
-          Script::Handle(Z, Script::New(H.DartString(""), H.DartString(""),
-                                        RawScript::kScriptTag));
+      Script& script = Script::Handle(
+          Z, Script::New(Symbols::KernelScriptUri(), H.DartString(""),
+                         RawScript::kScriptTag));
       handle->set_script(script);
     }
     // Insert the class in the cache before calling ReadPreliminaryClass so
     // we do not risk allocating the class again by calling LookupClass
     // recursively from ReadPreliminaryClass for the same class.
     classes_.Insert(klass, handle);
     if (!handle->is_type_finalized()) {
       ReadPreliminaryClass(handle, klass);
     }
   }
@@ skipping 15 matching lines @@
   } else {
     ASSERT(0 <= kind && kind <= Procedure::kFactory);
     return static_cast<RawFunction::Kind>(lookuptable[kind]);
   }
 }
 
 
 }  // namespace kernel
 }  // namespace dart
 #endif  // !defined(DART_PRECOMPILED_RUNTIME)