Capitalize messages so that they appear nicely with the linker's error messages.

llvm-svn: 150466
This commit is contained in:
Bill Wendling 2012-02-14 09:13:54 +00:00
parent a754fb54b1
commit d1355b33da

View File

@ -991,16 +991,16 @@ categorizeModuleFlagNodes(const NamedMDNode *ModFlags,
MDNode *&ErrNode = ErrorNode[ID]; MDNode *&ErrNode = ErrorNode[ID];
if (!ErrNode) ErrNode = Op; if (!ErrNode) ErrNode = Op;
if (ErrNode->getOperand(2) != Val) if (ErrNode->getOperand(2) != Val)
HasErr = emitError("Linking module flags '" + ID->getString() + HasErr = emitError("linking module flags '" + ID->getString() +
"': IDs have conflicting values!"); "': IDs have conflicting values");
break; break;
} }
case Module::Warning: { case Module::Warning: {
MDNode *&WarnNode = WarningNode[ID]; MDNode *&WarnNode = WarningNode[ID];
if (!WarnNode) WarnNode = Op; if (!WarnNode) WarnNode = Op;
if (WarnNode->getOperand(2) != Val) if (WarnNode->getOperand(2) != Val)
errs() << "WARNING: Linking module flags '" << ID->getString() errs() << "WARNING: linking module flags '" << ID->getString()
<< "': IDs have conflicting values!"; << "': IDs have conflicting values";
break; break;
} }
case Module::Require: RequireNodes[ID].insert(Op); break; case Module::Require: RequireNodes[ID].insert(Op); break;
@ -1008,8 +1008,8 @@ categorizeModuleFlagNodes(const NamedMDNode *ModFlags,
MDNode *&OvrNode = OverrideNode[ID]; MDNode *&OvrNode = OverrideNode[ID];
if (!OvrNode) OvrNode = Op; if (!OvrNode) OvrNode = Op;
if (OvrNode->getOperand(2) != Val) if (OvrNode->getOperand(2) != Val)
HasErr = emitError("Linking module flags '" + ID->getString() + HasErr = emitError("linking module flags '" + ID->getString() +
"': IDs have conflicting override values!"); "': IDs have conflicting override values");
break; break;
} }
} }
@ -1058,7 +1058,7 @@ bool ModuleLinker::linkModuleFlagsMetadata() {
I = SeenIDs.begin(), E = SeenIDs.end(); I != E; ++I) { I = SeenIDs.begin(), E = SeenIDs.end(); I != E; ++I) {
MDString *ID = *I; MDString *ID = *I;
if (ErrorNode[ID] && WarningNode[ID]) if (ErrorNode[ID] && WarningNode[ID])
HasErr = emitError("Linking module flags '" + ID->getString() + HasErr = emitError("linking module flags '" + ID->getString() +
"': IDs have conflicting behaviors"); "': IDs have conflicting behaviors");
} }
@ -1118,8 +1118,8 @@ bool ModuleLinker::linkModuleFlagsMetadata() {
} }
if (!HasValue) if (!HasValue)
HasErr = emitError("Linking module flags '" + ReqID->getString() + HasErr = emitError("linking module flags '" + ReqID->getString() +
"': does not have the required value!"); "': does not have the required value");
} }
} }