Cleanup of error and warning reporting.

runtime/vm/code_generator.cc

 // Copyright (c) 2013, 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/code_generator.h"
 
 #include "vm/assembler.h"
 #include "vm/ast.h"
 #include "vm/bigint_operations.h"
 #include "vm/code_patcher.h"
 #include "vm/compiler.h"
 #include "vm/dart_api_impl.h"
 #include "vm/dart_entry.h"
 #include "vm/debugger.h"
 #include "vm/deopt_instructions.h"
 #include "vm/exceptions.h"
 #include "vm/intermediate_language.h"
 #include "vm/object_store.h"
 #include "vm/message.h"
 #include "vm/message_handler.h"
 #include "vm/parser.h"
+#include "vm/report.h"
 #include "vm/resolver.h"
 #include "vm/runtime_entry.h"
 #include "vm/stack_frame.h"
 #include "vm/symbols.h"
 #include "vm/verifier.h"
 
 namespace dart {
 
 DEFINE_FLAG(bool, deoptimize_alot, false,
     "Deoptimizes all live frames when we are about to return to Dart code from"
@@ skipping 535 matching lines @@
   const Instance& src_value = Instance::CheckedHandle(arguments.ArgAt(0));
   const String& dst_name = String::CheckedHandle(arguments.ArgAt(1));
   const AbstractType& dst_type =
       AbstractType::CheckedHandle(arguments.ArgAt(2));
   const AbstractType& src_type = AbstractType::Handle(src_value.GetType());
   const String& src_type_name = String::Handle(src_type.UserVisibleName());
 
   String& dst_type_name = String::Handle();
   LanguageError& error = LanguageError::Handle(dst_type.error());
   ASSERT(!error.IsNull());
-  if (error.kind() == LanguageError::kMalformedType) {
+  if (error.kind() == Report::kMalformedType) {
     dst_type_name = Symbols::Malformed().raw();
   } else {
-    ASSERT(error.kind() == LanguageError::kMalboundedType);
+    ASSERT(error.kind() == Report::kMalboundedType);
     dst_type_name = Symbols::Malbounded().raw();
   }
   const String& error_message = String::ZoneHandle(
       Symbols::New(error.ToErrorCString()));
   Exceptions::CreateAndThrowTypeError(
       location, src_type_name, dst_type_name, dst_name, error_message);
   UNREACHABLE();
 }
 
 
@@ skipping 208 matching lines @@
           caller_frame->pc(),
           Class::Handle(receiver.clazz()).ToCString(),
           receiver.GetClassId(),
           target_function.ToCString());
     }
   }
   return target_function.raw();
 }
 
 
-static void JSWarning(const ICData& ic_data, const char* msg) {
-  DartFrameIterator iterator;
-  StackFrame* caller_frame = iterator.NextFrame();
-  ASSERT(caller_frame != NULL);
-  // Report warning only if not already reported at this location.
-  if (!ic_data.IssuedJSWarning()) {
-    ic_data.SetIssuedJSWarning();
-    Exceptions::JSWarning(caller_frame, "%s", msg);
-  }
-}
-
-
 // Handles inline cache misses by updating the IC data array of the call site.
 //   Arg0: Receiver object.
 //   Arg1: IC data object.
 //   Returns: target function with compiled code or null.
 // Modifies the instance call to hold the updated IC data array.
 DEFINE_RUNTIME_ENTRY(InlineCacheMissHandlerOneArg, 2) {
   const Instance& receiver = Instance::CheckedHandle(arguments.ArgAt(0));
   const ICData& ic_data = ICData::CheckedHandle(arguments.ArgAt(1));
   GrowableArray<const Instance*> args(1);
   args.Add(&receiver);
   if (FLAG_warn_on_javascript_compatibility) {
     if (receiver.IsDouble() &&
         String::Handle(ic_data.target_name()).Equals(Symbols::toString())) {
       const double value = Double::Cast(receiver).value();
       if (floor(value) == value) {
-        JSWarning(ic_data,
-                  "string representation of an integral value of type "
-                  "'double' has no decimal mark and no fractional part");
+        Report::JSWarningFromIC(ic_data,
+                                "string representation of an integral value "
+                                "of type 'double' has no decimal mark and "
+                                "no fractional part");
       }
     }
   }
   const Function& result =
       Function::Handle(InlineCacheMissHandler(args, ic_data));
   arguments.SetReturn(result);
 }
 
 
 // Handles inline cache misses by updating the IC data array of the call site.
@@ skipping 688 matching lines @@
 // of the given value.
 //   Arg0: Field object;
 //   Arg1: Value that is being stored.
 DEFINE_RUNTIME_ENTRY(UpdateFieldCid, 2) {
   const Field& field = Field::CheckedHandle(arguments.ArgAt(0));
   const Object& value = Object::Handle(arguments.ArgAt(1));
   field.RecordStore(value);
 }
 
 }  // namespace dart