[llvm-commits] [llvm] r150466 - /llvm/trunk/lib/Linker/LinkModules.cpp

Bill Wendling isanbard at gmail.com
Tue Feb 14 01:13:54 PST 2012


Author: void
Date: Tue Feb 14 03:13:54 2012
New Revision: 150466

URL: http://llvm.org/viewvc/llvm-project?rev=150466&view=rev
Log:
Capitalize messages so that they appear nicely with the linker's error messages.

Modified:
    llvm/trunk/lib/Linker/LinkModules.cpp

Modified: llvm/trunk/lib/Linker/LinkModules.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Linker/LinkModules.cpp?rev=150466&r1=150465&r2=150466&view=diff
==============================================================================
--- llvm/trunk/lib/Linker/LinkModules.cpp (original)
+++ llvm/trunk/lib/Linker/LinkModules.cpp Tue Feb 14 03:13:54 2012
@@ -991,16 +991,16 @@
       MDNode *&ErrNode = ErrorNode[ID];
       if (!ErrNode) ErrNode = Op;
       if (ErrNode->getOperand(2) != Val)
-        HasErr = emitError("Linking module flags '" + ID->getString() +
-                           "': IDs have conflicting values!");
+        HasErr = emitError("linking module flags '" + ID->getString() +
+                           "': IDs have conflicting values");
       break;
     }
     case Module::Warning: {
       MDNode *&WarnNode = WarningNode[ID];
       if (!WarnNode) WarnNode = Op;
       if (WarnNode->getOperand(2) != Val)
-        errs() << "WARNING: Linking module flags '" << ID->getString()
-               << "': IDs have conflicting values!";
+        errs() << "WARNING: linking module flags '" << ID->getString()
+               << "': IDs have conflicting values";
       break;
     }
     case Module::Require:  RequireNodes[ID].insert(Op);     break;
@@ -1008,8 +1008,8 @@
       MDNode *&OvrNode = OverrideNode[ID];
       if (!OvrNode) OvrNode = Op;
       if (OvrNode->getOperand(2) != Val)
-        HasErr = emitError("Linking module flags '" + ID->getString() +
-                           "': IDs have conflicting override values!");
+        HasErr = emitError("linking module flags '" + ID->getString() +
+                           "': IDs have conflicting override values");
       break;
     }
     }
@@ -1058,7 +1058,7 @@
          I = SeenIDs.begin(), E = SeenIDs.end(); I != E; ++I) {
     MDString *ID = *I;
     if (ErrorNode[ID] && WarningNode[ID])
-      HasErr = emitError("Linking module flags '" + ID->getString() +
+      HasErr = emitError("linking module flags '" + ID->getString() +
                          "': IDs have conflicting behaviors");
   }
 
@@ -1118,8 +1118,8 @@
       }
 
       if (!HasValue)
-        HasErr = emitError("Linking module flags '" + ReqID->getString() +
-                           "': does not have the required value!");
+        HasErr = emitError("linking module flags '" + ReqID->getString() +
+                           "': does not have the required value");
     }
   }
 





More information about the llvm-commits mailing list