fix conflcits, lit test

Author: ronlieb

clang/test/Driver/linker-wrapper.c

@@ -2,10 +2,6 @@
 // REQUIRES: x86-registered-target
 // REQUIRES: nvptx-registered-target
 // REQUIRES: amdgpu-registered-target
-<<<<<<< HEAD
-// REQUIRES: system-linux
-=======
->>>>>>> ce9e1d3c15ed6290f1cb07b482939976fa8115cd
 
 // An externally visible variable so static libraries extract.
 __attribute__((visibility("protected"), used)) int x;

clang/test/OpenMP/irbuilder_nested_parallel_for.c

@@ -31,9 +31,6 @@ class CachedFileStream {
   CachedFileStream(std::unique_ptr<raw_pwrite_stream> OS,
                    std::string OSPath = "")
       : OS(std::move(OS)), ObjectPathName(OSPath) {}
-<<<<<<< HEAD
-  virtual Error commit() { return Error::success(); }
-=======
 
   /// Must be called exactly once after the writes to OS have been completed
   /// but before the CachedFileStream object is destroyed.
@@ -47,7 +44,6 @@ class CachedFileStream {
   }
 
   bool Committed = false;
->>>>>>> ce9e1d3c15ed6290f1cb07b482939976fa8115cd
   std::unique_ptr<raw_pwrite_stream> OS;
   std::string ObjectPathName;
   virtual ~CachedFileStream() {

llvm/include/llvm/Support/Caching.h

@@ -188,15 +188,11 @@ class StreamedHTTPResponseHandler : public HTTPResponseHandler {
 public:
   StreamedHTTPResponseHandler(CreateStreamFn CreateStream, HTTPClient &Client)
       : CreateStream(CreateStream), Client(Client) {}
-<<<<<<< HEAD
-  Error commit();
-=======
 
   /// Must be called exactly once after the writes have been completed
   /// but before the StreamedHTTPResponseHandler object is destroyed.
   Error commit();
 
->>>>>>> ce9e1d3c15ed6290f1cb07b482939976fa8115cd
   virtual ~StreamedHTTPResponseHandler() = default;
 
   Error handleBodyChunk(StringRef BodyChunk) override;

llvm/lib/Debuginfod/Debuginfod.cpp

@@ -90,15 +90,9 @@ Expected<FileCache> llvm::localCache(const Twine &CacheNameRef,
             ModuleName(ModuleName), Task(Task) {}
 
       Error commit() override {
-<<<<<<< HEAD
-        if (Committed)
-          return Error::success();
-        Committed = true;
-=======
         Error E = CachedFileStream::commit();
         if (E)
           return E;
->>>>>>> ce9e1d3c15ed6290f1cb07b482939976fa8115cd
 
         // Make sure the stream is closed before committing it.
         OS.reset();
@@ -148,21 +142,6 @@ Expected<FileCache> llvm::localCache(const Twine &CacheNameRef,
 
         AddBuffer(Task, ModuleName, std::move(*MBOrErr));
         return Error::success();
-<<<<<<< HEAD
-      }
-
-      ~CacheStream() {
-        // In Debug builds, try to track down places where commit() was not
-        // called before destruction.
-        assert(Committed);
-        // In Release builds, fall back to the previous behaviour of committing
-        // during destruction and reporting errors with report_fatal_error.
-        if (Committed)
-          return;
-        if (Error Err = commit())
-          report_fatal_error(Twine(toString(std::move(Err))));
-=======
->>>>>>> ce9e1d3c15ed6290f1cb07b482939976fa8115cd
       }
     };
 

llvm/lib/Support/Caching.cpp

@@ -11,14 +11,14 @@ define amdgpu_kernel void @_Z3fooPiiii(ptr addrspace(1) nocapture noundef writeo
 ; CHECK-NEXT:    .cfi_escape 0x0f, 0x04, 0x30, 0x36, 0xe9, 0x02 ;
 ; CHECK-NEXT:    .cfi_undefined 16
 ; CHECK-NEXT:    .file 1 "." "a.h"
-; CHECK-NEXT:    .loc 1 5 12 prologue_end ; ./a.h:5:12 @[ a.hip:12:8 ]
+; CHECK-NEXT:    .loc 1 5 12 prologue_end ; ./a.h:5:12
 ; CHECK-NEXT:    s_load_dwordx4 s[0:3], s[8:9], 0x8
 ; CHECK-NEXT:    s_load_dwordx2 s[4:5], s[8:9], 0x0
 ; CHECK-NEXT:    v_mov_b32_e32 v0, 0
 ; CHECK-NEXT:    s_waitcnt lgkmcnt(0)
 ; CHECK-NEXT:    s_add_i32 s1, s1, s0
 ; CHECK-NEXT:  .Ltmp0:
-; CHECK-NEXT:    .loc 1 5 12 is_stmt 0 ; ./a.h:5:12 @[ a.hip:13:9 ]
+; CHECK-NEXT:    .loc 1 5 12 is_stmt 0 ; ./a.h:5:12
 ; CHECK-NEXT:    s_add_i32 s0, s2, s0
 ; CHECK-NEXT:  .Ltmp1:
 ; CHECK-NEXT:    .file 2 "a.hip"

llvm/test/CodeGen/AMDGPU/dbg-info-inline-at.ll

@@ -1,7 +1,6 @@
 ; This test verifies whether we can outline a singleton instance (i.e., an instance that does not repeat)
 ; by running two codegen rounds.
 ; This test also verifies if caches for the two-round codegens are correctly working.
-; XFAIL: *
 ; REQUIRES: asserts
 ; RUN: rm -rf %t
 ; RUN: split-file %s %t