fix merge

Signed-off-by: Sarnie, Nick <nick.sarnie@intel.com>
intel · Sep 18, 2024 · 8c4edb3 · 8c4edb3
1 parent d3ccfd1
commit 8c4edb3
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 86 deletions.
diff --git a/clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp b/clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp
@@ -2641,13 +2641,6 @@ Expected<SmallVector<StringRef>> linkAndWrapDeviceFiles(
     if (HasSYCLOffloadKind) {
       StringRef TmpOutput;
       if (!sycl::isSYCLThinLTO(Args, Triple)) {
-        // Write device inputs to an output file for the linker.
-        for (const OffloadFile &File : Input) {
-          auto FileNameOrErr = writeOffloadFile(File);
-          if (!FileNameOrErr)
-            return FileNameOrErr.takeError();
-          InputFiles.emplace_back(*FileNameOrErr);
-        }
         // Link the input device files using the device linker for SYCL
         // offload.
         auto TmpOutputOrErr = sycl::linkDevice(InputFiles, LinkerArgs);

diff --git a/foo b/foo
diff --git a/llvm/include/llvm/Object/OffloadBinary.h b/llvm/include/llvm/Object/OffloadBinary.h
@@ -103,14 +103,6 @@ class OffloadBinary : public Binary {
 
   StringRef getString(StringRef Key) const { return StringData.lookup(Key); }
 
-  /// XXX: Hack
-  const SmallVectorImpl<std::string> &getTmpStrings() const {
-    return TmpStringData;
-  }
-
-  /// XXX: Hack
-  void addTmpString(std::string Value) { TmpStringData.push_back(Value); }
-
   static bool classof(const Binary *V) { return V->isOffloadFile(); }
 
   struct Header {
@@ -159,9 +151,6 @@ class OffloadBinary : public Binary {
   const Header *TheHeader;
   /// Location of the metadata entries within the binary.
   const Entry *TheEntry;
-
-  /// XXX: Hack
-  SmallVector<std::string, 8> TmpStringData;
 };
 
 /// A class to contain the binary information for a single OffloadBinary that