Skip to content

Commit 31cfb3f

Browse files
[clang] Remove redundant calls to c_str() (NFC)
Identified with readability-redundant-string-cstr.
1 parent 10316a6 commit 31cfb3f

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

clang/lib/CodeGen/CGOpenMPRuntime.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -9551,7 +9551,7 @@ emitMappingInformation(CodeGenFunction &CGF, llvm::OpenMPIRBuilder &OMPBuilder,
95519551
}
95529552

95539553
PresumedLoc PLoc = CGF.getContext().getSourceManager().getPresumedLoc(Loc);
9554-
return OMPBuilder.getOrCreateSrcLocStr(PLoc.getFilename(), ExprName.c_str(),
9554+
return OMPBuilder.getOrCreateSrcLocStr(PLoc.getFilename(), ExprName,
95559555
PLoc.getLine(), PLoc.getColumn());
95569556
}
95579557

clang/lib/Driver/ToolChains/CommonArgs.cpp

+8-8
Original file line numberDiff line numberDiff line change
@@ -1724,7 +1724,7 @@ bool tools::GetSDLFromOffloadArchive(
17241724
std::string OutputLib = D.GetTemporaryPath(
17251725
Twine(Prefix + Lib + "-" + Arch + "-" + Target).str(), "a");
17261726

1727-
C.addTempFile(C.getArgs().MakeArgString(OutputLib.c_str()));
1727+
C.addTempFile(C.getArgs().MakeArgString(OutputLib));
17281728

17291729
ArgStringList CmdArgs;
17301730
SmallString<128> DeviceTriple;
@@ -1747,20 +1747,20 @@ bool tools::GetSDLFromOffloadArchive(
17471747
T.getToolChain().GetProgramPath("clang-offload-bundler"));
17481748

17491749
ArgStringList UBArgs;
1750-
UBArgs.push_back(C.getArgs().MakeArgString(UnbundleArg.c_str()));
1751-
UBArgs.push_back(C.getArgs().MakeArgString(TypeArg.c_str()));
1752-
UBArgs.push_back(C.getArgs().MakeArgString(InputArg.c_str()));
1753-
UBArgs.push_back(C.getArgs().MakeArgString(OffloadArg.c_str()));
1754-
UBArgs.push_back(C.getArgs().MakeArgString(OutputArg.c_str()));
1750+
UBArgs.push_back(C.getArgs().MakeArgString(UnbundleArg));
1751+
UBArgs.push_back(C.getArgs().MakeArgString(TypeArg));
1752+
UBArgs.push_back(C.getArgs().MakeArgString(InputArg));
1753+
UBArgs.push_back(C.getArgs().MakeArgString(OffloadArg));
1754+
UBArgs.push_back(C.getArgs().MakeArgString(OutputArg));
17551755

17561756
// Add this flag to not exit from clang-offload-bundler if no compatible
17571757
// code object is found in heterogenous archive library.
17581758
std::string AdditionalArgs("-allow-missing-bundles");
1759-
UBArgs.push_back(C.getArgs().MakeArgString(AdditionalArgs.c_str()));
1759+
UBArgs.push_back(C.getArgs().MakeArgString(AdditionalArgs));
17601760

17611761
C.addCommand(std::make_unique<Command>(
17621762
JA, T, ResponseFileSupport::AtFileCurCP(), UBProgram, UBArgs, Inputs,
1763-
InputInfo(&JA, C.getArgs().MakeArgString(OutputLib.c_str()))));
1763+
InputInfo(&JA, C.getArgs().MakeArgString(OutputLib))));
17641764
if (postClangLink)
17651765
CC1Args.push_back("-mlink-builtin-bitcode");
17661766

clang/tools/clang-nvlink-wrapper/ClangNvlinkWrapper.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ static Error runNVLink(std::string NVLinkPath,
6363
NVLArgs.push_back(Arg);
6464
}
6565

66-
if (sys::ExecuteAndWait(NVLinkPath.c_str(), NVLArgs))
66+
if (sys::ExecuteAndWait(NVLinkPath, NVLArgs))
6767
return createStringError(inconvertibleErrorCode(), "'nvlink' failed");
6868
return Error::success();
6969
}

0 commit comments

Comments
 (0)