Windows produces different output for __FUNCTION__. Canonicalize.

runtime/vm/dart_api_impl.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 "include/dart_api.h"
 
 #include "vm/bigint_operations.h"
 #include "vm/class_finalizer.h"
 #include "vm/compiler.h"
 #include "vm/dart.h"
 #include "vm/dart_api_impl.h"
 #include "vm/dart_api_state.h"
 #include "vm/dart_entry.h"
 #include "vm/debuginfo.h"
 #include "vm/exceptions.h"
 #include "vm/growable_array.h"
 #include "vm/longjump.h"
 #include "vm/native_entry.h"
 #include "vm/object.h"
 #include "vm/object_store.h"
 #include "vm/port.h"
 #include "vm/resolver.h"
 #include "vm/snapshot.h"
 #include "vm/stack_frame.h"
 #include "vm/timer.h"
 #include "vm/verifier.h"
 
 namespace dart {
 
+static const char* CanonicalFunction(const char* func) {
+  if (strncmp(func, "dart::", 6) == 0) {
+    return func + 6;
+  } else {
+    return func;
+  }
+}
+
+#define CURRENT_FUNC CanonicalFunction(__FUNCTION__)

[cshapiro, 2011/11/11 00:51:42]

I think you might want __PRETTY_NAME__ on G++ and __FUNCSIG__ on MSVC for
something more consistent.

I do not have access to a Windows machine to confirm this at the moment.

+
 #define UNWRAP_NONNULL(dart_handle, vm_handle, Type)                          \
   do {                                                                        \
     const Object& tmp = Object::Handle(Api::UnwrapHandle((dart_handle)));     \
     if (tmp.Is##Type()) {                                                     \
       (vm_handle) ^= tmp.raw();                                               \
     } else if (tmp.IsNull()) {                                                \
       return Api::Error("%s expects argument '%s' to be non-null.",           \
-                        __FUNCTION__, #dart_handle);                          \
+                        CURRENT_FUNC, #dart_handle);                          \
     } else if (tmp.IsApiFailure()) {                                          \
       return dart_handle;                                                     \
     } else {                                                                  \
       return Api::Error("%s expects argument '%s' to be of type %s.",         \
-                        __FUNCTION__, #dart_handle, #Type);                   \
+                        CURRENT_FUNC, #dart_handle, #Type);                   \
     }                                                                         \
   } while (0)
 
 
 DART_EXPORT bool Dart_IsValid(const Dart_Handle& handle) {
   ASSERT(Isolate::Current() != NULL);
   Zone zone;  // Setup a VM zone as we are creating some handles.
   HandleScope scope;  // Setup a VM handle scope.
 
   // Make sure that the object isn't an ApiFailure.
@@ skipping 357 matching lines @@
 
 
 DART_EXPORT Dart_Handle Dart_LookupLibrary(Dart_Handle url) {
   Zone zone;  // Setup a VM zone as we are creating some handles.
   HandleScope scope;  // Setup a VM handle scope.
   String& url_str = String::Handle();
   UNWRAP_NONNULL(url, url_str, String);
   const Library& library = Library::Handle(Library::LookupLibrary(url_str));
   if (library.IsNull()) {
     return Api::Error("%s: library '%s' not found.",
-                      __FUNCTION__, url_str.ToCString());
+                      CURRENT_FUNC, url_str.ToCString());
   } else {
     return Api::NewLocalHandle(library);
   }
 }
 
 
 DART_EXPORT Dart_Handle Dart_LoadLibrary(Dart_Handle url, Dart_Handle source) {
   Zone zone;  // Setup a VM zone as we are creating some handles.
   HandleScope scope;  // Setup a VM handle scope.
   const String& url_str = String::CheckedHandle(Api::UnwrapHandle(url));
@@ skipping 1694 matching lines @@
   ASSERT(isolate != NULL);
   ApiState* state = isolate->api_state();
   ASSERT(state != NULL);
   ApiLocalScope* scope = state->top_scope();
   ASSERT(scope != NULL);
   return scope->zone().Reallocate(ptr, old_size, new_size);
 }
 
 
 }  // namespace dart