Cleanup error message output a bit

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@1879 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Linker/LinkModules.cpp b/lib/Linker/LinkModules.cpp
index f265bb05d17b6d020bd8d9f3559e9544a214e60d..c98295cc66c60ba005ef9bcd9f35b128eda9c5ab 100644 (file)
--- a/lib/Linker/LinkModules.cpp
+++ b/lib/Linker/LinkModules.cpp
@@ -61,7 +61,7 @@ static bool LinkTypes(Module *Dest, const Module *Src, string *Err = 0) {
       if (Entry != RHS)            // If it's the same, noop.  Otherwise, error.
         return Error(Err, "Type named '" + Name + 
                      "' of different shape in modules.\n  Src='" + 
-                     Entry->getDescription() + "'.  Dest='" + 
+                     Entry->getDescription() + "'.\n  Dst='" + 
                      RHS->getDescription() + "'");
     } else {                       // Type not in dest module.  Add it now.
       // TODO: FIXME WHEN TYPES AREN'T CONST

diff --git a/lib/Transforms/Utils/Linker.cpp b/lib/Transforms/Utils/Linker.cpp
index f265bb05d17b6d020bd8d9f3559e9544a214e60d..c98295cc66c60ba005ef9bcd9f35b128eda9c5ab 100644 (file)
--- a/lib/Transforms/Utils/Linker.cpp
+++ b/lib/Transforms/Utils/Linker.cpp
@@ -61,7 +61,7 @@ static bool LinkTypes(Module *Dest, const Module *Src, string *Err = 0) {
       if (Entry != RHS)            // If it's the same, noop.  Otherwise, error.
         return Error(Err, "Type named '" + Name + 
                      "' of different shape in modules.\n  Src='" + 
-                     Entry->getDescription() + "'.  Dest='" + 
+                     Entry->getDescription() + "'.\n  Dst='" + 
                      RHS->getDescription() + "'");
     } else {                       // Type not in dest module.  Add it now.
       // TODO: FIXME WHEN TYPES AREN'T CONST

diff --git a/lib/VMCore/Linker.cpp b/lib/VMCore/Linker.cpp
index f265bb05d17b6d020bd8d9f3559e9544a214e60d..c98295cc66c60ba005ef9bcd9f35b128eda9c5ab 100644 (file)
--- a/lib/VMCore/Linker.cpp
+++ b/lib/VMCore/Linker.cpp
@@ -61,7 +61,7 @@ static bool LinkTypes(Module *Dest, const Module *Src, string *Err = 0) {
       if (Entry != RHS)            // If it's the same, noop.  Otherwise, error.
         return Error(Err, "Type named '" + Name + 
                      "' of different shape in modules.\n  Src='" + 
-                     Entry->getDescription() + "'.  Dest='" + 
+                     Entry->getDescription() + "'.\n  Dst='" + 
                      RHS->getDescription() + "'");
     } else {                       // Type not in dest module.  Add it now.
       // TODO: FIXME WHEN TYPES AREN'T CONST