Skip to content

[LLVM] Change error messages to start with lower case #113748

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 29, 2024
Merged

[LLVM] Change error messages to start with lower case #113748

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions llvm/lib/AsmParser/LLLexer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ uint64_t LLLexer::atoull(const char *Buffer, const char *End) {
uint64_t OldRes = Result;
Result *= 10;
Result += *Buffer-'0';
if (Result < OldRes) { // Uh, oh, overflow detected!!!
LexError("constant bigger than 64 bits detected!");
if (Result < OldRes) { // overflow detected.
LexError("constant bigger than 64 bits detected");
return 0;
}
}
Expand All @@ -75,8 +75,8 @@ uint64_t LLLexer::HexIntToVal(const char *Buffer, const char *End) {
Result *= 16;
Result += hexDigitValue(*Buffer);

if (Result < OldRes) { // Uh, oh, overflow detected!!!
LexError("constant bigger than 64 bits detected!");
if (Result < OldRes) { // overflow detected.
LexError("constant bigger than 64 bits detected");
return 0;
}
}
Expand All @@ -99,7 +99,7 @@ void LLLexer::HexToIntPair(const char *Buffer, const char *End,
Pair[1] += hexDigitValue(*Buffer);
}
if (Buffer != End)
LexError("constant bigger than 128 bits detected!");
LexError("constant bigger than 128 bits detected");
}

/// FP80HexToIntPair - translate an 80 bit FP80 number (20 hexits) into
Expand All @@ -118,7 +118,7 @@ void LLLexer::FP80HexToIntPair(const char *Buffer, const char *End,
Pair[0] += hexDigitValue(*Buffer);
}
if (Buffer != End)
LexError("constant bigger than 128 bits detected!");
LexError("constant bigger than 128 bits detected");
}

