Skip to content

Commit cd7b88b

Browse files
committed
Address review comments and clang-format
1 parent 5c23a27 commit cd7b88b

File tree

2 files changed

+13
-10
lines changed

2 files changed

+13
-10
lines changed

clang/lib/Driver/Driver.cpp

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7452,21 +7452,24 @@ void Driver::BuildActions(Compilation &C, DerivedArgList &Args,
74527452
// object.
74537453
bool FPGAEarly = true;
74547454
if (auto *A = C.getInputArgs().getLastArg(options::OPT_fsycl_link_EQ))
7455-
FPGAEarly = (A->getValue() != StringRef("image"));
7455+
FPGAEarly = A->getValue() == StringRef("early");
74567456

74577457
Action *WrapperAction;
74587458
if ((LI->getType() == types::TY_FPGA_AOCR ||
7459-
LI->getType() == types::TY_FPGA_AOCR_EMU) && !FPGAEarly) {
7459+
LI->getType() == types::TY_FPGA_AOCR_EMU) &&
7460+
!FPGAEarly) {
74607461
auto *RenameAction = C.MakeAction<FileTableTformJobAction>(
7461-
LI, types::TY_Tempfilelist, types::TY_Tempfilelist);
7462-
RenameAction->addRenameColumnTform(
7463-
FileTableTformJobAction::COL_ZERO,
7464-
FileTableTformJobAction::COL_CODE);
7462+
LI, types::TY_Tempfilelist, types::TY_Tempfilelist);
7463+
RenameAction->addRenameColumnTform(FileTableTformJobAction::COL_ZERO,
7464+
FileTableTformJobAction::COL_CODE);
74657465
ActionList WrapperItems({RenameAction});
7466-
WrapperAction = C.MakeAction<OffloadWrapperJobAction>(WrapperItems, types::TY_LLVM_BC);
7466+
WrapperAction = C.MakeAction<OffloadWrapperJobAction>(
7467+
WrapperItems, types::TY_LLVM_BC);
74677468
} else
7468-
WrapperAction = C.MakeAction<OffloadWrapperJobAction>(LI, types::TY_LLVM_BC);
7469-
auto *ASM = C.MakeAction<BackendJobAction>(WrapperAction, types::TY_PP_Asm);
7469+
WrapperAction =
7470+
C.MakeAction<OffloadWrapperJobAction>(LI, types::TY_LLVM_BC);
7471+
auto *ASM =
7472+
C.MakeAction<BackendJobAction>(WrapperAction, types::TY_PP_Asm);
74707473
auto *OBJ = C.MakeAction<AssembleJobAction>(ASM, types::TY_Object);
74717474
OffloadAction::HostDependence HDep(
74727475
*OBJ, *C.getSingleOffloadToolChain<Action::OFK_Host>(),

clang/lib/Driver/ToolChains/Clang.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10325,7 +10325,7 @@ void OffloadWrapper::ConstructJob(Compilation &C, const JobAction &JA,
1032510325

1032610326
if (Inputs[I].getType() == types::TY_Tempfiletable ||
1032710327
Inputs[I].getType() == types::TY_Tempfilelist)
10328-
// wrapper actual input files are passed via the batch job file table:
10328+
// Input files are passed via the batch job file table.
1032910329
CmdArgs.push_back(C.getArgs().MakeArgString("-batch"));
1033010330

1033110331
// Add input.

0 commit comments

Comments
 (0)