Don't remap class/type names in the vm service.

runtime/vm/object.h

 // 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.
 
 #ifndef VM_OBJECT_H_
 #define VM_OBJECT_H_
 
 #include <math.h>
 
 #include "include/dart_api.h"
@@ skipping 479 matching lines @@
   static const ClassId kClassId = kObjectCid;
 
   // Different kinds of type tests.
   enum TypeTestKind {
     kIsSubtypeOf = 0,
     kIsMoreSpecificThan
   };
 
   // Different kinds of name visibility.
   enum NameVisibility {
+    // Internal names are the true names of classes, fields,
+    // etc. inside the vm.  These names include privacy suffixes,
+    // getter prefixes, and trailing dots on unnamed constructors.
+    //
+    // The names of core implementation classes (like _OneByteString)
+    // are preserved as well.
+    //
+    // e.g.
+    //   private getter             - get:foo@6be832b
+    //   private constructor        - _MyClass@6b3832b.
+    //   private named constructor  - _MyClass@6b3832b.named
+    //   core impl class name shown - _OneByteString
     kInternalName = 0,
+
+    // Pretty names drop privacy suffixes, getter prefixes, and
+    // trailing dots on unnamed constructors.  These names are used in
+    // the vm service.
+    //
+    // e.g.
+    //   get:foo@6be832b        -> foo
+    //   _MyClass@6b3832b.      -> _MyClass
+    //   _MyClass@6b3832b.named -> _MyClass.named
+    //   _OneByteString          -> _OneByteString (not remapped)
+    kPrettyName,
+
+    // User visible names are appropriate for reporting type errors
+    // directly to programmers.  The names have been "prettied" and
+    // the names of core implementation classes are remapped to their
+    // public interface names.
+    //
+    // e.g.
+    //   get:foo@6be832b        -> foo
+    //   _MyClass@6b3832b.      -> _MyClass
+    //   _MyClass@6b3832b.named -> _MyClass.named
+    //   _OneByteString          -> String (remapped)
     kUserVisibleName
   };
 
  protected:
   // Used for extracting the C++ vtable during bringup.
   Object() : raw_(null_) {}
 
   uword raw_value() const {
     return reinterpret_cast<uword>(raw());
   }
@@ skipping 189 matching lines @@
   static bool is_valid_id(intptr_t value) {
     return RawObject::ClassIdTag::is_valid(value);
   }
   intptr_t id() const { return raw_ptr()->id_; }
   void set_id(intptr_t value) const {
     ASSERT(is_valid_id(value));
     raw_ptr()->id_ = value;
   }
 
   RawString* Name() const;
+  RawString* PrettyName() const;
   RawString* UserVisibleName() const;
 
   virtual RawString* DictionaryName() const { return Name(); }
 
   RawScript* script() const { return raw_ptr()->script_; }
   void set_script(const Script& value) const;
 
   intptr_t token_pos() const { return raw_ptr()->token_pos_; }
   void set_token_pos(intptr_t value) const;
 
@@ skipping 430 matching lines @@
   class PatchBit : public BitField<bool, kPatchBit, 1> {};
   class SynthesizedClassBit : public BitField<bool, kSynthesizedClassBit, 1> {};
   class MarkedForParsingBit : public BitField<bool, kMarkedForParsingBit, 1> {};
   class MixinAppAliasBit : public BitField<bool, kMixinAppAliasBit, 1> {};
   class MixinTypeAppliedBit : public BitField<bool, kMixinTypeAppliedBit, 1> {};
   class FieldsMarkedNullableBit : public BitField<bool,
       kFieldsMarkedNullableBit, 1> {};  // NOLINT
   class CycleFreeBit : public BitField<bool, kCycleFreeBit, 1> {};
 
   void set_name(const String& value) const;
+  void set_pretty_name(const String& value) const;
   void set_user_name(const String& value) const;
+  RawString* GeneratePrettyName() const;
   RawString* GenerateUserVisibleName() const;
   void set_signature_function(const Function& value) const;
   void set_signature_type(const AbstractType& value) const;
   void set_state_bits(intptr_t bits) const;
 
   void set_constants(const Array& value) const;
 
   void set_canonical_types(const Object& value) const;
   RawObject* canonical_types() const;
 
@@ skipping 97 matching lines @@
   static intptr_t type_at_offset(intptr_t index) {
     return OFFSET_OF(RawTypeArguments, types_) + index * kWordSize;
   }
   void SetTypeAt(intptr_t index, const AbstractType& value) const;
 
   // The name of this type argument vector, e.g. "<T, dynamic, List<T>, Smi>".
   RawString* Name() const {
     return SubvectorName(0, Length(), kInternalName);
   }
 
