Skip to content

Commit

Permalink
rustc_llvm: adapt to flattened CLI args in LLVM
Browse files Browse the repository at this point in the history
This changed in
llvm/llvm-project@e190d07. I decided to
stick with more duplication between the ifdef blocks to make the code
easier to read for the next two years before we can plausibly drop LLVM
19.

@rustbot label: +llvm-main
  • Loading branch information
durin42 committed Sep 16, 2024
1 parent 3a22be3 commit b73d755
Showing 1 changed file with 18 additions and 1 deletion.
19 changes: 18 additions & 1 deletion compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -498,6 +498,21 @@ extern "C" LLVMTargetMachineRef LLVMRustCreateTargetMachine(
Options.EmitStackSizeSection = EmitStackSizeSection;

if (ArgsCstrBuff != nullptr) {
#if LLVM_VERSION_GE(20, 0)
int buffer_offset = 0;
assert(ArgsCstrBuff[ArgsCstrBuffLen - 1] == '\0');
std::string Arg0(ArgsCstrBuff);
buffer_offset = Arg0.size()+1;
std::string ArgsCppStr(ArgsCstrBuff+buffer_offset, ArgsCstrBuffLen-1);
auto i = 0;
while (i != std::string::npos) {
i = ArgsCppStr.find('\0', i+1);
if (i != std::string::npos)
ArgsCppStr.replace(i, i+1, " ");
}
Options.MCOptions.Argv0 = std::string(Arg0);
Options.MCOptions.CommandlineArgs = ArgsCppStr;
#else
int buffer_offset = 0;
assert(ArgsCstrBuff[ArgsCstrBuffLen - 1] == '\0');

Expand All @@ -523,6 +538,7 @@ extern "C" LLVMTargetMachineRef LLVMRustCreateTargetMachine(
Options.MCOptions.Argv0 = arg0;
Options.MCOptions.CommandLineArgs =
llvm::ArrayRef<std::string>(cmd_arg_strings, num_cmd_arg_strings);
#endif
}

TargetMachine *TM = TheTarget->createTargetMachine(
Expand All @@ -531,10 +547,11 @@ extern "C" LLVMTargetMachineRef LLVMRustCreateTargetMachine(
}

extern "C" void LLVMRustDisposeTargetMachine(LLVMTargetMachineRef TM) {

#if LLVM_VERSION_LT(20, 0)
MCTargetOptions &MCOptions = unwrap(TM)->Options.MCOptions;
delete[] MCOptions.Argv0;
delete[] MCOptions.CommandLineArgs.data();
#endif

delete unwrap(TM);
}
Expand Down

0 comments on commit b73d755

Please sign in to comment.