Simplify various name flavors in VM.

runtime/vm/object.h

Index: runtime/vm/object.h
diff --git a/runtime/vm/object.h b/runtime/vm/object.h
index ee8782a77904b9e49635aac6898addd997a8ef17..c5b4353f8ab5c311ef1d0564ef58cb8eb41c9952 100644
--- a/runtime/vm/object.h
+++ b/runtime/vm/object.h
@@ -591,21 +591,11 @@ class Object {
     //   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.
+    // User visible names drop privacy suffixes, getter prefixes, and
+    // trailing dots on unnamed constructors.  The names of core
+    // implementation classes are remapped to their public interface names.
+    // These names are used in the vm service and are appropriate for
+    // reporting type errors directly to programmers.
     //
     // e.g.
     //   get:foo@6be832b        -> foo
@@ -953,8 +943,12 @@ class Class : public Object {
   }
 
   RawString* Name() const;
-  RawString* PrettyName() const;
   RawString* UserVisibleName() const;
+
+  // The scrubbed name is identical to the UserVisibleName, but without the
+  // remapping to the public interface name.  It is only used for VM debugging.
+  RawString* ScrubbedName() const;
+
   bool IsInFullSnapshot() const;
 
   virtual RawString* DictionaryName() const { return Name(); }
@@ -1417,9 +1411,7 @@ class Class : public Object {
   class IsAllocatedBit : public BitField<uint16_t, bool, kIsAllocatedBit, 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_state_bits(intptr_t bits) const;
 
@@ -1549,12 +1541,6 @@ class TypeArguments : public Object {
     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 {
@@ -2108,11 +2094,8 @@ class ICData : public Object {
 class Function : public Object {
  public:
   RawString* name() const { return raw_ptr()->name_; }
-  RawString* PrettyName() const;
   RawString* UserVisibleName() const;
-  RawString* QualifiedPrettyName() const;
   RawString* QualifiedUserVisibleName() const;
-  const char* QualifiedUserVisibleNameCString() const;
   virtual RawString* DictionaryName() const { return name(); }
 
   RawString* GetSource() const;
@@ -2136,12 +2119,6 @@ class Function : public Object {
     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, also called the
@@ -2892,7 +2869,6 @@ class RedirectionData: public Object {
 class Field : public Object {
  public:
   RawString* name() const { return raw_ptr()->name_; }
-  RawString* PrettyName() const;
   RawString* UserVisibleName() const;
   virtual RawString* DictionaryName() const { return name(); }
 
@@ -4519,7 +4495,7 @@ class Code : public Object {
   intptr_t GetDeoptIdForOsr(uword pc) const;
 
   RawString* Name() const;
-  RawString* PrettyName() const;
+  RawString* UserVisibleName() const;
 
   int64_t compile_timestamp() const {
     return raw_ptr()->compile_timestamp_;
@@ -5319,10 +5295,6 @@ class AbstractType : public Instance {
     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 {
@@ -6520,8 +6492,8 @@ class String : public Instance {
   static RawString* ToLowerCase(const String& str,
                                 Heap::Space space = Heap::kNew);
 
-  static RawString* IdentifierPrettyName(const String& name);
-  static RawString* IdentifierPrettyNameRetainPrivate(const String& name);
+  static RawString* ScrubName(const String& name);
+  static RawString* ScrubNameRetainPrivate(const String& name);
 
   static bool EqualsIgnoringPrivateKey(const String& str1,
                                        const String& str2);