Refactor and comment Atom attributes.  Replace combine() with internalName() and mergeDuplicates()

llvm-svn: 146958
diff --git a/lld/lib/Core/YamlWriter.cpp b/lld/lib/Core/YamlWriter.cpp
index ae27c7e..711fd1a 100644
--- a/lld/lib/Core/YamlWriter.cpp
+++ b/lld/lib/Core/YamlWriter.cpp
@@ -29,8 +29,8 @@
   virtual void doFile(const class File &) { }
   virtual void doAtom(const class Atom &atom) {
     _out << "    - name:        " << atom.name() << "\n";
+    _out << "      internal-name:" << atom.internalName() << "\n";
     _out << "      definition:  " << definitionString(atom.definition()) <<"\n";
-    _out << "      user-visible:" << atom.userVisibleName() << "\n";
     _out << "      scope:       " << scopeString(atom.scope()) << "\n";
     _out << "      type:        " << typeString(atom.contentType()) << "\n";
     if (atom.referencesBegin() != atom.referencesEnd()) {