[llvm] 54b014b - [llvm-jitlink] Use '@' rather than ':' for separator in -sectcreate.

[Lang Hames via llvm-commits]

Author: Lang Hames
Date: 2024-02-20T15:05:42-08:00
New Revision: 54b014b3f76e1c0060bd129e1196b6c729cb30b0

URL: https://github.com/llvm/llvm-project/commit/54b014b3f76e1c0060bd129e1196b6c729cb30b0
DIFF: https://github.com/llvm/llvm-project/commit/54b014b3f76e1c0060bd129e1196b6c729cb30b0.diff

LOG: [llvm-jitlink] Use '@' rather than ':' for separator in -sectcreate.

This should avoid the issue with Windows paths that have caused failures on
some builders.

Added: 
    

Modified: 
    llvm/test/ExecutionEngine/JITLink/Generic/sectcreate.test
    llvm/tools/llvm-jitlink/llvm-jitlink.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/test/ExecutionEngine/JITLink/Generic/sectcreate.test b/llvm/test/ExecutionEngine/JITLink/Generic/sectcreate.test
index 244827196f485e..33ad5515a6357a 100644
--- 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/sectcreate-data.txt at 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
index f6280779ded10f..f0b8310a32efd3 100644
--- a/llvm/tools/llvm-jitlink/llvm-jitlink.cpp
+++ b/llvm/tools/llvm-jitlink/llvm-jitlink.cpp
@@ -165,7 +165,7 @@ static cl::list<std::string>
 
 static cl::list<std::string>
     SectCreate("sectcreate",
-               cl::desc("given <sectname>,<filename>[:<sym>=<offset>,...]  "
+               cl::desc("given <sectname>,<filename>[@<sym>=<offset>,...]  "
                         "add the content of <filename> to <sectname>"),
                cl::cat(JITLinkCategory));
 
@@ -1683,7 +1683,7 @@ static Error addSectCreates(Session &S,
 
     StringRef SCArg(*SCItr);
 
-    auto [SectAndFileName, ExtraSymbolsString] = SCArg.split(':');
+    auto [SectAndFileName, ExtraSymbolsString] = SCArg.split('@');
     auto [SectName, FileName] = SectAndFileName.rsplit(',');
     if (SectName.empty())
       return make_error<StringError>("In -sectcreate=" + SCArg +