bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

[llvm/PassWrapper] use size_t when building arg strings

Browse source
This commit is contained in:
Josh Stone 2025-03-06 10:09:19 -08:00
parent 30f168ef81
commit feae27945b
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp
View file

@ -484,7 +484,7 @@ extern "C" LLVMTargetMachineRef LLVMRustCreateTargetMachine(
if (ArgsCstrBuff != nullptr) { if (ArgsCstrBuff != nullptr) {
#if LLVM_VERSION_GE(20, 0) #if LLVM_VERSION_GE(20, 0)
int buffer_offset = 0; size_t buffer_offset = 0;
assert(ArgsCstrBuff[ArgsCstrBuffLen - 1] == '\0'); assert(ArgsCstrBuff[ArgsCstrBuffLen - 1] == '\0');
auto Arg0 = std::string(ArgsCstrBuff); auto Arg0 = std::string(ArgsCstrBuff);
buffer_offset = Arg0.size() + 1; buffer_offset = Arg0.size() + 1;
@ -502,7 +502,7 @@ extern "C" LLVMTargetMachineRef LLVMRustCreateTargetMachine(
Options.MCOptions.Argv0 = Arg0; Options.MCOptions.Argv0 = Arg0;
Options.MCOptions.CommandlineArgs = CommandlineArgs; Options.MCOptions.CommandlineArgs = CommandlineArgs;
#else #else
int buffer_offset = 0; size_t buffer_offset = 0;
assert(ArgsCstrBuff[ArgsCstrBuffLen - 1] == '\0'); assert(ArgsCstrBuff[ArgsCstrBuffLen - 1] == '\0');
const size_t arg0_len = std::strlen(ArgsCstrBuff); const size_t arg0_len = std::strlen(ArgsCstrBuff);
@ -511,13 +511,13 @@ extern "C" LLVMTargetMachineRef LLVMRustCreateTargetMachine(
arg0[arg0_len] = '\0'; arg0[arg0_len] = '\0';
buffer_offset += arg0_len + 1; buffer_offset += arg0_len + 1;
const int num_cmd_arg_strings = std::count( const size_t num_cmd_arg_strings = std::count(
&ArgsCstrBuff[buffer_offset], &ArgsCstrBuff[ArgsCstrBuffLen], '\0'); &ArgsCstrBuff[buffer_offset], &ArgsCstrBuff[ArgsCstrBuffLen], '\0');
std::string *cmd_arg_strings = new std::string[num_cmd_arg_strings]; std::string *cmd_arg_strings = new std::string[num_cmd_arg_strings];
for (int i = 0; i < num_cmd_arg_strings; ++i) { for (size_t i = 0; i < num_cmd_arg_strings; ++i) {
assert(buffer_offset < ArgsCstrBuffLen); assert(buffer_offset < ArgsCstrBuffLen);
const int len = std::strlen(ArgsCstrBuff + buffer_offset); const size_t len = std::strlen(ArgsCstrBuff + buffer_offset);
cmd_arg_strings[i] = std::string(&ArgsCstrBuff[buffer_offset], len); cmd_arg_strings[i] = std::string(&ArgsCstrBuff[buffer_offset], len);
buffer_offset += len + 1; buffer_offset += len + 1;
} }