From 56d0ebe7c24815335ed50bfaf0eb76b211bbb6ba Mon Sep 17 00:00:00 2001
From: Reid Kleckner <rnk@google.com>
Date: Wed, 6 Jun 2018 01:44:10 +0000
Subject: [PATCH] Fix std::tuple errors

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@334060 91177308-0d34-0410-b5e6-96231b3b80d8
---
 lib/CodeGen/CGBuiltin.cpp | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/lib/CodeGen/CGBuiltin.cpp b/lib/CodeGen/CGBuiltin.cpp
index f65230a0f2..5829396b0f 100644
--- a/lib/CodeGen/CGBuiltin.cpp
+++ b/lib/CodeGen/CGBuiltin.cpp
@@ -492,30 +492,30 @@ static std::tuple<char, char, bool>
 getBitTestActionSizeAndLocking(unsigned BuiltinID) {
   switch (BuiltinID) {
   case Builtin::BI_bittest:
-    return {'\0', 'l', false};
+    return std::make_tuple('\0', 'l', false);
   case Builtin::BI_bittestandcomplement:
-    return {'c', 'l', false};
+    return std::make_tuple('c', 'l', false);
   case Builtin::BI_bittestandreset:
-    return {'r', 'l', false};
+    return std::make_tuple('r', 'l', false);
   case Builtin::BI_bittestandset:
-    return {'s', 'l', false};
+    return std::make_tuple('s', 'l', false);
   case Builtin::BI_interlockedbittestandreset:
-    return {'r', 'l', /*Locked=*/true};
+    return std::make_tuple('r', 'l', /*Locked=*/true);
   case Builtin::BI_interlockedbittestandset:
-    return {'s', 'l', /*Locked=*/true};
+    return std::make_tuple('s', 'l', /*Locked=*/true);
 
   case Builtin::BI_bittest64:
-    return {'\0', 'q', false};
+    return std::make_tuple('\0', 'q', false);
   case Builtin::BI_bittestandcomplement64:
-    return {'c', 'q', false};
+    return std::make_tuple('c', 'q', false);
   case Builtin::BI_bittestandreset64:
-    return {'r', 'q', false};
+    return std::make_tuple('r', 'q', false);
   case Builtin::BI_bittestandset64:
-    return {'s', 'q', false};
+    return std::make_tuple('s', 'q', false);
   case Builtin::BI_interlockedbittestandreset64:
-    return {'r', 'q', /*Locked=*/true};
+    return std::make_tuple('r', 'q', /*Locked=*/true);
   case Builtin::BI_interlockedbittestandset64:
-    return {'s', 'q', /*Locked=*/true};
+    return std::make_tuple('s', 'q', /*Locked=*/true);
   }
   llvm_unreachable("expected only bittest builtins");
 }
-- 
2.40.0