github-actions[bot] wrote:
<!--LLVM CODE FORMAT COMMENT: {clang-format}-->
:warning: C/C++ code formatter, clang-format found issues in your code.
:warning:
<details>
<summary>
You can test this locally with the following command:
</summary>
``````````bash
git-clang-format --diff origin/main HEAD --extensions h,cpp --
clang/include/clang/Lex/TextEncodingConfig.h
clang/lib/Lex/TextEncodingConfig.cpp clang/include/clang/Basic/SourceManager.h
clang/include/clang/Frontend/CompilerInstance.h
clang/include/clang/Lex/Preprocessor.h clang/lib/Basic/SourceManager.cpp
clang/lib/Frontend/CompilerInstance.cpp
clang/lib/Frontend/VerifyDiagnosticConsumer.cpp clang/lib/Lex/ModuleMap.cpp
clang/lib/Lex/PPDirectives.cpp clang/lib/Lex/Preprocessor.cpp
clang/lib/Serialization/ASTReader.cpp llvm/include/llvm/Support/TextEncoding.h
llvm/lib/Support/TextEncoding.cpp --diff_from_common_commit
``````````
:warning:
The reproduction instructions above might return results for more than one PR
in a stack if you are using a stacked PR workflow. You can limit the results by
changing `origin/main` to the base branch/commit you want to compare against.
:warning:
</details>
<details>
<summary>
View the diff from clang-format here.
</summary>
``````````diff
diff --git a/clang/include/clang/Basic/SourceManager.h
b/clang/include/clang/Basic/SourceManager.h
index 33517b9df..1dd022567 100644
--- a/clang/include/clang/Basic/SourceManager.h
+++ b/clang/include/clang/Basic/SourceManager.h
@@ -924,8 +924,8 @@ public:
/// being \#included from the specified IncludePosition.
FileID createFileID(FileEntryRef SourceFile, SourceLocation IncludePos,
SrcMgr::CharacteristicKind FileCharacter,
+ int LoadedID = 0, llvm::TextEncodingConverter *Converter,
int LoadedID = 0,
- llvm::TextEncodingConverter *Converter, int LoadedID = 0,
SourceLocation::UIntTy LoadedOffset = 0);
FileID createFileID(FileEntryRef SourceFile, SourceLocation IncludePos,
diff --git a/clang/include/clang/Lex/Preprocessor.h
b/clang/include/clang/Lex/Preprocessor.h
index d3d32130f..5f8d5caaa 100644
--- a/clang/include/clang/Lex/Preprocessor.h
+++ b/clang/include/clang/Lex/Preprocessor.h
@@ -200,7 +200,7 @@ class Preprocessor {
HeaderSearch &HeaderInfo;
ModuleLoader &TheModuleLoader;
TextEncodingConfig TEC;
-
+
/// External source of macros.
ExternalPreprocessorSource *ExternalSource;
@@ -1268,7 +1268,7 @@ public:
llvm::BumpPtrAllocator &getPreprocessorAllocator() { return BP; }
TextEncodingConfig &getTextEncodingConfig() { return TEC; }
-
+
void setExternalSource(ExternalPreprocessorSource *Source) {
ExternalSource = Source;
}
diff --git a/clang/include/clang/Lex/TextEncodingConfig.h
b/clang/include/clang/Lex/TextEncodingConfig.h
index 5cf077d61..47d34825f 100644
--- a/clang/include/clang/Lex/TextEncodingConfig.h
+++ b/clang/include/clang/Lex/TextEncodingConfig.h
@@ -23,10 +23,10 @@ class TextEncodingConfig {
public:
llvm::TextEncodingConverter *getConverter(ConversionAction Action) const;
static std::unique_ptr<llvm::TextEncodingConverter>
-#ifdef __MVS__
+#ifdef __MVS__
createInputConverterFromFiletag(__ccsid_t Ccsid,
- clang::DiagnosticsEngine &Diags);
-#endif
+ clang::DiagnosticsEngine &Diags);
+#endif
static std::error_code
setFromInputConverter(TextEncodingConfig &TEC,
std::unique_ptr<llvm::TextEncodingConverter>
Converter);
diff --git a/clang/lib/Basic/SourceManager.cpp
b/clang/lib/Basic/SourceManager.cpp
index e36050847..6e03fdbe8 100644
--- a/clang/lib/Basic/SourceManager.cpp
+++ b/clang/lib/Basic/SourceManager.cpp
@@ -31,8 +31,8 @@
#include "llvm/Support/Endian.h"
#include "llvm/Support/ErrorHandling.h"
#include "llvm/Support/MemoryBuffer.h"
-#include "llvm/Support/raw_ostream.h"
#include "llvm/Support/SmallVectorMemoryBuffer.h"
+#include "llvm/Support/raw_ostream.h"
#include <algorithm>
#include <cassert>
#include <cstddef>
@@ -122,7 +122,8 @@ ContentCache::getBufferOrNone(DiagnosticsEngine &Diag,
FileManager &FM,
// return paths.
IsBufferInvalid = true;
- // If we have a converter, open the file in binary mode to prevent
autoconversion.
+ // If we have a converter, open the file in binary mode to prevent
+ // autoconversion.
llvm::TextEncodingConverter *Converter = FileIDConverterInfo.getPointer();
bool IsText = (Converter == nullptr);
auto BufferOrError = FM.getBufferForFile(*ContentsEntry, IsFileVolatile,
@@ -188,9 +189,9 @@ ContentCache::getBufferOrNone(DiagnosticsEngine &Diag,
FileManager &FM,
// TODO: Reclaim memory if the buffer size exceeds the content.
auto NewBuf = std::make_unique<llvm::SmallVectorMemoryBuffer>(
std::move(UTF8Buf), Buffer->getBufferIdentifier());
- Buffer = std::move(NewBuf);
+ Buffer = std::move(NewBuf);
}
- }
+ }
#endif
}
}
@@ -596,7 +597,7 @@ FileID SourceManager::createFileID(FileEntryRef SourceFile,
SrcMgr::ContentCache &IR = getOrCreateContentCache(SourceFile,
isSystem(FileCharacter));
- #ifndef NDEBUG
+#ifndef NDEBUG
// Either the content cache has never been used for a FileID (and, if we are
// being asked to use a converter, there should be no valid buffer set up for
// it) or the conversion (or lack thereof) should be the same as that used
@@ -612,7 +613,7 @@ FileID SourceManager::createFileID(FileEntryRef SourceFile,
// If this is a named pipe, immediately load the buffer to ensure subsequent
// calls to ContentCache::getSize() are accurate.
// Do the same if character-encoding conversion was requested.
- if (IR.ContentsEntry->isNamedPipe() || Converter)
+ if (IR.ContentsEntry->isNamedPipe() || Converter)
(void)IR.getBufferOrNone(Diag, getFileManager(), SourceLocation());
return createFileIDImpl(IR, SourceFile.getName(), IncludePos, FileCharacter,
diff --git a/clang/lib/Frontend/CompilerInstance.cpp
b/clang/lib/Frontend/CompilerInstance.cpp
index fc04f3291..77cc747f5 100644
--- a/clang/lib/Frontend/CompilerInstance.cpp
+++ b/clang/lib/Frontend/CompilerInstance.cpp
@@ -921,11 +921,12 @@ bool CompilerInstance::InitializeSourceManager(const
FrontendInputFile &Input){
if (!Ccsid.getError() && *Ccsid > 0) {
// Create converter from filetag if it exists
std::unique_ptr<llvm::TextEncodingConverter> InputConverter =
- TextEncodingConfig::createInputConverterFromFiletag(*Ccsid,
getDiagnostics());
+ TextEncodingConfig::createInputConverterFromFiletag(*Ccsid,
+
getDiagnostics());
if (InputConverter)
- TextEncodingConfig::setFromInputConverter(
- PP.getTextEncodingConfig(), std::move(InputConverter));
+ TextEncodingConfig::setFromInputConverter(PP.getTextEncodingConfig(),
+ std::move(InputConverter));
}
#endif
@@ -934,7 +935,7 @@ bool CompilerInstance::InitializeSourceManager(const
FrontendInputFile &Input){
}
return InitializeSourceManager(Input, Converter, getDiagnostics(),
- getFileManager(), getSourceManager());
+ getFileManager(), getSourceManager());
}
// static
@@ -956,14 +957,15 @@ bool CompilerInstance::InitializeSourceManager(
StringRef InputFile = Input.getFile();
- // If we have a converter, open the file in binary mode to avoid
autoconversion.
+ // If we have a converter, open the file in binary mode to avoid
+ // autoconversion.
bool IsText = (Converter == nullptr);
// Figure out where to get and map in the main file.
auto FileOrErr = InputFile == "-"
? FileMgr.getSTDIN()
: FileMgr.getFileRef(InputFile, /*OpenFile=*/true,
- /*CacheFailure=*/true, IsText);
+ /*CacheFailure=*/true, IsText);
if (!FileOrErr) {
auto EC = llvm::errorToErrorCode(FileOrErr.takeError());
if (InputFile != "-")
@@ -974,7 +976,7 @@ bool CompilerInstance::InitializeSourceManager(
}
SourceMgr.setMainFileID(
- SourceMgr.createFileID(*FileOrErr, SourceLocation(), Kind, Converter));
+ SourceMgr.createFileID(*FileOrErr, SourceLocation(), Kind, Converter));
assert(SourceMgr.getMainFileID().isValid() &&
"Couldn't establish MainFileID!");
diff --git a/clang/lib/Frontend/VerifyDiagnosticConsumer.cpp
b/clang/lib/Frontend/VerifyDiagnosticConsumer.cpp
index 2afe99076..1c28259a4 100644
--- a/clang/lib/Frontend/VerifyDiagnosticConsumer.cpp
+++ b/clang/lib/Frontend/VerifyDiagnosticConsumer.cpp
@@ -612,7 +612,7 @@ static bool ParseDirective(StringRef S, ExpectedData *ED,
SourceManager &SM,
FileID FID = SM.translateFile(*File);
if (FID.isInvalid())
FID = SM.createFileID(*File, Pos, SrcMgr::C_User,
- /*Converter=*/nullptr);
+ /*Converter=*/nullptr);
if (PH.Next(Line) && Line > 0)
ExpectedLoc = SM.translateLineCol(FID, Line, 1);
diff --git a/clang/lib/Lex/ModuleMap.cpp b/clang/lib/Lex/ModuleMap.cpp
index c7c1e04b7..ea1901503 100644
--- a/clang/lib/Lex/ModuleMap.cpp
+++ b/clang/lib/Lex/ModuleMap.cpp
@@ -1473,10 +1473,10 @@ bool ModuleMap::parseModuleMapFile(FileEntryRef File,
bool IsSystem,
if (LocalFID.isInvalid()) {
auto FileCharacter =
IsSystem ? SrcMgr::C_System_ModuleMap : SrcMgr::C_User_ModuleMap;
- // FIXME: Module map files are also textual "source files". For
consistency,
- // conversion should occur.
+ // FIXME: Module map files are also textual "source files". For
+ // consistency, conversion should occur.
LocalFID = SourceMgr.createFileID(File, ExternModuleLoc, FileCharacter,
- /*Converter=*/nullptr);
+ /*Converter=*/nullptr);
}
ID = LocalFID;
}
diff --git a/clang/lib/Lex/TextEncodingConfig.cpp
b/clang/lib/Lex/TextEncodingConfig.cpp
index a0cf1e62c..b0a137305 100644
--- a/clang/lib/Lex/TextEncodingConfig.cpp
+++ b/clang/lib/Lex/TextEncodingConfig.cpp
@@ -49,8 +49,7 @@ TextEncodingConfig::createInputConverterFromFiletag(
return nullptr;
}
-std::error_code
-TextEncodingConfig::setFromInputConverter(
+std::error_code TextEncodingConfig::setFromInputConverter(
TextEncodingConfig &TEC,
std::unique_ptr<llvm::TextEncodingConverter> Converter) {
TEC.FromInputEncodingConverter = std::move(Converter);
diff --git a/clang/lib/Serialization/ASTReader.cpp
b/clang/lib/Serialization/ASTReader.cpp
index 7bc28a279..3d2eb8e48 100644
--- a/clang/lib/Serialization/ASTReader.cpp
+++ b/clang/lib/Serialization/ASTReader.cpp
@@ -2006,7 +2006,7 @@ bool ASTReader::ReadSLocEntry(int ID) {
// true and the associated handling will trigger.
FileID FID = SourceMgr.createFileID(*File, IncludeLoc, FileCharacter,
/*Converter=*/nullptr, ID,
- BaseOffset + Record[0]);
+ BaseOffset + Record[0]);
SrcMgr::FileInfo &FileInfo = SourceMgr.getSLocEntry(FID).getFile();
FileInfo.NumCreatedFIDs = Record[5];
if (Record[3])
diff --git a/llvm/include/llvm/Support/TextEncoding.h
b/llvm/include/llvm/Support/TextEncoding.h
index 75d4e40bf..39b805fc9 100644
--- a/llvm/include/llvm/Support/TextEncoding.h
+++ b/llvm/include/llvm/Support/TextEncoding.h
@@ -137,9 +137,8 @@ public:
}
};
-
- // Maps the encoding name to enum constant if possible.
- static std::optional<TextEncoding> getKnownEncoding(StringRef Name);
+// Maps the encoding name to enum constant if possible.
+static std::optional<TextEncoding> getKnownEncoding(StringRef Name);
} // namespace llvm
diff --git a/llvm/lib/Support/TextEncoding.cpp
b/llvm/lib/Support/TextEncoding.cpp
index bca1d9c94..b89357cf8 100644
--- a/llvm/lib/Support/TextEncoding.cpp
+++ b/llvm/lib/Support/TextEncoding.cpp
@@ -48,7 +48,7 @@ static void normalizeCharSetName(StringRef CSName,
}
// Maps the encoding name to enum constant if possible.
-std::optional<TextEncoding>
+std::optional<TextEncoding>
TextEncodingConverter::getKnownEncoding(StringRef Name) {
SmallString<16> Normalized;
normalizeCharSetName(Name, Normalized);
``````````
</details>
https://github.com/llvm/llvm-project/pull/201187
_______________________________________________
cfe-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
