Lazily format LanguageError messages (fix issue 15069).

runtime/vm/flow_graph.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.h"
 
 #include "vm/bit_vector.h"
 #include "vm/flow_graph_builder.h"
 #include "vm/intermediate_language.h"
 #include "vm/longjump.h"
@@ skipping 1050 matching lines @@
       }
     }
   }
 
   return loop_headers;
 }
 
 
 void FlowGraph::Bailout(const char* reason) const {
   const char* kFormat = "FlowGraph 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()),

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

Now that we report script and position, do we really need to get the function
name into the error message as well?

In any case you could use "LanguageError::NewFormatted(..., kFormat,
function_name, reason)" here, to avoid the duplication of the formatting code.

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

Done.

+                         function.token_pos(),
+                         LanguageError::kError,
+                         String::Handle(String::New(chars))));
   Isolate::Current()->long_jump_base()->Jump(1, error);
 }
 
 
 intptr_t FlowGraph::InstructionCount() const {
   intptr_t size = 0;
   // Iterate each block, skipping the graph entry.
   for (intptr_t i = 1; i < preorder_.length(); ++i) {
     for (ForwardInstructionIterator it(preorder_[i]);
          !it.Done();
@@ skipping 108 matching lines @@
 }
 
 
 bool BlockEffects::IsSideEffectFreePath(BlockEntryInstr* from,
                                         BlockEntryInstr* to) const {
   return available_at_[to->postorder_number()]->Contains(
       from->postorder_number());
 }
 
 }  // namespace dart