This repository was archived by the owner on May 28, 2025. It is now read-only.

Commit 1f9a018

committed

Auto merge of rust-lang#130446 - durin42:llvm-20-fix-CommandLineArgs, r=workingjubilee

rustc_llvm: adapt to flattened CLI args in LLVM 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 try-job: x86_64-msvc

2 parents 6ce3767 + 86d67b7 commit 1f9a018Copy full SHA for 1f9a018

File tree

1 file changed

+19

-1

lines changed

compiler/rustc_llvm/llvm-wrapper
- PassWrapper.cpp

1 file changed

+19

-1

lines changed

`‎compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp`

Lines changed: 19 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -485,6 +485,22 @@ extern "C" LLVMTargetMachineRef LLVMRustCreateTargetMachine(`
`485`	`485`	`Options.EmitStackSizeSection = EmitStackSizeSection;`
`486`	`486`
`487`	`487`	`if (ArgsCstrBuff != nullptr) {`
	`488`	`+#if LLVM_VERSION_GE(20, 0)`
	`489`	`+ int buffer_offset = 0;`
	`490`	`+ assert(ArgsCstrBuff[ArgsCstrBuffLen - 1] == '0円');`
	`491`	`+ auto Arg0 = std::string(ArgsCstrBuff);`
	`492`	`+ buffer_offset = Arg0.size() + 1;`
	`493`	`+ auto ArgsCppStr =`
	`494`	`+ std::string(ArgsCstrBuff + buffer_offset, ArgsCstrBuffLen - 1);`
	`495`	`+ auto i = 0;`
	`496`	`+ while (i != std::string::npos) {`
	`497`	`+ i = ArgsCppStr.find('0円', i + 1);`
	`498`	`+ if (i != std::string::npos)`
	`499`	`+ ArgsCppStr.replace(i, i + 1, " ");`
	`500`	`+ }`
	`501`	`+ Options.MCOptions.Argv0 = Arg0;`
	`502`	`+ Options.MCOptions.CommandlineArgs = ArgsCppStr;`
	`503`	`+#else`
`488`	`504`	`int buffer_offset = 0;`
`489`	`505`	`assert(ArgsCstrBuff[ArgsCstrBuffLen - 1] == '0円');`
`490`	`506`
`@@ -510,6 +526,7 @@ extern "C" LLVMTargetMachineRef LLVMRustCreateTargetMachine(`
`510`	`526`	`Options.MCOptions.Argv0 = arg0;`
`511`	`527`	`Options.MCOptions.CommandLineArgs =`
`512`	`528`	`llvm::ArrayRef<std::string>(cmd_arg_strings, num_cmd_arg_strings);`
	`529`	`+#endif`
`513`	`530`	`}`
`514`	`531`
`515`	`532`	`TargetMachine *TM = TheTarget->createTargetMachine(`
`@@ -518,10 +535,11 @@ extern "C" LLVMTargetMachineRef LLVMRustCreateTargetMachine(`
`518`	`535`	`}`
`519`	`536`
`520`	`537`	`extern "C" void LLVMRustDisposeTargetMachine(LLVMTargetMachineRef TM) {`
`521`		`-`
	`538`	`+#if LLVM_VERSION_LT(20, 0)`
`522`	`539`	`MCTargetOptions &MCOptions = unwrap(TM)->Options.MCOptions;`
`523`	`540`	`delete[] MCOptions.Argv0;`
`524`	`541`	`delete[] MCOptions.CommandLineArgs.data();`
	`542`	`+#endif`
`525`	`543`
`526`	`544`	`delete unwrap(TM);`
`527`	`545`	`}`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 1f9a018

File tree

1 file changed

1 file changed

`‎compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp`

0 commit comments