From 3084a5909ee1137f3736b9a011fbe8f10445aa67 Mon Sep 17 00:00:00 2001
From: kbobrovs <Konstantin.S.Bobrovsky@intel.com>
Date: Thu, 1 Jul 2021 00:01:42 -0700
Subject: [PATCH 1/2] Fix debug build mangler test after PR#3992 (8f38045).

Signed-off-by: kbobrovs <Konstantin.S.Bobrovsky@intel.com>
---
 llvm/include/llvm/Demangle/ItaniumDemangle.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/llvm/include/llvm/Demangle/ItaniumDemangle.h b/llvm/include/llvm/Demangle/ItaniumDemangle.h
index a1a4783c9cce9..95955574a1dc0 100644
--- a/llvm/include/llvm/Demangle/ItaniumDemangle.h
+++ b/llvm/include/llvm/Demangle/ItaniumDemangle.h
@@ -27,6 +27,7 @@
 #include <cstdlib>
 #include <cstring>
 #include <numeric>
+#include <string>
 #include <utility>
 
 #define FOR_EACH_NODE_KIND(X) \

From b57c6bf3b16e6d3f6c052ba9ba3616a24e0beae5 Mon Sep 17 00:00:00 2001
From: kbobrovs <Konstantin.S.Bobrovsky@intel.com>
Date: Thu, 1 Jul 2021 09:54:46 -0700
Subject: [PATCH 2/2] address review comment

Signed-off-by: kbobrovs <Konstantin.S.Bobrovsky@intel.com>
---
 llvm/include/llvm/Demangle/ItaniumDemangle.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/llvm/include/llvm/Demangle/ItaniumDemangle.h b/llvm/include/llvm/Demangle/ItaniumDemangle.h
index 95955574a1dc0..77ce87edaa204 100644
--- a/llvm/include/llvm/Demangle/ItaniumDemangle.h
+++ b/llvm/include/llvm/Demangle/ItaniumDemangle.h
@@ -27,7 +27,6 @@
 #include <cstdlib>
 #include <cstring>
 #include <numeric>
-#include <string>
 #include <utility>
 
 #define FOR_EACH_NODE_KIND(X) \
@@ -3906,7 +3905,7 @@ Node *AbstractManglingParser<Derived, Alloc>::parseType() {
       StringView N = parseNumber(false /*disallow negatives*/);
       if (N.size() == 0 || look() != '_')
         return nullptr;
-      assert((std::string(N.begin(), N.end()) == "16") && "Unknown FP type");
+      assert((N == "16") && "Unknown FP type");
       First += 1;                        // consume '_'
       return make<NameType>("_Float16"); // use FE-supoprted spelling
     }