Switch RPATH from single string to vector of strings

Author: hoodmane

llvm/include/llvm/BinaryFormat/Wasm.h

@@ -295,7 +295,7 @@ struct WasmDylinkInfo {
   std::vector<StringRef> Needed; // Shared library dependencies
   std::vector<WasmDylinkImportInfo> ImportInfo;
   std::vector<WasmDylinkExportInfo> ExportInfo;
-  StringRef RuntimePath;
+  std::vector<StringRef> RuntimePath;
 };
 
 struct WasmProducerInfo {

llvm/include/llvm/ObjectYAML/WasmYAML.h

@@ -230,7 +230,7 @@ struct DylinkSection : CustomSection {
   std::vector<StringRef> Needed;
   std::vector<DylinkImportInfo> ImportInfo;
   std::vector<DylinkExportInfo> ExportInfo;
-  StringRef RuntimePath;
+  std::vector<StringRef> RuntimePath;
 };
 
 struct NameSection : CustomSection {

llvm/lib/Object/WasmObjectFile.cpp

@@ -485,7 +485,10 @@ Error WasmObjectFile::parseDylink0Section(ReadContext &Ctx) {
       break;
     }
     case wasm::WASM_DYLINK_RUNTIME_PATH: {
-      DylinkInfo.RuntimePath = readString(Ctx);
+      Count = readVaruint32(Ctx);
+      while (Count--) {
+        DylinkInfo.RuntimePath.push_back(readString(Ctx));
+      }
       break;
     }
     default:

llvm/lib/ObjectYAML/WasmEmitter.cpp

@@ -183,7 +183,9 @@ void WasmWriter::writeSectionContent(raw_ostream &OS,
   if (Section.RuntimePath.size()) {
     writeUint8(OS, wasm::WASM_DYLINK_RUNTIME_PATH);
     raw_ostream &SubOS = SubSection.getStream();
-    writeStringRef(Section.RuntimePath, SubOS);
+    encodeULEB128(Section.RuntimePath.size(), SubOS);
+    for (StringRef Path : Section.RuntimePath)
+      writeStringRef(Path, SubOS);
     SubSection.done();
   }
 }

llvm/test/ObjectYAML/wasm/dylink_section.yaml

@@ -11,7 +11,7 @@ Sections:
     TableSize:       1
     TableAlignment:  0
     Needed:          [ libfoo.so, libbar.so ]
-    RuntimePath: $ORIGIN/../lib:$ORIGIN/../../.libs
+    RuntimePath: [ $ORIGIN/../lib, $ORIGIN/../../.libs]
 ...
 # CHECK: --- !WASM
 # CHECK: FileHeader:
@@ -26,5 +26,7 @@ Sections:
 # CHECK:     Needed:
 # CHECK:       - libfoo.so
 # CHECK:       - libbar.so
-# CHECK:     RuntimePath: '$ORIGIN/../lib:$ORIGIN/../../.libs'
+# CHECK:     RuntimePath:
+# CHECK:      - '$ORIGIN/../lib'
+# CHECK:      - '$ORIGIN/../../.libs'
 # CHECK: ...