From 885573e1e2fba3db76d8a7d101eb6a16806dcc4c Mon Sep 17 00:00:00 2001
From: Chris Kitching <chriskitching@linux.com>
Date: Sun, 15 Oct 2017 10:56:31 +0100
Subject: [PATCH] Cope with Replacements now having llvm::Error returns

---
 hipamd/hipify-clang/src/Cuda2Hip.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/hipamd/hipify-clang/src/Cuda2Hip.cpp b/hipamd/hipify-clang/src/Cuda2Hip.cpp
index ef53afaaf3..816ca4bc3d 100644
--- a/hipamd/hipify-clang/src/Cuda2Hip.cpp
+++ b/hipamd/hipify-clang/src/Cuda2Hip.cpp
@@ -2928,7 +2928,13 @@ protected:
   std::string mainFileName;
 
   virtual void insertReplacement(const Replacement &rep, const FullSourceLoc &fullSL) {
+#if LLVM_VERSION_MAJOR > 3
+    // New clang added error checking to Replacements, and *insists* that you explicitly check it.
+    llvm::Error e = Replace->add(rep);
+#else
+    // In older versions, it's literally an std::set<Replacement>
     Replace->insert(rep);
+#endif
     if (PrintStats) {
       LOCs.insert(fullSL.getExpansionLineNumber());
     }