[JITLink] Use rsplit on -sectcreate argument in llvm-jitlink (llv…

…m#115511) This accounts for cases where the file path may contain an `@` symbol. In such cases, the split occurs too early causing argument parsing to fail.
sun-jacobi · Nov 10, 2024 · d822c09 · d822c09
1 parent 4edd711
commit d822c09
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/...ITLink/Generic/Inputs/sectcreate-data.txt → ...ic/Inputs/sect@create/sectcreate-data.txt b/...ITLink/Generic/Inputs/sectcreate-data.txt → ...ic/Inputs/sect@create/sectcreate-data.txt
diff --git a/llvm/test/ExecutionEngine/JITLink/Generic/sectcreate.test b/llvm/test/ExecutionEngine/JITLink/Generic/sectcreate.test
@@ -1,6 +1,6 @@
 # RUN: llc -filetype=obj -o %t.o %S/Inputs/main-ret-0.ll
 # RUN: llvm-jitlink -noexec \
-# RUN:   -sectcreate __data,%S/Inputs/sectcreate-data.txt@foo=0 \
+# RUN:   -sectcreate __data,%S/Inputs/sect@create/sectcreate-data.txt@foo=0 \
 # RUN:   %t.o
 #
 # Use -sectcreate to create a section from a data file.

diff --git a/llvm/tools/llvm-jitlink/llvm-jitlink.cpp b/llvm/tools/llvm-jitlink/llvm-jitlink.cpp
@@ -1740,7 +1740,7 @@ static Error addSectCreates(Session &S,
 
     StringRef SCArg(*SCItr);
 
-    auto [SectAndFileName, ExtraSymbolsString] = SCArg.split('@');
+    auto [SectAndFileName, ExtraSymbolsString] = SCArg.rsplit('@');
     auto [SectName, FileName] = SectAndFileName.rsplit(',');
     if (SectName.empty())
       return make_error<StringError>("In -sectcreate=" + SCArg +