Skip to content

Commit 27b6710

Browse files
committed
git-clang-format
1 parent 8feb61b commit 27b6710

File tree

3 files changed

+13
-16
lines changed

3 files changed

+13
-16
lines changed

clang/tools/driver/driver.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -364,10 +364,10 @@ int clang_main(int Argc, char **Argv, const llvm::ToolContext &ToolContext) {
364364
if (!SetBackdoorDriverOutputsFromEnvVars(TheDriver))
365365
return 1;
366366

367-
auto ExecuteCC1WithContext =
368-
[&ToolContext, &VFS](SmallVectorImpl<const char *> &ArgV) {
369-
return ExecuteCC1Tool(ArgV, ToolContext, VFS);
370-
};
367+
auto ExecuteCC1WithContext = [&ToolContext,
368+
&VFS](SmallVectorImpl<const char *> &ArgV) {
369+
return ExecuteCC1Tool(ArgV, ToolContext, VFS);
370+
};
371371
if (!UseNewCC1Process) {
372372
TheDriver.CC1Main = ExecuteCC1WithContext;
373373
// Ensure the CC1Command actually catches cc1 crashes

llvm/lib/Support/CommandLine.cpp

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1505,12 +1505,9 @@ void CommandLineParser::ResetAllOptionOccurrences() {
15051505
}
15061506
}
15071507

1508-
bool CommandLineParser::ParseCommandLineOptions(int argc,
1509-
const char *const *argv,
1510-
StringRef Overview,
1511-
raw_ostream *Errs,
1512-
vfs::FileSystem *VFS,
1513-
bool LongOptionsUseDoubleDash) {
1508+
bool CommandLineParser::ParseCommandLineOptions(
1509+
int argc, const char *const *argv, StringRef Overview, raw_ostream *Errs,
1510+
vfs::FileSystem *VFS, bool LongOptionsUseDoubleDash) {
15141511
assert(hasOptions() && "No options specified!");
15151512

15161513
ProgramOverview = Overview;

llvm/unittests/Support/CommandLineTest.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1915,20 +1915,20 @@ TEST(CommandLineTest, LongOptions) {
19151915

19161916
// Fails because `-ab` is treated as `-a -b`, so `-a` is seen twice, and
19171917
// `val1` is unexpected.
1918-
EXPECT_FALSE(cl::ParseCommandLineOptions(4, args1, StringRef(),
1919-
&OS, nullptr, nullptr, true));
1918+
EXPECT_FALSE(cl::ParseCommandLineOptions(4, args1, StringRef(), &OS, nullptr,
1919+
nullptr, true));
19201920
EXPECT_FALSE(Errs.empty()); Errs.clear();
19211921
cl::ResetAllOptionOccurrences();
19221922

19231923
// Works because `-a` is treated differently than `--ab`.
1924-
EXPECT_TRUE(cl::ParseCommandLineOptions(4, args2, StringRef(),
1925-
&OS, nullptr, nullptr, true));
1924+
EXPECT_TRUE(cl::ParseCommandLineOptions(4, args2, StringRef(), &OS, nullptr,
1925+
nullptr, true));
19261926
EXPECT_TRUE(Errs.empty()); Errs.clear();
19271927
cl::ResetAllOptionOccurrences();
19281928

19291929
// Works because `-ab` is treated as `-a -b`, and `--ab` is a long option.
1930-
EXPECT_TRUE(cl::ParseCommandLineOptions(4, args3, StringRef(),
1931-
&OS, nullptr, nullptr, true));
1930+
EXPECT_TRUE(cl::ParseCommandLineOptions(4, args3, StringRef(), &OS, nullptr,
1931+
nullptr, true));
19321932
EXPECT_TRUE(OptA);
19331933
EXPECT_TRUE(OptBLong);
19341934
EXPECT_STREQ("val1", OptAB.c_str());

0 commit comments

Comments
 (0)