// UnEscapeLexed - Run through the specified buffer and change \xx codes to the
Expand Down Expand Up @@ -292,7 +292,7 @@ lltok::Kind LLLexer::LexDollar() {
StrVal.assign(TokStart + 2, CurPtr - 1);
UnEscapeLexed(StrVal);
if (StringRef(StrVal).contains(0)) {
LexError("Null bytes are not allowed in names");
LexError("NUL character is not allowed in names");
return lltok::Error;
}
return lltok::ComdatVar;
Expand Down Expand Up @@ -354,7 +354,7 @@ lltok::Kind LLLexer::LexUIntID(lltok::Kind Token) {

uint64_t Val = atoull(TokStart + 1, CurPtr);
if ((unsigned)Val != Val)
LexError("invalid value number (too large)!");
LexError("invalid value number (too large)");
UIntVal = unsigned(Val);
return Token;
}
Expand All @@ -375,7 +375,7 @@ lltok::Kind LLLexer::LexVar(lltok::Kind Var, lltok::Kind VarID) {
StrVal.assign(TokStart+2, CurPtr-1);
UnEscapeLexed(StrVal);
if (StringRef(StrVal).contains(0)) {
LexError("Null bytes are not allowed in names");
LexError("NUL character is not allowed in names");
return lltok::Error;
}
return Var;
Expand Down Expand Up @@ -410,7 +410,7 @@ lltok::Kind LLLexer::LexQuote() {
if (CurPtr[0] == ':') {
++CurPtr;
if (StringRef(StrVal).contains(0)) {
LexError("Null bytes are not allowed in names");
LexError("NUL character is not allowed in names");
kind = lltok::Error;
} else {
kind = lltok::LabelStr;
Expand Down Expand Up @@ -492,7 +492,7 @@ lltok::Kind LLLexer::LexIdentifier() {
uint64_t NumBits = atoull(StartChar, CurPtr);
if (NumBits < IntegerType::MIN_INT_BITS ||
NumBits > IntegerType::MAX_INT_BITS) {
LexError("bitwidth for integer type out of range!");
LexError("bitwidth for integer type out of range");
return lltok::Error;
}
TyVal = IntegerType::get(Context, NumBits);
Expand Down Expand Up @@ -1122,7 +1122,7 @@ lltok::Kind LLLexer::LexDigitOrNegative() {
uint64_t Val = atoull(TokStart, CurPtr);
++CurPtr; // Skip the colon.
if ((unsigned)Val != Val)
LexError("invalid value number (too large)!");
LexError("invalid value number (too large)");
UIntVal = unsigned(Val);
return lltok::LabelID;
}
Expand Down
73 changes: 37 additions & 36 deletions llvm/lib/TableGen/TGLexer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ TGLexer::TGLexer(SourceMgr &SM, ArrayRef<std::string> Macros) : SrcMgr(SM) {
for (StringRef MacroName : Macros) {
const char *End = lexMacroName(MacroName);
if (End != MacroName.end())
PrintFatalError("Invalid macro name `" + MacroName +
PrintFatalError("invalid macro name `" + MacroName +
"` specified on command line");

DefinedMacros.insert(MacroName);
Expand Down Expand Up @@ -188,7 +188,7 @@ tgtok::TokKind TGLexer::LexToken(bool FileOrLineStart) {
return LexIdentifier();

// Unknown character, emit an error.
return ReturnError(TokStart, "Unexpected character");
return ReturnError(TokStart, "unexpected character");
case EOF:
// Lex next token, if we just left an include file.
// Note that leaving an include file means that the next
Expand Down Expand Up @@ -231,7 +231,7 @@ tgtok::TokKind TGLexer::LexToken(bool FileOrLineStart) {
++CurPtr; // Eat third dot.
return tgtok::dotdotdot;
}
return ReturnError(TokStart, "Invalid '..' punctuation");
return ReturnError(TokStart, "invalid '..' punctuation");
}
return tgtok::dot;

Expand All @@ -255,7 +255,7 @@ tgtok::TokKind TGLexer::LexToken(bool FileOrLineStart) {
if (SkipCComment())
return tgtok::Error;
} else // Otherwise, this is an error.
return ReturnError(TokStart, "Unexpected character");
return ReturnError(TokStart, "unexpected character");
return LexToken(FileOrLineStart);
case '-': case '+':
case '0': case '1': case '2': case '3': case '4': case '5': case '6':
Expand Down Expand Up @@ -313,10 +313,10 @@ tgtok::TokKind TGLexer::LexString() {
while (*CurPtr != '"') {
// If we hit the end of the buffer, report an error.
if (*CurPtr == 0 && CurPtr == CurBuf.end())
return ReturnError(StrStart, "End of file in string literal");
return ReturnError(StrStart, "end of file in string literal");

if (*CurPtr == '\n' || *CurPtr == '\r')
return ReturnError(StrStart, "End of line in string literal");
return ReturnError(StrStart, "end of line in string literal");

if (*CurPtr != '\\') {
CurStrVal += *CurPtr++;
Expand Down Expand Up @@ -346,7 +346,7 @@ tgtok::TokKind TGLexer::LexString() {
// If we hit the end of the buffer, report an error.
case '\0':
if (CurPtr == CurBuf.end())
return ReturnError(StrStart, "End of file in string literal");
return ReturnError(StrStart, "end of file in string literal");
[[fallthrough]];
default:
return ReturnError(CurPtr, "invalid escape in string literal");
Expand All @@ -359,7 +359,7 @@ tgtok::TokKind TGLexer::LexString() {

tgtok::TokKind TGLexer::LexVarName() {
if (!isValidIDChar(CurPtr[0], /*First=*/true))
return ReturnError(TokStart, "Invalid variable name");
return ReturnError(TokStart, "invalid variable name");

// Otherwise, we're ok, consume the rest of the characters.
const char *VarNameStart = CurPtr++;
Expand Down Expand Up @@ -433,7 +433,7 @@ bool TGLexer::LexInclude() {
tgtok::TokKind Tok = LexToken();
if (Tok == tgtok::Error) return true;
if (Tok != tgtok::StrVal) {
PrintError(getLoc(), "Expected filename after include");
PrintError(getLoc(), "expected filename after include");
return true;
}

Expand All @@ -444,7 +444,7 @@ bool TGLexer::LexInclude() {
CurBuffer = SrcMgr.AddIncludeFile(Filename, SMLoc::getFromPointer(CurPtr),
IncludedFile);
if (!CurBuffer) {
PrintError(getLoc(), "Could not find include file '" + Filename + "'");
PrintError(getLoc(), "could not find include file '" + Filename + "'");
return true;
}

Expand Down Expand Up @@ -476,7 +476,7 @@ bool TGLexer::SkipCComment() {
int CurChar = getNextChar();
switch (CurChar) {
case EOF:
PrintError(TokStart, "Unterminated comment!");
PrintError(TokStart, "unterminated comment");
return true;
case '*':
// End of the comment?
Expand Down Expand Up @@ -543,7 +543,7 @@ tgtok::TokKind TGLexer::LexNumber() {

// Requires at least one digit.
if (CurPtr == NumStart)
return ReturnError(TokStart, "Invalid number");
return ReturnError(TokStart, "invalid number");

errno = 0;
if (IsMinus)
Expand All @@ -552,9 +552,9 @@ tgtok::TokKind TGLexer::LexNumber() {
CurIntVal = strtoull(NumStart, nullptr, Base);

if (errno == EINVAL)
return ReturnError(TokStart, "Invalid number");
return ReturnError(TokStart, "invalid number");
if (errno == ERANGE)
return ReturnError(TokStart, "Number out of range");
return ReturnError(TokStart, "number out of range");

return Base == 2 ? tgtok::BinaryIntVal : tgtok::IntVal;
}
Expand All @@ -580,13 +580,13 @@ tgtok::TokKind TGLexer::LexBracket() {
}
}

return ReturnError(CodeStart - 2, "Unterminated code block");
return ReturnError(CodeStart - 2, "unterminated code block");
}

/// LexExclaim - Lex '!' and '![a-zA-Z]+'.
tgtok::TokKind TGLexer::LexExclaim() {
if (!isAlpha(*CurPtr))
return ReturnError(CurPtr - 1, "Invalid \"!operator\"");
return ReturnError(CurPtr - 1, "invalid \"!operator\"");

const char *Start = CurPtr++;
while (isAlpha(*CurPtr))
Expand Down Expand Up @@ -648,7 +648,8 @@ tgtok::TokKind TGLexer::LexExclaim() {
.Case("repr", tgtok::XRepr)
.Default(tgtok::Error);

return Kind != tgtok::Error ? Kind : ReturnError(Start-1, "Unknown operator");
return Kind != tgtok::Error ? Kind
: ReturnError(Start - 1, "unknown operator");
}

bool TGLexer::prepExitInclude(bool IncludeStackMustBeEmpty) {
Expand All @@ -662,17 +663,17 @@ bool TGLexer::prepExitInclude(bool IncludeStackMustBeEmpty) {

// Pop the preprocessing controls from the include stack.
if (PrepIncludeStack.empty()) {
PrintFatalError("Preprocessor include stack is empty");
PrintFatalError("preprocessor include stack is empty");
}

PrepIncludeStack.pop_back();

if (IncludeStackMustBeEmpty) {
if (!PrepIncludeStack.empty())
PrintFatalError("Preprocessor include stack is not empty");
PrintFatalError("preprocessor include stack is not empty");
} else {
if (PrepIncludeStack.empty())
PrintFatalError("Preprocessor include stack is empty");
PrintFatalError("preprocessor include stack is empty");
}

return true;
Expand Down Expand Up @@ -732,7 +733,7 @@ bool TGLexer::prepEatPreprocessorDirective(tgtok::TokKind Kind) {
return true;
}

PrintFatalError("Unsupported preprocessing token in "
PrintFatalError("unsupported preprocessing token in "
"prepEatPreprocessorDirective()");
return false;
}
Expand All @@ -748,7 +749,7 @@ tgtok::TokKind TGLexer::lexPreprocessor(tgtok::TokKind Kind,
StringRef MacroName = prepLexMacroName();
StringRef IfTokName = Kind == tgtok::Ifdef ? "#ifdef" : "#ifndef";
if (MacroName.empty())
return ReturnError(TokStart, "Expected macro name after " + IfTokName);
return ReturnError(TokStart, "expected macro name after " + IfTokName);

bool MacroIsDefined = DefinedMacros.count(MacroName) != 0;

Expand All @@ -763,7 +764,7 @@ tgtok::TokKind TGLexer::lexPreprocessor(tgtok::TokKind Kind,
{tgtok::Ifdef, MacroIsDefined, SMLoc::getFromPointer(TokStart)});

if (!prepSkipDirectiveEnd())
return ReturnError(CurPtr, "Only comments are supported after " +
return ReturnError(CurPtr, "only comments are supported after " +
IfTokName + " NAME");

// If we were not processing tokens before this #ifdef,
Expand Down Expand Up @@ -794,7 +795,7 @@ tgtok::TokKind TGLexer::lexPreprocessor(tgtok::TokKind Kind,

if (IfdefEntry.Kind != tgtok::Ifdef) {
PrintError(TokStart, "double #else");
return ReturnError(IfdefEntry.SrcPos, "Previous #else is here");
return ReturnError(IfdefEntry.SrcPos, "previous #else is here");
}

// Replace the corresponding #ifdef's control with its negation
Expand All @@ -804,7 +805,7 @@ tgtok::TokKind TGLexer::lexPreprocessor(tgtok::TokKind Kind,
{Kind, !IfdefEntry.IsDefined, SMLoc::getFromPointer(TokStart)});

if (!prepSkipDirectiveEnd())
return ReturnError(CurPtr, "Only comments are supported after #else");
return ReturnError(CurPtr, "only comments are supported after #else");

// If we were processing tokens before this #else,
// we have to start skipping lines until the matching #endif.
Expand All @@ -827,12 +828,12 @@ tgtok::TokKind TGLexer::lexPreprocessor(tgtok::TokKind Kind,

if (IfdefOrElseEntry.Kind != tgtok::Ifdef &&
IfdefOrElseEntry.Kind != tgtok::Else) {
PrintFatalError("Invalid preprocessor control on the stack");
PrintFatalError("invalid preprocessor control on the stack");
return tgtok::Error;
}

if (!prepSkipDirectiveEnd())
return ReturnError(CurPtr, "Only comments are supported after #endif");
return ReturnError(CurPtr, "only comments are supported after #endif");

PrepIncludeStack.back()->pop_back();

Expand All @@ -847,15 +848,15 @@ tgtok::TokKind TGLexer::lexPreprocessor(tgtok::TokKind Kind,
} else if (Kind == tgtok::Define) {
StringRef MacroName = prepLexMacroName();
if (MacroName.empty())
return ReturnError(TokStart, "Expected macro name after #define");
return ReturnError(TokStart, "expected macro name after #define");

if (!DefinedMacros.insert(MacroName).second)
PrintWarning(getLoc(),
"Duplicate definition of macro: " + Twine(MacroName));
"duplicate definition of macro: " + Twine(MacroName));

if (!prepSkipDirectiveEnd())
return ReturnError(CurPtr,
"Only comments are supported after #define NAME");
"only comments are supported after #define NAME");

if (!ReturnNextLiveToken) {
PrintFatalError("#define must be ignored during the lines skipping");
Expand All @@ -865,13 +866,13 @@ tgtok::TokKind TGLexer::lexPreprocessor(tgtok::TokKind Kind,
return LexToken();
}

PrintFatalError("Preprocessing directive is not supported");
PrintFatalError("preprocessing directive is not supported");
return tgtok::Error;
}

bool TGLexer::prepSkipRegion(bool MustNeverBeFalse) {
if (!MustNeverBeFalse)
PrintFatalError("Invalid recursion.");
PrintFatalError("invalid recursion.");

do {
// Skip all symbols to the line end.
Expand Down Expand Up @@ -917,7 +918,7 @@ bool TGLexer::prepSkipRegion(bool MustNeverBeFalse) {
// due to #else or #endif.
if (prepIsProcessingEnabled()) {
if (Kind != tgtok::Else && Kind != tgtok::Endif) {
PrintFatalError("Tokens processing was enabled by an unexpected "
PrintFatalError("tokens processing was enabled by an unexpected "
"preprocessing directive");
return false;
}
Expand Down Expand Up @@ -1032,7 +1033,7 @@ bool TGLexer::prepSkipDirectiveEnd() {
return false;
} else {
TokStart = CurPtr;
PrintError(CurPtr, "Unexpected character");
PrintError(CurPtr, "unexpected character");
return false;
}

Expand Down Expand Up @@ -1067,8 +1068,8 @@ void TGLexer::prepReportPreprocessorStackError() {
"empty control stack");

auto &PrepControl = PrepIncludeStack.back()->back();
PrintError(CurBuf.end(), "Reached EOF without matching #endif");
PrintError(PrepControl.SrcPos, "The latest preprocessor control is here");
PrintError(CurBuf.end(), "reached EOF without matching #endif");
PrintError(PrepControl.SrcPos, "the latest preprocessor control is here");

TokStart = CurPtr;
}
2 changes: 1 addition & 1 deletion llvm/test/Assembler/invalid-inttype.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
; RUN: not llvm-as --disable-output %s 2>&1 | FileCheck -DFILE=%s %s

; i8388609 is the smallest integer type that can't be represented in LLVM IR
; CHECK: [[FILE]]:[[@LINE+1]]:21: error: bitwidth for integer type out of range!
; CHECK: [[FILE]]:[[@LINE+1]]:21: error: bitwidth for integer type out of range
@i2 = common global i8388609 0, align 4
Binary file modified llvm/test/Assembler/invalid-name.ll
View file
Open in desktop
Binary file not shown.
Binary file modified llvm/test/Assembler/invalid-name2.ll
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion llvm/test/TableGen/64-bit-int.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ def {
#ifdef OOR3
bits<64> Val = 0x10000000000000000;
#endif
// CHECK-OOR: error: Number out of range
// CHECK-OOR: error: number out of range

bits<64> BinVal0 = 0x8000000000000000;
bits<64> HexVal0 = 0b1000000000000000000000000000000000000000000000000000000000000000;
Expand Down
Loading
Loading