+  // The name of this type argument vector, e.g. "<T, dynamic, List<T>, Smi>".
+  // Names of internal classes are not mapped to their public interfaces.
+  RawString* PrettyName() const {
+    return SubvectorName(0, Length(), kPrettyName);
+  }
+
   // The name of this type argument vector, e.g. "<T, dynamic, List<T>, int>".
   // Names of internal classes are mapped to their public interfaces.
   RawString* UserVisibleName() const {
     return SubvectorName(0, Length(), kUserVisibleName);
   }
 
   // Check if the subvector of length 'len' starting at 'from_index' of this
   // type argument vector consists solely of DynamicType.
   bool IsRaw(intptr_t from_index, intptr_t len) const {
     return IsDynamicTypes(false, from_index, len);
@@ skipping 170 matching lines @@
   static RawPatchClass* New();
 
   FINAL_HEAP_OBJECT_IMPLEMENTATION(PatchClass, Object);
   friend class Class;
 };
 
 
 class Function : public Object {
  public:
   RawString* name() const { return raw_ptr()->name_; }
+  RawString* PrettyName() const;
   RawString* UserVisibleName() const;
+  RawString* QualifiedPrettyName() const;
   RawString* QualifiedUserVisibleName() const;
   virtual RawString* DictionaryName() const { return name(); }
 
   RawString* GetSource();
 
   // Build a string of the form 'C<T, R>(T, {b: B, c: C}) => R' representing the
   // internal signature of the given function. In this example, T and R are
   // type parameters of class C, the owner of the function.
   RawString* Signature() const {
     const bool instantiate = false;
     return BuildSignature(instantiate, kInternalName, TypeArguments::Handle());
   }
 
+  RawString* PrettySignature() const {
+    const bool instantiate = false;
+    return BuildSignature(
+        instantiate, kPrettyName, TypeArguments::Handle());
+  }
+
   // Build a string of the form '(T, {b: B, c: C}) => R' representing the
   // user visible signature of the given function. In this example, T and R are
   // type parameters of class C, the owner of the function.
   // Implicit parameters are hidden, as well as the prefix denoting the
   // signature class and its type parameters.
   RawString* UserVisibleSignature() const {
     const bool instantiate = false;
     return BuildSignature(
         instantiate, kUserVisibleName, TypeArguments::Handle());
   }
@@ skipping 598 matching lines @@
   FINAL_HEAP_OBJECT_IMPLEMENTATION(RedirectionData, Object);
   friend class Class;
   friend class Function;
   friend class HeapProfiler;
 };
 
 
 class Field : public Object {
  public:
   RawString* name() const { return raw_ptr()->name_; }
+  RawString* PrettyName() const;
   RawString* UserVisibleName() const;
   virtual RawString* DictionaryName() const { return name(); }
 
   bool is_static() const { return StaticBit::decode(raw_ptr()->kind_bits_); }
   bool is_final() const { return FinalBit::decode(raw_ptr()->kind_bits_); }
   bool is_const() const { return ConstBit::decode(raw_ptr()->kind_bits_); }
 
   inline intptr_t Offset() const;
   inline void SetOffset(intptr_t value_in_bytes) const;
 
@@ skipping 1495 matching lines @@
   // Each (*node_ids)[n] has a an extracted ic data array (*arrays)[n].
   // Returns the maximum id found.
   intptr_t ExtractIcDataArraysAtCalls(
       GrowableArray<intptr_t>* node_ids,
       const GrowableObjectArray& ic_data_objs) const;
 
   // Returns an array indexed by deopt id, containing the extracted ICData.
   RawArray* ExtractTypeFeedbackArray() const;
 
   RawString* Name() const;
-  RawString* UserName() const;
+  RawString* PrettyName() const;
 
   int64_t compile_timestamp() const {
     return raw_ptr()->compile_timestamp_;
   }
 
  private:
   void set_state_bits(intptr_t bits) const;
 
   friend class RawCode;
   enum {
@@ skipping 665 matching lines @@
   // If the trail is null, allocate a trail, add the pair <receiver, buddy> to
   // the trail. The receiver may only be added once with its only buddy.
   void AddOnlyBuddyToTrail(GrowableObjectArray** trail,
                            const Object& buddy) const;
 
   // The name of this type, including the names of its type arguments, if any.
   virtual RawString* Name() const {
     return BuildName(kInternalName);
   }
 
+  virtual RawString* PrettyName() const {
+    return BuildName(kPrettyName);
+  }
+
   // The name of this type, including the names of its type arguments, if any.
   // Names of internal classes are mapped to their public interfaces.
   virtual RawString* UserVisibleName() const {
     return BuildName(kUserVisibleName);
   }
 
   virtual intptr_t Hash() const;
 
   // The name of this type's class, i.e. without the type argument names of this
   // type.
@@ skipping 2673 matching lines @@
 
 
 RawObject* MegamorphicCache::GetTargetFunction(const Array& array,
                                                intptr_t index) {
   return array.At((index * kEntryLength) + kTargetFunctionIndex);
 }
 
 }  // namespace dart
 
 #endif  // VM_OBJECT_H_