Cleanup of error and warning reporting.

runtime/lib/object.cc

 // Copyright (c) 2011, 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/bootstrap_natives.h"
 
 #include "lib/invocation_mirror.h"
 #include "vm/code_patcher.h"
 #include "vm/exceptions.h"
 #include "vm/heap.h"
 #include "vm/native_entry.h"
 #include "vm/object.h"
+#include "vm/report.h"
 #include "vm/stack_frame.h"
 #include "vm/symbols.h"
 
 namespace dart {
 
 DECLARE_FLAG(bool, enable_type_checks);
 DECLARE_FLAG(bool, trace_type_checks);
 DECLARE_FLAG(bool, warn_on_javascript_compatibility);
 
 
@@ skipping 81 matching lines @@
 
 
 DEFINE_NATIVE_ENTRY(Object_runtimeType, 1) {
   const Instance& instance = Instance::CheckedHandle(arguments->NativeArgAt(0));
   // Special handling for following types outside this native.
   ASSERT(!instance.IsString() && !instance.IsInteger() && !instance.IsDouble());
   return instance.GetType();
 }
 
 
-static void JSWarning(const char* msg) {
-  DartFrameIterator iterator;
-  iterator.NextFrame();  // Skip native call.
-  StackFrame* caller_frame = iterator.NextFrame();
-  ASSERT(caller_frame != NULL);
-  const Code& caller_code = Code::Handle(caller_frame->LookupDartCode());
-  ASSERT(!caller_code.IsNull());
-  const uword caller_pc = caller_frame->pc();
-  // Assume an instance call.
-  ICData& ic_data = ICData::Handle();
-  CodePatcher::GetInstanceCallAt(caller_pc, caller_code, &ic_data);
-  ASSERT(!ic_data.IsNull());
-  // Report warning only if not already reported at this location.
-  if (!ic_data.IssuedJSWarning()) {
-    ic_data.SetIssuedJSWarning();
-    Exceptions::JSWarning(caller_frame, "%s", msg);
-  }
-}
-
-
 static void WarnOnJSIntegralNumTypeTest(
     const Instance& instance,
     const TypeArguments& instantiator_type_arguments,
     const AbstractType& type) {
   const bool instance_is_int = instance.IsInteger();
   const bool instance_is_double = instance.IsDouble();
+  const bool is_static_native = false;  // Object_instanceOf and Object_as are
+                                        // not static native calls.
   if (!(instance_is_int || instance_is_double)) {
     return;
   }
   AbstractType& instantiated_type = AbstractType::Handle(type.raw());
   if (!type.IsInstantiated()) {
     instantiated_type = type.InstantiateFrom(instantiator_type_arguments, NULL);
   }
   if (instance_is_double) {
     if (instantiated_type.IsIntType()) {
       const double value = Double::Cast(instance).value();
       if (floor(value) == value) {
-        JSWarning("integral value of type 'double' is also considered to be "
-                  "of type 'int'");
+        Report::JSWarningFromNative(is_static_native,

[hausner, 2014/06/18 21:48:53]

As discussed offline, I prefer passing false as a literal and a comment next to
it if necessary. Naming the constant is confusing, esp. for false values. I read
is_static_native = false and conclude that something is NOT static and native.

[regis, 2014/06/18 22:13:28]

Done.

+            "integral value of type 'double' is also considered to be "
+            "of type 'int'");
       }
     }
   } else {
     ASSERT(instance_is_int);
     if (instantiated_type.IsDoubleType()) {
-      JSWarning("integer value is also considered to be of type 'double'");
+      Report::JSWarningFromNative(is_static_native,
+          "integer value is also considered to be of type 'double'");
     }
   }
 }
 
 
 DEFINE_NATIVE_ENTRY(Object_instanceOf, 5) {
   const Instance& instance =
       Instance::CheckedHandle(isolate, arguments->NativeArgAt(0));
   // Instantiator at position 1 is not used. It is passed along so that the call
   // can be easily converted to an optimized implementation. Instantiator is
@@ skipping 136 matching lines @@
 
 
 DEFINE_NATIVE_ENTRY(LibraryPrefix_load, 1) {
   const LibraryPrefix& prefix =
       LibraryPrefix::CheckedHandle(arguments->NativeArgAt(0));
   bool hasCompleted = prefix.LoadLibrary();
   return Bool::Get(hasCompleted).raw();
 }
 
 }  // namespace dart