Demangle names before using them as properties for DartHandleProxies.

Source/bindings/dart/DartHandleProxy.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 121 matching lines @@
 Dart_Handle stripTrailingDot(Dart_Handle str)
 {
     return DartUtilities::invokeUtilsMethod("stripTrailingDot", 1, &str);
 }
 
 Dart_Handle addTrailingDot(Dart_Handle str)
 {
     return DartUtilities::invokeUtilsMethod("addTrailingDot", 1, &str);
 }
 
+Dart_Handle demangle(Dart_Handle str)
+{
+    return DartUtilities::invokeUtilsMethod("demangle", 1, &str);
+}
+
 Dart_Handle lookupValueForEncodedMapKey(Dart_Handle object, Dart_Handle key)
 {
     Dart_Handle args[] = {object, key};
     return DartUtilities::invokeUtilsMethod("lookupValueForEncodedMapKey", 2, args);
 }
 
 Dart_Handle buildConstructorName(Dart_Handle typeName, Dart_Handle constructorName)
 {
     Dart_Handle args[] = {typeName, constructorName};
     return DartUtilities::invokeUtilsMethod("buildConstructorName", 2, args);
@@ skipping 68 matching lines @@
 
             // Skip setters as any setter we care to enumerate should have a matching getter.
             // Setters without matching getters will still be callable but won't be enumerated.
             if (isSetter)
                 continue;
         }
 
         // Strip off the leading typename from constructor name.
         if (isConstructor)
             functionName = stripClassName(functionName, Dart_TypeName(handle));
 

[Jacob, 2013/11/21 22:45:40]

this is never getting called and would likely do the wrong thing if it was
called. See the fixme above that the DartVM doesn't correctly handle invoking
properties with private names.

[rmacnak, 2013/11/21 23:14:20]

What is it the VM does incorrectly? Nothing seems to go wrong if I remove the
skip condition above.

+        functionName = demangle(functionName);
         properties->Set(*count, V8Converter::stringToV8(functionName));
         *count = *count + 1;
     }
 }
 
 void addClassNames(Dart_Handle library, v8::Local<v8::Array>& properties, intptr_t* count)
 {
     intptr_t length = 0;
     Dart_Handle typeNames = Dart_LibraryGetClassNames(library);
     ASSERT(!Dart_IsNull(typeNames));
     ASSERT(Dart_IsList(typeNames));
     Dart_ListLength(typeNames, &length);
     for (intptr_t i = 0; i < length; i++) {
         Dart_Handle typeName = Dart_ListGetAt(typeNames, i);
         properties->Set(*count, V8Converter::stringToV8(typeName));
         *count = *count + 1;
     }
 }
 
 void addFieldNames(Dart_Handle fieldNames, v8::Local<v8::Array>& properties, intptr_t* count)
 {
     ASSERT(!Dart_IsApiError(fieldNames));
     ASSERT(Dart_IsList(fieldNames));
     intptr_t length = 0;
     Dart_ListLength(fieldNames, &length);
     for (intptr_t i = 0; i < length; i += 2) {
         Dart_Handle fieldName = Dart_ListGetAt(fieldNames, i);
-        properties->Set(*count, V8Converter::stringToV8(fieldName));
+        properties->Set(*count, V8Converter::stringToV8(demangle(fieldName)));

[Jacob, 2013/11/21 22:45:40]

do private fields in libraries show up correctly with this change or are all
their values "undefined"
please explore a library in the private field to the devtools to verify.

[rmacnak, 2013/11/21 23:14:20]

I can see the value in the Scope Variables section.

Curiously, instance fields still have their mangling.

         *count = *count + 1;
     }
 }
 
 template<typename CallbackInfo>
 void setReturnValue(CallbackInfo info, Dart_Handle result)
 {
     if (Dart_IsError(result)) {
         // FIXME: we would really prefer to call the following however it has
         // bad unintended consequences as then JS cannot catch the thrown exception.
@@ skipping 277 matching lines @@
         // Add all library prefixes of imports to the library.
         Dart_Handle imports = Dart_GetLibraryImports(libraryId);
         ASSERT(!Dart_IsError(imports));
         intptr_t length = 0;
         Dart_ListLength(imports, &length);
         for (intptr_t i = 0; i < length; i += 2) {
             Dart_Handle importPrefix = Dart_ListGetAt(imports, i);
             if (!Dart_IsNull(importPrefix)) {
                 ASSERT(Dart_IsString(importPrefix));
                 properties->Set(count, V8Converter::stringToV8(
-                    stripTrailingDot(importPrefix)));
+                    demangle(stripTrailingDot(importPrefix))));
                 count++;
             }
             bool equals = false;
         }
     }
 
     info.Holder()->SetHiddenValue(v8::String::NewSymbol("cache"), properties);
     v8SetReturnValue(info, properties);
 }
 
@@ skipping 630 matching lines @@
     for (intptr_t i = 0; i < length; i ++)
         dartFunctionArgs.append(Dart_ListGetAt(wrappedExpressionArgs, i));
 
     Dart_Handle result = Dart_InvokeClosure(closure, dartFunctionArgs.size(), dartFunctionArgs.data());
     if (Dart_IsError(result))
         return V8ThrowException::throwError(v8::String::New(Dart_GetError(result)), v8::Isolate::GetCurrent());
     return DartHandleProxy::create(result);
 }
 
 }