Lazily format LanguageError messages (fix issue 15069).

runtime/vm/flow_graph_builder.cc

 // Copyright (c) 2012, 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/flow_graph_builder.h"
 
 #include "lib/invocation_mirror.h"
 #include "vm/ast_printer.h"
 #include "vm/bit_vector.h"
 #include "vm/class_finalizer.h"
@@ skipping 3864 matching lines @@
   ASSERT(osr_id_ != Isolate::kNoDeoptId);
   BitVector* block_marks = new BitVector(last_used_block_id_ + 1);
   bool found = graph_entry_->PruneUnreachable(this, graph_entry_, NULL, osr_id_,
                                               block_marks);
   ASSERT(found);
 }
 
 
 void FlowGraphBuilder::Bailout(const char* reason) {
   const char* kFormat = "FlowGraphBuilder Bailout: %s %s";
-  const char* function_name = parsed_function_->function().ToCString();
+  const Function& function = parsed_function_->function();
+  const char* function_name = function.ToCString();
   intptr_t len = OS::SNPrint(NULL, 0, kFormat, function_name, reason) + 1;
   char* chars = Isolate::Current()->current_zone()->Alloc<char>(len);
   OS::SNPrint(chars, len, kFormat, function_name, reason);
   const Error& error = Error::Handle(
-      LanguageError::New(String::Handle(String::New(chars))));
+      LanguageError::New(Error::Handle(),  // No previous error.
+                         Script::Handle(function.script()),
+                         function.token_pos(),
+                         LanguageError::kError,
+                         String::Handle(String::New(chars))));

[Ivan Posva, 2013/11/15 04:42:13]

ditto.

[regis, 2013/11/15 18:27:38]

Done.

   Isolate::Current()->long_jump_base()->Jump(1, error);
 }
 
 
 }  // namespace dart