From a41fd4f9c22fd0328669345c46f0244aed59a42c Mon Sep 17 00:00:00 2001
From: Frederic Riss <friss@apple.com>
Date: Thu, 4 Sep 2014 06:35:09 +0000
Subject: [PATCH] Fix build faliure introduced by r217129.

Looks like one can't put 'const uint8_t' as ArrayRef contained type. It fails to build with libstdc++.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@217132 91177308-0d34-0410-b5e6-96231b3b80d8
---
 include/llvm/DebugInfo/DWARFFormValue.h | 2 +-
 lib/DebugInfo/DWARFFormValue.cpp        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/llvm/DebugInfo/DWARFFormValue.h b/include/llvm/DebugInfo/DWARFFormValue.h
index 2dde8fe242a..162b1deec0f 100644
--- a/include/llvm/DebugInfo/DWARFFormValue.h
+++ b/include/llvm/DebugInfo/DWARFFormValue.h
@@ -70,7 +70,7 @@ public:
   Optional<const char *> getAsCString(const DWARFUnit *U) const;
   Optional<uint64_t> getAsAddress(const DWARFUnit *U) const;
   Optional<uint64_t> getAsSectionOffset() const;
-  Optional<ArrayRef<const uint8_t>> getAsBlock() const;
+  Optional<ArrayRef<uint8_t>> getAsBlock() const;
 
   bool skipValue(DataExtractor debug_info_data, uint32_t *offset_ptr,
                  const DWARFUnit *u) const;
diff --git a/lib/DebugInfo/DWARFFormValue.cpp b/lib/DebugInfo/DWARFFormValue.cpp
index 2f8affc8623..8bd3a89411e 100644
--- a/lib/DebugInfo/DWARFFormValue.cpp
+++ b/lib/DebugInfo/DWARFFormValue.cpp
@@ -549,9 +549,9 @@ Optional<uint64_t> DWARFFormValue::getAsUnsignedConstant() const {
   return Value.uval;
 }
 
-Optional<ArrayRef<const uint8_t>> DWARFFormValue::getAsBlock() const {
+Optional<ArrayRef<uint8_t>> DWARFFormValue::getAsBlock() const {
   if (!isFormClass(FC_Block) && !isFormClass(FC_Exprloc))
     return None;
-  return ArrayRef<const uint8_t>(Value.data, Value.uval);
+  return ArrayRef<uint8_t>(Value.data, Value.uval);
 }