Update LLVM to 92395.

11 files changed, 977 insertions, 477 deletions

diff --git a/lib/Support/APFloat.cpp b/lib/Support/APFloat.cpp
index b9b323c..1e6d22f 100644
--- a/lib/Support/APFloat.cpp
+++ b/lib/Support/APFloat.cpp
@@ -3139,6 +3139,60 @@ APFloat::initFromAPInt(const APInt& api, bool isIEEE)
     llvm_unreachable(0);
 }
 
+APFloat APFloat::getLargest(const fltSemantics &Sem, bool Negative) {
+  APFloat Val(Sem, fcNormal, Negative);
+
+  // We want (in interchange format):
+  //   sign = {Negative}
+  //   exponent = 1..10
+  //   significand = 1..1
+
+  Val.exponent = Sem.maxExponent; // unbiased
+
+  // 1-initialize all bits....
+  Val.zeroSignificand();
+  integerPart *significand = Val.significandParts();
+  unsigned N = partCountForBits(Sem.precision);
+  for (unsigned i = 0; i != N; ++i)
+    significand[i] = ~((integerPart) 0);
+
+  // ...and then clear the top bits for internal consistency.
+  significand[N-1]
+    &= (((integerPart) 1) << ((Sem.precision % integerPartWidth) - 1)) - 1;
+
+  return Val;
+}
+
+APFloat APFloat::getSmallest(const fltSemantics &Sem, bool Negative) {
+  APFloat Val(Sem, fcNormal, Negative);
+
+  // We want (in interchange format):
+  //   sign = {Negative}
+  //   exponent = 0..0
+  //   significand = 0..01
+
+  Val.exponent = Sem.minExponent; // unbiased
+  Val.zeroSignificand();
+  Val.significandParts()[0] = 1;
+  return Val;
+}
+
+APFloat APFloat::getSmallestNormalized(const fltSemantics &Sem, bool Negative) {
+  APFloat Val(Sem, fcNormal, Negative);
+
+  // We want (in interchange format):
+  //   sign = {Negative}
+  //   exponent = 0..0
+  //   significand = 10..0
+
+  Val.exponent = Sem.minExponent;
+  Val.zeroSignificand();
+  Val.significandParts()[partCountForBits(Sem.precision)-1]
+    |= (((integerPart) 1) << ((Sem.precision % integerPartWidth) - 1));
+
+  return Val;
+}
+
 APFloat::APFloat(const APInt& api, bool isIEEE)
 {
   initFromAPInt(api, isIEEE);
@@ -3155,3 +3209,297 @@ APFloat::APFloat(double d)
   APInt api = APInt(64, 0);
   initFromAPInt(api.doubleToBits(d));
 }
+
+namespace {
+  static void append(SmallVectorImpl<char> &Buffer,
+                     unsigned N, const char *Str) {
+    unsigned Start = Buffer.size();
+    Buffer.set_size(Start + N);
+    memcpy(&Buffer[Start], Str, N);
+  }
+
+  template <unsigned N>
+  void append(SmallVectorImpl<char> &Buffer, const char (&Str)[N]) {
+    append(Buffer, N, Str);
+  }
+
+  /// Removes data from the given significand until it is no more
+  /// precise than is required for the desired precision.
+  void AdjustToPrecision(APInt &significand,
+                         int &exp, unsigned FormatPrecision) {
+    unsigned bits = significand.getActiveBits();
+
+    // 196/59 is a very slight overestimate of lg_2(10).
+    unsigned bitsRequired = (FormatPrecision * 196 + 58) / 59;
+
+    if (bits <= bitsRequired) return;
+
+    unsigned tensRemovable = (bits - bitsRequired) * 59 / 196;
+    if (!tensRemovable) return;
+
+    exp += tensRemovable;
+
+    APInt divisor(significand.getBitWidth(), 1);
+    APInt powten(significand.getBitWidth(), 10);
+    while (true) {
+      if (tensRemovable & 1)
+        divisor *= powten;
+      tensRemovable >>= 1;
+      if (!tensRemovable) break;
+      powten *= powten;
+    }
+
+    significand = significand.udiv(divisor);
+
+    // Truncate the significand down to its active bit count, but
+    // don't try to drop below 32.
+    unsigned newPrecision = std::max(32U, significand.getActiveBits());
+    significand.trunc(newPrecision);
+  }
+
+
+  void AdjustToPrecision(SmallVectorImpl<char> &buffer,
+                         int &exp, unsigned FormatPrecision) {
+    unsigned N = buffer.size();
+    if (N <= FormatPrecision) return;
+
+    // The most significant figures are the last ones in the buffer.
+    unsigned FirstSignificant = N - FormatPrecision;
+
+    // Round.
+    // FIXME: this probably shouldn't use 'round half up'.
+
+    // Rounding down is just a truncation, except we also want to drop
+    // trailing zeros from the new result.
+    if (buffer[FirstSignificant - 1] < '5') {
+      while (buffer[FirstSignificant] == '0')
+        FirstSignificant++;
+
+      exp += FirstSignificant;
+      buffer.erase(&buffer[0], &buffer[FirstSignificant]);
+      return;
+    }
+
+    // Rounding up requires a decimal add-with-carry.  If we continue
+    // the carry, the newly-introduced zeros will just be truncated.
+    for (unsigned I = FirstSignificant; I != N; ++I) {
+      if (buffer[I] == '9') {
+        FirstSignificant++;
+      } else {
+        buffer[I]++;
+        break;
+      }
+    }
+
+    // If we carried through, we have exactly one digit of precision.
+    if (FirstSignificant == N) {
+      exp += FirstSignificant;
+      buffer.clear();
+      buffer.push_back('1');
+      return;
+    }
+
+    exp += FirstSignificant;
+    buffer.erase(&buffer[0], &buffer[FirstSignificant]);
+  }
+}
+
+void APFloat::toString(SmallVectorImpl<char> &Str,
+                       unsigned FormatPrecision,
+                       unsigned FormatMaxPadding) {
+  switch (category) {
+  case fcInfinity:
+    if (isNegative())
+      return append(Str, "-Inf");
+    else
+      return append(Str, "+Inf");
+
+  case fcNaN: return append(Str, "NaN");
+
+  case fcZero:
+    if (isNegative())
+      Str.push_back('-');
+
+    if (!FormatMaxPadding)
+      append(Str, "0.0E+0");
+    else
+      Str.push_back('0');
+    return;
+
+  case fcNormal:
+    break;
+  }
+
+  if (isNegative())
+    Str.push_back('-');
+
+  // Decompose the number into an APInt and an exponent.
+  int exp = exponent - ((int) semantics->precision - 1);
+  APInt significand(semantics->precision,
+                    partCountForBits(semantics->precision),
+                    significandParts());
+
+  // Set FormatPrecision if zero.  We want to do this before we
+  // truncate trailing zeros, as those are part of the precision.
+  if (!FormatPrecision) {
+    // It's an interesting question whether to use the nominal
+    // precision or the active precision here for denormals.
+
+    // FormatPrecision = ceil(significandBits / lg_2(10))
+    FormatPrecision = (semantics->precision * 59 + 195) / 196;
+  }
+
+  // Ignore trailing binary zeros.
+  int trailingZeros = significand.countTrailingZeros();
+  exp += trailingZeros;
+  significand = significand.lshr(trailingZeros);
+
+  // Change the exponent from 2^e to 10^e.
+  if (exp == 0) {
+    // Nothing to do.
+  } else if (exp > 0) {
+    // Just shift left.
+    significand.zext(semantics->precision + exp);
+    significand <<= exp;
+    exp = 0;
+  } else { /* exp < 0 */
+    int texp = -exp;
+
+    // We transform this using the identity:
+    //   (N)(2^-e) == (N)(5^e)(10^-e)
+    // This means we have to multiply N (the significand) by 5^e.
+    // To avoid overflow, we have to operate on numbers large
+    // enough to store N * 5^e:
+    //   log2(N * 5^e) == log2(N) + e * log2(5)
+    //                 <= semantics->precision + e * 137 / 59
+    //   (log_2(5) ~ 2.321928 < 2.322034 ~ 137/59)
+    
+    unsigned precision = semantics->precision + 137 * texp / 59;
+
+    // Multiply significand by 5^e.
+    //   N * 5^0101 == N * 5^(1*1) * 5^(0*2) * 5^(1*4) * 5^(0*8)
+    significand.zext(precision);
+    APInt five_to_the_i(precision, 5);
+    while (true) {
+      if (texp & 1) significand *= five_to_the_i;
+      
+      texp >>= 1;
+      if (!texp) break;
+      five_to_the_i *= five_to_the_i;
+    }
+  }
+
+  AdjustToPrecision(significand, exp, FormatPrecision);
+
+  llvm::SmallVector<char, 256> buffer;
+
+  // Fill the buffer.
+  unsigned precision = significand.getBitWidth();
+  APInt ten(precision, 10);
+  APInt digit(precision, 0);
+
+  bool inTrail = true;
+  while (significand != 0) {
+    // digit <- significand % 10
+    // significand <- significand / 10
+    APInt::udivrem(significand, ten, significand, digit);
+
+    unsigned d = digit.getZExtValue();
+
+    // Drop trailing zeros.
+    if (inTrail && !d) exp++;
+    else {
+      buffer.push_back((char) ('0' + d));
+      inTrail = false;
+    }
+  }
+
+  assert(!buffer.empty() && "no characters in buffer!");
+
+  // Drop down to FormatPrecision.
+  // TODO: don't do more precise calculations above than are required.
+  AdjustToPrecision(buffer, exp, FormatPrecision);
+
+  unsigned NDigits = buffer.size();
+
+  // Check whether we should use scientific notation.
+  bool FormatScientific;
+  if (!FormatMaxPadding)
+    FormatScientific = true;
+  else {
+    if (exp >= 0) {
+      // 765e3 --> 765000
+      //              ^^^
+      // But we shouldn't make the number look more precise than it is.
+      FormatScientific = ((unsigned) exp > FormatMaxPadding ||
+                          NDigits + (unsigned) exp > FormatPrecision);
+    } else {
+      // Power of the most significant digit.
+      int MSD = exp + (int) (NDigits - 1);
+      if (MSD >= 0) {
+        // 765e-2 == 7.65
+        FormatScientific = false;
+      } else {
+        // 765e-5 == 0.00765
+        //           ^ ^^
+        FormatScientific = ((unsigned) -MSD) > FormatMaxPadding;
+      }
+    }
+  }
+
+  // Scientific formatting is pretty straightforward.
+  if (FormatScientific) {
+    exp += (NDigits - 1);
+
+    Str.push_back(buffer[NDigits-1]);
+    Str.push_back('.');
+    if (NDigits == 1)
+      Str.push_back('0');
+    else
+      for (unsigned I = 1; I != NDigits; ++I)
+        Str.push_back(buffer[NDigits-1-I]);
+    Str.push_back('E');
+
+    Str.push_back(exp >= 0 ? '+' : '-');
+    if (exp < 0) exp = -exp;
+    SmallVector<char, 6> expbuf;
+    do {
+      expbuf.push_back((char) ('0' + (exp % 10)));
+      exp /= 10;
+    } while (exp);
+    for (unsigned I = 0, E = expbuf.size(); I != E; ++I)
+      Str.push_back(expbuf[E-1-I]);
+    return;
+  }
+
+  // Non-scientific, positive exponents.
+  if (exp >= 0) {
+    for (unsigned I = 0; I != NDigits; ++I)
+      Str.push_back(buffer[NDigits-1-I]);
+    for (unsigned I = 0; I != (unsigned) exp; ++I)
+      Str.push_back('0');
+    return;
+  }
+
+  // Non-scientific, negative exponents.
+
+  // The number of digits to the left of the decimal point.
+  int NWholeDigits = exp + (int) NDigits;
+
+  unsigned I = 0;
+  if (NWholeDigits > 0) {
+    for (; I != (unsigned) NWholeDigits; ++I)
+      Str.push_back(buffer[NDigits-I-1]);
+    Str.push_back('.');
+  } else {
+    unsigned NZeros = 1 + (unsigned) -NWholeDigits;
+
+    Str.push_back('0');
+    Str.push_back('.');
+    for (unsigned Z = 1; Z != NZeros; ++Z)
+      Str.push_back('0');
+  }
+
+  for (; I != NDigits; ++I)
+    Str.push_back(buffer[NDigits-I-1]);
+}
diff --git a/lib/Support/APInt.cpp b/lib/Support/APInt.cpp
index 56d4773..9532e1e 100644
--- a/lib/Support/APInt.cpp
+++ b/lib/Support/APInt.cpp
@@ -2012,8 +2012,8 @@ void APInt::udivrem(const APInt &LHS, const APInt &RHS,
   }
 
   if (lhsWords < rhsWords || LHS.ult(RHS)) {
-    Quotient = 0;               // X / Y ===> 0, iff X < Y
     Remainder = LHS;            // X % Y ===> X, iff X < Y
+    Quotient = 0;               // X / Y ===> 0, iff X < Y
     return;
   }
 
diff --git a/lib/Support/CMakeLists.txt b/lib/Support/CMakeLists.txt
index ac736dc..f1347f9 100644
--- a/lib/Support/CMakeLists.txt
+++ b/lib/Support/CMakeLists.txt
@@ -3,6 +3,7 @@ add_llvm_library(LLVMSupport
   APInt.cpp
   APSInt.cpp
   Allocator.cpp
+  circular_raw_ostream.cpp
   CommandLine.cpp
   ConstantRange.cpp
   Debug.cpp
@@ -23,6 +24,7 @@ add_llvm_library(LLVMSupport
   Regex.cpp
   SlowOperationInformer.cpp
   SmallPtrSet.cpp
+  SmallVector.cpp
   SourceMgr.cpp
   Statistic.cpp
   StringExtras.cpp
diff --git a/lib/Support/Debug.cpp b/lib/Support/Debug.cpp
index 50abe01..a035771 100644
--- a/lib/Support/Debug.cpp
+++ b/lib/Support/Debug.cpp
@@ -25,6 +25,9 @@
 
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/Debug.h"
+#include "llvm/Support/circular_raw_ostream.h"
+#include "llvm/System/Signals.h"
+
 using namespace llvm;
 
 // All Debug.h functionality is a no-op in NDEBUG mode.
@@ -37,6 +40,16 @@ static cl::opt<bool, true>
 Debug("debug", cl::desc("Enable debug output"), cl::Hidden,
       cl::location(DebugFlag));
 
+// -debug-buffer-size - Buffer the last N characters of debug output
+//until program termination.
+static cl::opt<unsigned>
+DebugBufferSize("debug-buffer-size",
+                cl::desc("Buffer the last N characters of debug output"
+                         "until program termination. "
+                         "[default 0 -- immediate print-out]"),
+                cl::Hidden,
+                cl::init(0));
+
 static std::string CurrentDebugType;
 static struct DebugOnlyOpt {
   void operator=(const std::string &Val) const {
@@ -50,6 +63,18 @@ DebugOnly("debug-only", cl::desc("Enable a specific type of debug output"),
           cl::Hidden, cl::value_desc("debug string"),
           cl::location(DebugOnlyOptLoc), cl::ValueRequired);
 
+// Signal handlers - dump debug output on termination.
+static void debug_user_sig_handler(void *Cookie)
+{
+  // This is a bit sneaky.  Since this is under #ifndef NDEBUG, we
+  // know that debug mode is enabled and dbgs() really is a
+  // circular_raw_ostream.  If NDEBUG is defined, then dbgs() ==
+  // errs() but this will never be invoked.
+  llvm::circular_raw_ostream *dbgout =
+    static_cast<llvm::circular_raw_ostream *>(&llvm::dbgs());
+  dbgout->flushBufferWithBanner();
+}
+
 // isCurrentDebugType - Return true if the specified string is the debug type
 // specified on the command line, or if none was specified on the command line
 // with the -debug-only=X option.
@@ -66,9 +91,38 @@ void llvm::SetCurrentDebugType(const char *Type) {
   CurrentDebugType = Type;
 }
 
+/// dbgs - Return a circular-buffered debug stream.
+raw_ostream &llvm::dbgs() {
+  // Do one-time initialization in a thread-safe way.
+  static struct dbgstream {
+    circular_raw_ostream strm;
+
+    dbgstream() :
+        strm(errs(), "*** Debug Log Output ***\n",
+             (!EnableDebugBuffering || !DebugFlag) ? 0 : DebugBufferSize) {
+      if (EnableDebugBuffering && DebugFlag && DebugBufferSize != 0)
+        // TODO: Add a handler for SIGUSER1-type signals so the user can
+        // force a debug dump.
+        sys::AddSignalHandler(&debug_user_sig_handler, 0);
+      // Otherwise we've already set the debug stream buffer size to
+      // zero, disabling buffering so it will output directly to errs().
+    }
+  } thestrm;
+
+  return thestrm.strm;
+}
+
 #else
 // Avoid "has no symbols" warning.
 namespace llvm {
-int Debug_dummy = 0;
+  /// dbgs - Return dbgs().
+  raw_ostream &dbgs() {
+    return dbgs();
+  }
 }
+
 #endif
+
+/// EnableDebugBuffering - Turn on signal handler installation.
+///
+bool llvm::EnableDebugBuffering = false;
diff --git a/lib/Support/Dwarf.cpp b/lib/Support/Dwarf.cpp
index 8b688ca..d1230b9 100644
--- a/lib/Support/Dwarf.cpp
+++ b/lib/Support/Dwarf.cpp
@@ -12,579 +12,549 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/Support/Dwarf.h"
-#include "llvm/Support/ErrorHandling.h"
-
-#include <cassert>
-
-namespace llvm {
-
-namespace dwarf {
+using namespace llvm;
+using namespace dwarf;
 
 /// TagString - Return the string for the specified tag.
 ///
-const char *TagString(unsigned Tag) {
+const char *llvm::dwarf::TagString(unsigned Tag) {
   switch (Tag) {
-    case DW_TAG_array_type:                return "DW_TAG_array_type";
-    case DW_TAG_class_type:                return "DW_TAG_class_type";
-    case DW_TAG_entry_point:               return "DW_TAG_entry_point";
-    case DW_TAG_enumeration_type:          return "DW_TAG_enumeration_type";
-    case DW_TAG_formal_parameter:          return "DW_TAG_formal_parameter";
-    case DW_TAG_imported_declaration:      return "DW_TAG_imported_declaration";
-    case DW_TAG_label:                     return "DW_TAG_label";
-    case DW_TAG_lexical_block:             return "DW_TAG_lexical_block";
-    case DW_TAG_member:                    return "DW_TAG_member";
-    case DW_TAG_pointer_type:              return "DW_TAG_pointer_type";
-    case DW_TAG_reference_type:            return "DW_TAG_reference_type";
-    case DW_TAG_compile_unit:              return "DW_TAG_compile_unit";
-    case DW_TAG_string_type:               return "DW_TAG_string_type";
-    case DW_TAG_structure_type:            return "DW_TAG_structure_type";
-    case DW_TAG_subroutine_type:           return "DW_TAG_subroutine_type";
-    case DW_TAG_typedef:                   return "DW_TAG_typedef";
-    case DW_TAG_union_type:                return "DW_TAG_union_type";
-    case DW_TAG_unspecified_parameters:    return "DW_TAG_unspecified_parameters";
-    case DW_TAG_variant:                   return "DW_TAG_variant";
-    case DW_TAG_common_block:              return "DW_TAG_common_block";
-    case DW_TAG_common_inclusion:          return "DW_TAG_common_inclusion";
-    case DW_TAG_inheritance:               return "DW_TAG_inheritance";
-    case DW_TAG_inlined_subroutine:        return "DW_TAG_inlined_subroutine";
-    case DW_TAG_module:                    return "DW_TAG_module";
-    case DW_TAG_ptr_to_member_type:        return "DW_TAG_ptr_to_member_type";
-    case DW_TAG_set_type:                  return "DW_TAG_set_type";
-    case DW_TAG_subrange_type:             return "DW_TAG_subrange_type";
-    case DW_TAG_with_stmt:                 return "DW_TAG_with_stmt";
-    case DW_TAG_access_declaration:        return "DW_TAG_access_declaration";
-    case DW_TAG_base_type:                 return "DW_TAG_base_type";
-    case DW_TAG_catch_block:               return "DW_TAG_catch_block";
-    case DW_TAG_const_type:                return "DW_TAG_const_type";
-    case DW_TAG_constant:                  return "DW_TAG_constant";
-    case DW_TAG_enumerator:                return "DW_TAG_enumerator";
-    case DW_TAG_file_type:                 return "DW_TAG_file_type";
-    case DW_TAG_friend:                    return "DW_TAG_friend";
-    case DW_TAG_namelist:                  return "DW_TAG_namelist";
-    case DW_TAG_namelist_item:             return "DW_TAG_namelist_item";
-    case DW_TAG_packed_type:               return "DW_TAG_packed_type";
-    case DW_TAG_subprogram:                return "DW_TAG_subprogram";
-    case DW_TAG_template_type_parameter:   return "DW_TAG_template_type_parameter";
-    case DW_TAG_template_value_parameter: return "DW_TAG_template_value_parameter";
-    case DW_TAG_thrown_type:               return "DW_TAG_thrown_type";
-    case DW_TAG_try_block:                 return "DW_TAG_try_block";
-    case DW_TAG_variant_part:              return "DW_TAG_variant_part";
-    case DW_TAG_variable:                  return "DW_TAG_variable";
-    case DW_TAG_volatile_type:             return "DW_TAG_volatile_type";
-    case DW_TAG_dwarf_procedure:           return "DW_TAG_dwarf_procedure";
-    case DW_TAG_restrict_type:             return "DW_TAG_restrict_type";
-    case DW_TAG_interface_type:            return "DW_TAG_interface_type";
-    case DW_TAG_namespace:                 return "DW_TAG_namespace";
-    case DW_TAG_imported_module:           return "DW_TAG_imported_module";
-    case DW_TAG_unspecified_type:          return "DW_TAG_unspecified_type";
-    case DW_TAG_partial_unit:              return "DW_TAG_partial_unit";
-    case DW_TAG_imported_unit:             return "DW_TAG_imported_unit";
-    case DW_TAG_condition:                 return "DW_TAG_condition";
-    case DW_TAG_shared_type:               return "DW_TAG_shared_type";
-    case DW_TAG_lo_user:                   return "DW_TAG_lo_user";
-    case DW_TAG_hi_user:                   return "DW_TAG_hi_user";
+  case DW_TAG_array_type:                return "DW_TAG_array_type";
+  case DW_TAG_class_type:                return "DW_TAG_class_type";
+  case DW_TAG_entry_point:               return "DW_TAG_entry_point";
+  case DW_TAG_enumeration_type:          return "DW_TAG_enumeration_type";
+  case DW_TAG_formal_parameter:          return "DW_TAG_formal_parameter";
+  case DW_TAG_imported_declaration:      return "DW_TAG_imported_declaration";
+  case DW_TAG_label:                     return "DW_TAG_label";
+  case DW_TAG_lexical_block:             return "DW_TAG_lexical_block";
+  case DW_TAG_member:                    return "DW_TAG_member";
+  case DW_TAG_pointer_type:              return "DW_TAG_pointer_type";
+  case DW_TAG_reference_type:            return "DW_TAG_reference_type";
+  case DW_TAG_compile_unit:              return "DW_TAG_compile_unit";
+  case DW_TAG_string_type:               return "DW_TAG_string_type";
+  case DW_TAG_structure_type:            return "DW_TAG_structure_type";
+  case DW_TAG_subroutine_type:           return "DW_TAG_subroutine_type";
+  case DW_TAG_typedef:                   return "DW_TAG_typedef";
+  case DW_TAG_union_type:                return "DW_TAG_union_type";
+  case DW_TAG_unspecified_parameters:    return "DW_TAG_unspecified_parameters";
+  case DW_TAG_variant:                   return "DW_TAG_variant";
+  case DW_TAG_common_block:              return "DW_TAG_common_block";
+  case DW_TAG_common_inclusion:          return "DW_TAG_common_inclusion";
+  case DW_TAG_inheritance:               return "DW_TAG_inheritance";
+  case DW_TAG_inlined_subroutine:        return "DW_TAG_inlined_subroutine";
+  case DW_TAG_module:                    return "DW_TAG_module";
+  case DW_TAG_ptr_to_member_type:        return "DW_TAG_ptr_to_member_type";
+  case DW_TAG_set_type:                  return "DW_TAG_set_type";
+  case DW_TAG_subrange_type:             return "DW_TAG_subrange_type";
+  case DW_TAG_with_stmt:                 return "DW_TAG_with_stmt";
+  case DW_TAG_access_declaration:        return "DW_TAG_access_declaration";
+  case DW_TAG_base_type:                 return "DW_TAG_base_type";
+  case DW_TAG_catch_block:               return "DW_TAG_catch_block";
+  case DW_TAG_const_type:                return "DW_TAG_const_type";
+  case DW_TAG_constant:                  return "DW_TAG_constant";
+  case DW_TAG_enumerator:                return "DW_TAG_enumerator";
+  case DW_TAG_file_type:                 return "DW_TAG_file_type";
+  case DW_TAG_friend:                    return "DW_TAG_friend";
+  case DW_TAG_namelist:                  return "DW_TAG_namelist";
+  case DW_TAG_namelist_item:             return "DW_TAG_namelist_item";
+  case DW_TAG_packed_type:               return "DW_TAG_packed_type";
+  case DW_TAG_subprogram:                return "DW_TAG_subprogram";
+  case DW_TAG_template_type_parameter:  return "DW_TAG_template_type_parameter";
+  case DW_TAG_template_value_parameter:return "DW_TAG_template_value_parameter";
+  case DW_TAG_thrown_type:               return "DW_TAG_thrown_type";
+  case DW_TAG_try_block:                 return "DW_TAG_try_block";
+  case DW_TAG_variant_part:              return "DW_TAG_variant_part";
+  case DW_TAG_variable:                  return "DW_TAG_variable";
+  case DW_TAG_volatile_type:             return "DW_TAG_volatile_type";
+  case DW_TAG_dwarf_procedure:           return "DW_TAG_dwarf_procedure";
+  case DW_TAG_restrict_type:             return "DW_TAG_restrict_type";
+  case DW_TAG_interface_type:            return "DW_TAG_interface_type";
+  case DW_TAG_namespace:                 return "DW_TAG_namespace";
+  case DW_TAG_imported_module:           return "DW_TAG_imported_module";
+  case DW_TAG_unspecified_type:          return "DW_TAG_unspecified_type";
+  case DW_TAG_partial_unit:              return "DW_TAG_partial_unit";
+  case DW_TAG_imported_unit:             return "DW_TAG_imported_unit";
+  case DW_TAG_condition:                 return "DW_TAG_condition";
+  case DW_TAG_shared_type:               return "DW_TAG_shared_type";
+  case DW_TAG_lo_user:                   return "DW_TAG_lo_user";
+  case DW_TAG_hi_user:                   return "DW_TAG_hi_user";
   }
-  llvm_unreachable("Unknown Dwarf Tag");
-  return "";
+  return 0;
 }
 
 /// ChildrenString - Return the string for the specified children flag.
 ///
-const char *ChildrenString(unsigned Children) {
+const char *llvm::dwarf::ChildrenString(unsigned Children) {
   switch (Children) {
-    case DW_CHILDREN_no:                   return "CHILDREN_no";
-    case DW_CHILDREN_yes:                  return "CHILDREN_yes";
+  case DW_CHILDREN_no:                   return "CHILDREN_no";
+  case DW_CHILDREN_yes:                  return "CHILDREN_yes";
   }
-  llvm_unreachable("Unknown Dwarf ChildrenFlag");
-  return "";
+  return 0;
 }
 
 /// AttributeString - Return the string for the specified attribute.
 ///
-const char *AttributeString(unsigned Attribute) {
+const char *llvm::dwarf::AttributeString(unsigned Attribute) {
   switch (Attribute) {
-    case DW_AT_sibling:                    return "DW_AT_sibling";
-    case DW_AT_location:                   return "DW_AT_location";
-    case DW_AT_name:                       return "DW_AT_name";
-    case DW_AT_ordering:                   return "DW_AT_ordering";
-    case DW_AT_byte_size:                  return "DW_AT_byte_size";
-    case DW_AT_bit_offset:                 return "DW_AT_bit_offset";
-    case DW_AT_bit_size:                   return "DW_AT_bit_size";
-    case DW_AT_stmt_list:                  return "DW_AT_stmt_list";
-    case DW_AT_low_pc:                     return "DW_AT_low_pc";
-    case DW_AT_high_pc:                    return "DW_AT_high_pc";
-    case DW_AT_language:                   return "DW_AT_language";
-    case DW_AT_discr:                      return "DW_AT_discr";
-    case DW_AT_discr_value:                return "DW_AT_discr_value";
-    case DW_AT_visibility:                 return "DW_AT_visibility";
-    case DW_AT_import:                     return "DW_AT_import";
-    case DW_AT_string_length:              return "DW_AT_string_length";
-    case DW_AT_common_reference:           return "DW_AT_common_reference";
-    case DW_AT_comp_dir:                   return "DW_AT_comp_dir";
-    case DW_AT_const_value:                return "DW_AT_const_value";
-    case DW_AT_containing_type:            return "DW_AT_containing_type";
-    case DW_AT_default_value:              return "DW_AT_default_value";
-    case DW_AT_inline:                     return "DW_AT_inline";
-    case DW_AT_is_optional:                return "DW_AT_is_optional";
-    case DW_AT_lower_bound:                return "DW_AT_lower_bound";
-    case DW_AT_producer:                   return "DW_AT_producer";
-    case DW_AT_prototyped:                 return "DW_AT_prototyped";
-    case DW_AT_return_addr:                return "DW_AT_return_addr";
-    case DW_AT_start_scope:                return "DW_AT_start_scope";
-    case DW_AT_bit_stride:                 return "DW_AT_bit_stride";
-    case DW_AT_upper_bound:                return "DW_AT_upper_bound";
-    case DW_AT_abstract_origin:            return "DW_AT_abstract_origin";
-    case DW_AT_accessibility:              return "DW_AT_accessibility";
-    case DW_AT_address_class:              return "DW_AT_address_class";
-    case DW_AT_artificial:                 return "DW_AT_artificial";
-    case DW_AT_base_types:                 return "DW_AT_base_types";
-    case DW_AT_calling_convention:         return "DW_AT_calling_convention";
-    case DW_AT_count:                      return "DW_AT_count";
-    case DW_AT_data_member_location:       return "DW_AT_data_member_location";
-    case DW_AT_decl_column:                return "DW_AT_decl_column";
-    case DW_AT_decl_file:                  return "DW_AT_decl_file";
-    case DW_AT_decl_line:                  return "DW_AT_decl_line";
-    case DW_AT_declaration:                return "DW_AT_declaration";
-    case DW_AT_discr_list:                 return "DW_AT_discr_list";
-    case DW_AT_encoding:                   return "DW_AT_encoding";
-    case DW_AT_external:                   return "DW_AT_external";
-    case DW_AT_frame_base:                 return "DW_AT_frame_base";
-    case DW_AT_friend:                     return "DW_AT_friend";
-    case DW_AT_identifier_case:            return "DW_AT_identifier_case";
-    case DW_AT_macro_info:                 return "DW_AT_macro_info";
-    case DW_AT_namelist_item:              return "DW_AT_namelist_item";
-    case DW_AT_priority:                   return "DW_AT_priority";
-    case DW_AT_segment:                    return "DW_AT_segment";
-    case DW_AT_specification:              return "DW_AT_specification";
-    case DW_AT_static_link:                return "DW_AT_static_link";
-    case DW_AT_type:                       return "DW_AT_type";
-    case DW_AT_use_location:               return "DW_AT_use_location";
-    case DW_AT_variable_parameter:         return "DW_AT_variable_parameter";
-    case DW_AT_virtuality:                 return "DW_AT_virtuality";
-    case DW_AT_vtable_elem_location:       return "DW_AT_vtable_elem_location";
-    case DW_AT_allocated:                  return "DW_AT_allocated";
-    case DW_AT_associated:                 return "DW_AT_associated";
-    case DW_AT_data_location:              return "DW_AT_data_location";
-    case DW_AT_byte_stride:                return "DW_AT_byte_stride";
-    case DW_AT_entry_pc:                   return "DW_AT_entry_pc";
-    case DW_AT_use_UTF8:                   return "DW_AT_use_UTF8";
-    case DW_AT_extension:                  return "DW_AT_extension";
-    case DW_AT_ranges:                     return "DW_AT_ranges";
-    case DW_AT_trampoline:                 return "DW_AT_trampoline";
-    case DW_AT_call_column:                return "DW_AT_call_column";
-    case DW_AT_call_file:                  return "DW_AT_call_file";
-    case DW_AT_call_line:                  return "DW_AT_call_line";
-    case DW_AT_description:                return "DW_AT_description";
-    case DW_AT_binary_scale:               return "DW_AT_binary_scale";
-    case DW_AT_decimal_scale:              return "DW_AT_decimal_scale";
-    case DW_AT_small:                      return "DW_AT_small";
-    case DW_AT_decimal_sign:               return "DW_AT_decimal_sign";
-    case DW_AT_digit_count:                return "DW_AT_digit_count";
-    case DW_AT_picture_string:             return "DW_AT_picture_string";
-    case DW_AT_mutable:                    return "DW_AT_mutable";
-    case DW_AT_threads_scaled:             return "DW_AT_threads_scaled";
-    case DW_AT_explicit:                   return "DW_AT_explicit";
-    case DW_AT_object_pointer:             return "DW_AT_object_pointer";
-    case DW_AT_endianity:                  return "DW_AT_endianity";
-    case DW_AT_elemental:                  return "DW_AT_elemental";
-    case DW_AT_pure:                       return "DW_AT_pure";
-    case DW_AT_recursive:                  return "DW_AT_recursive";
-    case DW_AT_MIPS_linkage_name:          return "DW_AT_MIPS_linkage_name";
-    case DW_AT_sf_names:                   return "DW_AT_sf_names";
-    case DW_AT_src_info:                   return "DW_AT_src_info";
-    case DW_AT_mac_info:                   return "DW_AT_mac_info";
-    case DW_AT_src_coords:                 return "DW_AT_src_coords";
-    case DW_AT_body_begin:                 return "DW_AT_body_begin";
-    case DW_AT_body_end:                   return "DW_AT_body_end";
-    case DW_AT_GNU_vector:                 return "DW_AT_GNU_vector";
-    case DW_AT_lo_user:                    return "DW_AT_lo_user";
-    case DW_AT_hi_user:                    return "DW_AT_hi_user";
-    case DW_AT_APPLE_optimized:            return "DW_AT_APPLE_optimized";
-    case DW_AT_APPLE_flags:                return "DW_AT_APPLE_flags";
-    case DW_AT_APPLE_isa:                  return "DW_AT_APPLE_isa";
-    case DW_AT_APPLE_block:                return "DW_AT_APPLE_block";
-    case DW_AT_APPLE_major_runtime_vers:   return "DW_AT_APPLE_major_runtime_vers";
-    case DW_AT_APPLE_runtime_class:        return "DW_AT_APPLE_runtime_class";
+  case DW_AT_sibling:                    return "DW_AT_sibling";
+  case DW_AT_location:                   return "DW_AT_location";
+  case DW_AT_name:                       return "DW_AT_name";
+  case DW_AT_ordering:                   return "DW_AT_ordering";
+  case DW_AT_byte_size:                  return "DW_AT_byte_size";
+  case DW_AT_bit_offset:                 return "DW_AT_bit_offset";
+  case DW_AT_bit_size:                   return "DW_AT_bit_size";
+  case DW_AT_stmt_list:                  return "DW_AT_stmt_list";
+  case DW_AT_low_pc:                     return "DW_AT_low_pc";
+  case DW_AT_high_pc:                    return "DW_AT_high_pc";
+  case DW_AT_language:                   return "DW_AT_language";
+  case DW_AT_discr:                      return "DW_AT_discr";
+  case DW_AT_discr_value:                return "DW_AT_discr_value";
+  case DW_AT_visibility:                 return "DW_AT_visibility";
+  case DW_AT_import:                     return "DW_AT_import";
+  case DW_AT_string_length:              return "DW_AT_string_length";
+  case DW_AT_common_reference:           return "DW_AT_common_reference";
+  case DW_AT_comp_dir:                   return "DW_AT_comp_dir";
+  case DW_AT_const_value:                return "DW_AT_const_value";
+  case DW_AT_containing_type:            return "DW_AT_containing_type";
+  case DW_AT_default_value:              return "DW_AT_default_value";
+  case DW_AT_inline:                     return "DW_AT_inline";
+  case DW_AT_is_optional:                return "DW_AT_is_optional";
+  case DW_AT_lower_bound:                return "DW_AT_lower_bound";
+  case DW_AT_producer:                   return "DW_AT_producer";
+  case DW_AT_prototyped:                 return "DW_AT_prototyped";
+  case DW_AT_return_addr:                return "DW_AT_return_addr";
+  case DW_AT_start_scope:                return "DW_AT_start_scope";
+  case DW_AT_bit_stride:                 return "DW_AT_bit_stride";
+  case DW_AT_upper_bound:                return "DW_AT_upper_bound";
+  case DW_AT_abstract_origin:            return "DW_AT_abstract_origin";
+  case DW_AT_accessibility:              return "DW_AT_accessibility";
+  case DW_AT_address_class:              return "DW_AT_address_class";
+  case DW_AT_artificial:                 return "DW_AT_artificial";
+  case DW_AT_base_types:                 return "DW_AT_base_types";
+  case DW_AT_calling_convention:         return "DW_AT_calling_convention";
+  case DW_AT_count:                      return "DW_AT_count";
+  case DW_AT_data_member_location:       return "DW_AT_data_member_location";
+  case DW_AT_decl_column:                return "DW_AT_decl_column";
+  case DW_AT_decl_file:                  return "DW_AT_decl_file";
+  case DW_AT_decl_line:                  return "DW_AT_decl_line";
+  case DW_AT_declaration:                return "DW_AT_declaration";
+  case DW_AT_discr_list:                 return "DW_AT_discr_list";
+  case DW_AT_encoding:                   return "DW_AT_encoding";
+  case DW_AT_external:                   return "DW_AT_external";
+  case DW_AT_frame_base:                 return "DW_AT_frame_base";
+  case DW_AT_friend:                     return "DW_AT_friend";
+  case DW_AT_identifier_case:            return "DW_AT_identifier_case";
+  case DW_AT_macro_info:                 return "DW_AT_macro_info";
+  case DW_AT_namelist_item:              return "DW_AT_namelist_item";
+  case DW_AT_priority:                   return "DW_AT_priority";
+  case DW_AT_segment:                    return "DW_AT_segment";
+  case DW_AT_specification:              return "DW_AT_specification";
+  case DW_AT_static_link:                return "DW_AT_static_link";
+  case DW_AT_type:                       return "DW_AT_type";
+  case DW_AT_use_location:               return "DW_AT_use_location";
+  case DW_AT_variable_parameter:         return "DW_AT_variable_parameter";
+  case DW_AT_virtuality:                 return "DW_AT_virtuality";
+  case DW_AT_vtable_elem_location:       return "DW_AT_vtable_elem_location";
+  case DW_AT_allocated:                  return "DW_AT_allocated";
+  case DW_AT_associated:                 return "DW_AT_associated";
+  case DW_AT_data_location:              return "DW_AT_data_location";
+  case DW_AT_byte_stride:                return "DW_AT_byte_stride";
+  case DW_AT_entry_pc:                   return "DW_AT_entry_pc";
+  case DW_AT_use_UTF8:                   return "DW_AT_use_UTF8";
+  case DW_AT_extension:                  return "DW_AT_extension";
+  case DW_AT_ranges:                     return "DW_AT_ranges";
+  case DW_AT_trampoline:                 return "DW_AT_trampoline";
+  case DW_AT_call_column:                return "DW_AT_call_column";
+  case DW_AT_call_file:                  return "DW_AT_call_file";
+  case DW_AT_call_line:                  return "DW_AT_call_line";
+  case DW_AT_description:                return "DW_AT_description";
+  case DW_AT_binary_scale:               return "DW_AT_binary_scale";
+  case DW_AT_decimal_scale:              return "DW_AT_decimal_scale";
+  case DW_AT_small:                      return "DW_AT_small";
+  case DW_AT_decimal_sign:               return "DW_AT_decimal_sign";
+  case DW_AT_digit_count:                return "DW_AT_digit_count";
+  case DW_AT_picture_string:             return "DW_AT_picture_string";
+  case DW_AT_mutable:                    return "DW_AT_mutable";
+  case DW_AT_threads_scaled:             return "DW_AT_threads_scaled";
+  case DW_AT_explicit:                   return "DW_AT_explicit";
+  case DW_AT_object_pointer:             return "DW_AT_object_pointer";
+  case DW_AT_endianity:                  return "DW_AT_endianity";
+  case DW_AT_elemental:                  return "DW_AT_elemental";
+  case DW_AT_pure:                       return "DW_AT_pure";
+  case DW_AT_recursive:                  return "DW_AT_recursive";
+  case DW_AT_MIPS_linkage_name:          return "DW_AT_MIPS_linkage_name";
+  case DW_AT_sf_names:                   return "DW_AT_sf_names";
+  case DW_AT_src_info:                   return "DW_AT_src_info";
+  case DW_AT_mac_info:                   return "DW_AT_mac_info";
+  case DW_AT_src_coords:                 return "DW_AT_src_coords";
+  case DW_AT_body_begin:                 return "DW_AT_body_begin";
+  case DW_AT_body_end:                   return "DW_AT_body_end";
+  case DW_AT_GNU_vector:                 return "DW_AT_GNU_vector";
+  case DW_AT_lo_user:                    return "DW_AT_lo_user";
+  case DW_AT_hi_user:                    return "DW_AT_hi_user";
+  case DW_AT_APPLE_optimized:            return "DW_AT_APPLE_optimized";
+  case DW_AT_APPLE_flags:                return "DW_AT_APPLE_flags";
+  case DW_AT_APPLE_isa:                  return "DW_AT_APPLE_isa";
+  case DW_AT_APPLE_block:                return "DW_AT_APPLE_block";
+  case DW_AT_APPLE_major_runtime_vers:  return "DW_AT_APPLE_major_runtime_vers";
+  case DW_AT_APPLE_runtime_class:        return "DW_AT_APPLE_runtime_class";
   }
-  llvm_unreachable("Unknown Dwarf Attribute");
-  return "";
+  return 0;
 }
 
 /// FormEncodingString - Return the string for the specified form encoding.
 ///
-const char *FormEncodingString(unsigned Encoding) {
+const char *llvm::dwarf::FormEncodingString(unsigned Encoding) {
   switch (Encoding) {
-    case DW_FORM_addr:                     return "FORM_addr";
-    case DW_FORM_block2:                   return "FORM_block2";
-    case DW_FORM_block4:                   return "FORM_block4";
-    case DW_FORM_data2:                    return "FORM_data2";
-    case DW_FORM_data4:                    return "FORM_data4";
-    case DW_FORM_data8:                    return "FORM_data8";
-    case DW_FORM_string:                   return "FORM_string";
-    case DW_FORM_block:                    return "FORM_block";
-    case DW_FORM_block1:                   return "FORM_block1";
-    case DW_FORM_data1:                    return "FORM_data1";
-    case DW_FORM_flag:                     return "FORM_flag";
-    case DW_FORM_sdata:                    return "FORM_sdata";
-    case DW_FORM_strp:                     return "FORM_strp";
-    case DW_FORM_udata:                    return "FORM_udata";
-    case DW_FORM_ref_addr:                 return "FORM_ref_addr";
-    case DW_FORM_ref1:                     return "FORM_ref1";
-    case DW_FORM_ref2:                     return "FORM_ref2";
-    case DW_FORM_ref4:                     return "FORM_ref4";
-    case DW_FORM_ref8:                     return "FORM_ref8";
-    case DW_FORM_ref_udata:                return "FORM_ref_udata";
-    case DW_FORM_indirect:                 return "FORM_indirect";
+  case DW_FORM_addr:                     return "FORM_addr";
+  case DW_FORM_block2:                   return "FORM_block2";
+  case DW_FORM_block4:                   return "FORM_block4";
+  case DW_FORM_data2:                    return "FORM_data2";
+  case DW_FORM_data4:                    return "FORM_data4";
+  case DW_FORM_data8:                    return "FORM_data8";
+  case DW_FORM_string:                   return "FORM_string";
+  case DW_FORM_block:                    return "FORM_block";
+  case DW_FORM_block1:                   return "FORM_block1";
+  case DW_FORM_data1:                    return "FORM_data1";
+  case DW_FORM_flag:                     return "FORM_flag";
+  case DW_FORM_sdata:                    return "FORM_sdata";
+  case DW_FORM_strp:                     return "FORM_strp";
+  case DW_FORM_udata:                    return "FORM_udata";
+  case DW_FORM_ref_addr:                 return "FORM_ref_addr";
+  case DW_FORM_ref1:                     return "FORM_ref1";
+  case DW_FORM_ref2:                     return "FORM_ref2";
+  case DW_FORM_ref4:                     return "FORM_ref4";
+  case DW_FORM_ref8:                     return "FORM_ref8";
+  case DW_FORM_ref_udata:                return "FORM_ref_udata";
+  case DW_FORM_indirect:                 return "FORM_indirect";
   }
-  llvm_unreachable("Unknown Dwarf Form Encoding");
-  return "";
+  return 0;
 }
 
 /// OperationEncodingString - Return the string for the specified operation
 /// encoding.
-const char *OperationEncodingString(unsigned Encoding) {
+const char *llvm::dwarf::OperationEncodingString(unsigned Encoding) {
   switch (Encoding) {
-    case DW_OP_addr:                       return "OP_addr";
-    case DW_OP_deref:                      return "OP_deref";
-    case DW_OP_const1u:                    return "OP_const1u";
-    case DW_OP_const1s:                    return "OP_const1s";
-    case DW_OP_const2u:                    return "OP_const2u";
-    case DW_OP_const2s:                    return "OP_const2s";
-    case DW_OP_const4u:                    return "OP_const4u";
-    case DW_OP_const4s:                    return "OP_const4s";
-    case DW_OP_const8u:                    return "OP_const8u";
-    case DW_OP_const8s:                    return "OP_const8s";
-    case DW_OP_constu:                     return "OP_constu";
-    case DW_OP_consts:                     return "OP_consts";
-    case DW_OP_dup:                        return "OP_dup";
-    case DW_OP_drop:                       return "OP_drop";
-    case DW_OP_over:                       return "OP_over";
-    case DW_OP_pick:                       return "OP_pick";
-    case DW_OP_swap:                       return "OP_swap";
-    case DW_OP_rot:                        return "OP_rot";
-    case DW_OP_xderef:                     return "OP_xderef";
-    case DW_OP_abs:                        return "OP_abs";
-    case DW_OP_and:                        return "OP_and";
-    case DW_OP_div:                        return "OP_div";
-    case DW_OP_minus:                      return "OP_minus";
-    case DW_OP_mod:                        return "OP_mod";
-    case DW_OP_mul:                        return "OP_mul";
-    case DW_OP_neg:                        return "OP_neg";
-    case DW_OP_not:                        return "OP_not";
-    case DW_OP_or:                         return "OP_or";
-    case DW_OP_plus:                       return "OP_plus";
-    case DW_OP_plus_uconst:                return "OP_plus_uconst";
-    case DW_OP_shl:                        return "OP_shl";
-    case DW_OP_shr:                        return "OP_shr";
-    case DW_OP_shra:                       return "OP_shra";
-    case DW_OP_xor:                        return "OP_xor";
-    case DW_OP_skip:                       return "OP_skip";
-    case DW_OP_bra:                        return "OP_bra";
-    case DW_OP_eq:                         return "OP_eq";
-    case DW_OP_ge:                         return "OP_ge";
-    case DW_OP_gt:                         return "OP_gt";
-    case DW_OP_le:                         return "OP_le";
-    case DW_OP_lt:                         return "OP_lt";
-    case DW_OP_ne:                         return "OP_ne";
-    case DW_OP_lit0:                       return "OP_lit0";
-    case DW_OP_lit1:                       return "OP_lit1";
-    case DW_OP_lit31:                      return "OP_lit31";
-    case DW_OP_reg0:                       return "OP_reg0";
-    case DW_OP_reg1:                       return "OP_reg1";
-    case DW_OP_reg31:                      return "OP_reg31";
-    case DW_OP_breg0:                      return "OP_breg0";
-    case DW_OP_breg1:                      return "OP_breg1";
-    case DW_OP_breg31:                     return "OP_breg31";
-    case DW_OP_regx:                       return "OP_regx";
-    case DW_OP_fbreg:                      return "OP_fbreg";
-    case DW_OP_bregx:                      return "OP_bregx";
-    case DW_OP_piece:                      return "OP_piece";
-    case DW_OP_deref_size:                 return "OP_deref_size";
-    case DW_OP_xderef_size:                return "OP_xderef_size";
-    case DW_OP_nop:                        return "OP_nop";
-    case DW_OP_push_object_address:        return "OP_push_object_address";
-    case DW_OP_call2:                      return "OP_call2";
-    case DW_OP_call4:                      return "OP_call4";
-    case DW_OP_call_ref:                   return "OP_call_ref";
-    case DW_OP_form_tls_address:           return "OP_form_tls_address";
-    case DW_OP_call_frame_cfa:             return "OP_call_frame_cfa";
-    case DW_OP_lo_user:                    return "OP_lo_user";
-    case DW_OP_hi_user:                    return "OP_hi_user";
+  case DW_OP_addr:                       return "OP_addr";
+  case DW_OP_deref:                      return "OP_deref";
+  case DW_OP_const1u:                    return "OP_const1u";
+  case DW_OP_const1s:                    return "OP_const1s";
+  case DW_OP_const2u:                    return "OP_const2u";
+  case DW_OP_const2s:                    return "OP_const2s";
+  case DW_OP_const4u:                    return "OP_const4u";
+  case DW_OP_const4s:                    return "OP_const4s";
+  case DW_OP_const8u:                    return "OP_const8u";
+  case DW_OP_const8s:                    return "OP_const8s";
+  case DW_OP_constu:                     return "OP_constu";
+  case DW_OP_consts:                     return "OP_consts";
+  case DW_OP_dup:                        return "OP_dup";
+  case DW_OP_drop:                       return "OP_drop";
+  case DW_OP_over:                       return "OP_over";
+  case DW_OP_pick:                       return "OP_pick";
+  case DW_OP_swap:                       return "OP_swap";
+  case DW_OP_rot:                        return "OP_rot";
+  case DW_OP_xderef:                     return "OP_xderef";
+  case DW_OP_abs:                        return "OP_abs";
+  case DW_OP_and:                        return "OP_and";
+  case DW_OP_div:                        return "OP_div";
+  case DW_OP_minus:                      return "OP_minus";
+  case DW_OP_mod:                        return "OP_mod";
+  case DW_OP_mul:                        return "OP_mul";
+  case DW_OP_neg:                        return "OP_neg";
+  case DW_OP_not:                        return "OP_not";
+  case DW_OP_or:                         return "OP_or";
+  case DW_OP_plus:                       return "OP_plus";
+  case DW_OP_plus_uconst:                return "OP_plus_uconst";
+  case DW_OP_shl:                        return "OP_shl";
+  case DW_OP_shr:                        return "OP_shr";
+  case DW_OP_shra:                       return "OP_shra";
+  case DW_OP_xor:                        return "OP_xor";
+  case DW_OP_skip:                       return "OP_skip";
+  case DW_OP_bra:                        return "OP_bra";
+  case DW_OP_eq:                         return "OP_eq";
+  case DW_OP_ge:                         return "OP_ge";
+  case DW_OP_gt:                         return "OP_gt";
+  case DW_OP_le:                         return "OP_le";
+  case DW_OP_lt:                         return "OP_lt";
+  case DW_OP_ne:                         return "OP_ne";
+  case DW_OP_lit0:                       return "OP_lit0";
+  case DW_OP_lit1:                       return "OP_lit1";
+  case DW_OP_lit31:                      return "OP_lit31";
+  case DW_OP_reg0:                       return "OP_reg0";
+  case DW_OP_reg1:                       return "OP_reg1";
+  case DW_OP_reg31:                      return "OP_reg31";
+  case DW_OP_breg0:                      return "OP_breg0";
+  case DW_OP_breg1:                      return "OP_breg1";
+  case DW_OP_breg31:                     return "OP_breg31";
+  case DW_OP_regx:                       return "OP_regx";
+  case DW_OP_fbreg:                      return "OP_fbreg";
+  case DW_OP_bregx:                      return "OP_bregx";
+  case DW_OP_piece:                      return "OP_piece";
+  case DW_OP_deref_size:                 return "OP_deref_size";
+  case DW_OP_xderef_size:                return "OP_xderef_size";
+  case DW_OP_nop:                        return "OP_nop";
+  case DW_OP_push_object_address:        return "OP_push_object_address";
+  case DW_OP_call2:                      return "OP_call2";
+  case DW_OP_call4:                      return "OP_call4";
+  case DW_OP_call_ref:                   return "OP_call_ref";
+  case DW_OP_form_tls_address:           return "OP_form_tls_address";
+  case DW_OP_call_frame_cfa:             return "OP_call_frame_cfa";
+  case DW_OP_lo_user:                    return "OP_lo_user";
+  case DW_OP_hi_user:                    return "OP_hi_user";
   }
-  llvm_unreachable("Unknown Dwarf Operation Encoding");
-  return "";
+  return 0;
 }
 
 /// AttributeEncodingString - Return the string for the specified attribute
 /// encoding.
-const char *AttributeEncodingString(unsigned Encoding) {
+const char *llvm::dwarf::AttributeEncodingString(unsigned Encoding) {
   switch (Encoding) {
-    case DW_ATE_address:                   return "ATE_address";
-    case DW_ATE_boolean:                   return "ATE_boolean";
-    case DW_ATE_complex_float:             return "ATE_complex_float";
-    case DW_ATE_float:                     return "ATE_float";
-    case DW_ATE_signed:                    return "ATE_signed";
-    case DW_ATE_signed_char:               return "ATE_signed_char";
-    case DW_ATE_unsigned:                  return "ATE_unsigned";
-    case DW_ATE_unsigned_char:             return "ATE_unsigned_char";
-    case DW_ATE_imaginary_float:           return "ATE_imaginary_float";
-    case DW_ATE_packed_decimal:            return "ATE_packed_decimal";
-    case DW_ATE_numeric_string:            return "ATE_numeric_string";
-    case DW_ATE_edited:                    return "ATE_edited";
-    case DW_ATE_signed_fixed:              return "ATE_signed_fixed";
-    case DW_ATE_unsigned_fixed:            return "ATE_unsigned_fixed";
-    case DW_ATE_decimal_float:             return "ATE_decimal_float";
-    case DW_ATE_lo_user:                   return "ATE_lo_user";
-    case DW_ATE_hi_user:                   return "ATE_hi_user";
+  case DW_ATE_address:                   return "ATE_address";
+  case DW_ATE_boolean:                   return "ATE_boolean";
+  case DW_ATE_complex_float:             return "ATE_complex_float";
+  case DW_ATE_float:                     return "ATE_float";
+  case DW_ATE_signed:                    return "ATE_signed";
+  case DW_ATE_signed_char:               return "ATE_signed_char";
+  case DW_ATE_unsigned:                  return "ATE_unsigned";
+  case DW_ATE_unsigned_char:             return "ATE_unsigned_char";
+  case DW_ATE_imaginary_float:           return "ATE_imaginary_float";
+  case DW_ATE_packed_decimal:            return "ATE_packed_decimal";
+  case DW_ATE_numeric_string:            return "ATE_numeric_string";
+  case DW_ATE_edited:                    return "ATE_edited";
+  case DW_ATE_signed_fixed:              return "ATE_signed_fixed";
+  case DW_ATE_unsigned_fixed:            return "ATE_unsigned_fixed";
+  case DW_ATE_decimal_float:             return "ATE_decimal_float";
+  case DW_ATE_lo_user:                   return "ATE_lo_user";
+  case DW_ATE_hi_user:                   return "ATE_hi_user";
   }
-  llvm_unreachable("Unknown Dwarf Attribute Encoding");
-  return "";
+  return 0;
 }
 
 /// DecimalSignString - Return the string for the specified decimal sign
 /// attribute.
-const char *DecimalSignString(unsigned Sign) {
+const char *llvm::dwarf::DecimalSignString(unsigned Sign) {
   switch (Sign) {
-    case DW_DS_unsigned:                   return "DS_unsigned";
-    case DW_DS_leading_overpunch:          return "DS_leading_overpunch";
-    case DW_DS_trailing_overpunch:         return "DS_trailing_overpunch";
-    case DW_DS_leading_separate:           return "DS_leading_separate";
-    case DW_DS_trailing_separate:          return "DS_trailing_separate";
+  case DW_DS_unsigned:                   return "DS_unsigned";
+  case DW_DS_leading_overpunch:          return "DS_leading_overpunch";
+  case DW_DS_trailing_overpunch:         return "DS_trailing_overpunch";
+  case DW_DS_leading_separate:           return "DS_leading_separate";
+  case DW_DS_trailing_separate:          return "DS_trailing_separate";
   }
-  llvm_unreachable("Unknown Dwarf Decimal Sign Attribute");
-  return "";
+  return 0;
 }
 
 /// EndianityString - Return the string for the specified endianity.
 ///
-const char *EndianityString(unsigned Endian) {
+const char *llvm::dwarf::EndianityString(unsigned Endian) {
   switch (Endian) {
-    case DW_END_default:                   return "END_default";
-    case DW_END_big:                       return "END_big";
-    case DW_END_little:                    return "END_little";
-    case DW_END_lo_user:                   return "END_lo_user";
-    case DW_END_hi_user:                   return "END_hi_user";
+  case DW_END_default:                   return "END_default";
+  case DW_END_big:                       return "END_big";
+  case DW_END_little:                    return "END_little";
+  case DW_END_lo_user:                   return "END_lo_user";
+  case DW_END_hi_user:                   return "END_hi_user";
   }
-  llvm_unreachable("Unknown Dwarf Endianity");
-  return "";
+  return 0;
 }
 
 /// AccessibilityString - Return the string for the specified accessibility.
 ///
-const char *AccessibilityString(unsigned Access) {
+const char *llvm::dwarf::AccessibilityString(unsigned Access) {
   switch (Access) {
-    // Accessibility codes
-    case DW_ACCESS_public:                 return "ACCESS_public";
-    case DW_ACCESS_protected:              return "ACCESS_protected";
-    case DW_ACCESS_private:                return "ACCESS_private";
+  // Accessibility codes
+  case DW_ACCESS_public:                 return "ACCESS_public";
+  case DW_ACCESS_protected:              return "ACCESS_protected";
+  case DW_ACCESS_private:                return "ACCESS_private";
   }
-  llvm_unreachable("Unknown Dwarf Accessibility");
-  return "";
+  return 0;
 }
 
 /// VisibilityString - Return the string for the specified visibility.
 ///
-const char *VisibilityString(unsigned Visibility) {
+const char *llvm::dwarf::VisibilityString(unsigned Visibility) {
   switch (Visibility) {
-    case DW_VIS_local:                     return "VIS_local";
-    case DW_VIS_exported:                  return "VIS_exported";
-    case DW_VIS_qualified:                 return "VIS_qualified";
+  case DW_VIS_local:                     return "VIS_local";
+  case DW_VIS_exported:                  return "VIS_exported";
+  case DW_VIS_qualified:                 return "VIS_qualified";
   }
-  llvm_unreachable("Unknown Dwarf Visibility");
-  return "";
+  return 0;
 }
 
 /// VirtualityString - Return the string for the specified virtuality.
 ///
-const char *VirtualityString(unsigned Virtuality) {
+const char *llvm::dwarf::VirtualityString(unsigned Virtuality) {
   switch (Virtuality) {
-    case DW_VIRTUALITY_none:               return "VIRTUALITY_none";
-    case DW_VIRTUALITY_virtual:            return "VIRTUALITY_virtual";
-    case DW_VIRTUALITY_pure_virtual:       return "VIRTUALITY_pure_virtual";
+  case DW_VIRTUALITY_none:               return "VIRTUALITY_none";
+  case DW_VIRTUALITY_virtual:            return "VIRTUALITY_virtual";
+  case DW_VIRTUALITY_pure_virtual:       return "VIRTUALITY_pure_virtual";
   }
-  llvm_unreachable("Unknown Dwarf Virtuality");
-  return "";
+  return 0;
 }
 
 /// LanguageString - Return the string for the specified language.
 ///
-const char *LanguageString(unsigned Language) {
+const char *llvm::dwarf::LanguageString(unsigned Language) {
   switch (Language) {
-    case DW_LANG_C89:                      return "LANG_C89";
-    case DW_LANG_C:                        return "LANG_C";
-    case DW_LANG_Ada83:                    return "LANG_Ada83";
-    case DW_LANG_C_plus_plus:              return "LANG_C_plus_plus";
-    case DW_LANG_Cobol74:                  return "LANG_Cobol74";
-    case DW_LANG_Cobol85:                  return "LANG_Cobol85";
-    case DW_LANG_Fortran77:                return "LANG_Fortran77";
-    case DW_LANG_Fortran90:                return "LANG_Fortran90";
-    case DW_LANG_Pascal83:                 return "LANG_Pascal83";
-    case DW_LANG_Modula2:                  return "LANG_Modula2";
-    case DW_LANG_Java:                     return "LANG_Java";
-    case DW_LANG_C99:                      return "LANG_C99";
-    case DW_LANG_Ada95:                    return "LANG_Ada95";
-    case DW_LANG_Fortran95:                return "LANG_Fortran95";
-    case DW_LANG_PLI:                      return "LANG_PLI";
-    case DW_LANG_ObjC:                     return "LANG_ObjC";
-    case DW_LANG_ObjC_plus_plus:           return "LANG_ObjC_plus_plus";
-    case DW_LANG_UPC:                      return "LANG_UPC";
-    case DW_LANG_D:                        return "LANG_D";
-    case DW_LANG_lo_user:                  return "LANG_lo_user";
-    case DW_LANG_hi_user:                  return "LANG_hi_user";
+  case DW_LANG_C89:                      return "LANG_C89";
+  case DW_LANG_C:                        return "LANG_C";
+  case DW_LANG_Ada83:                    return "LANG_Ada83";
+  case DW_LANG_C_plus_plus:              return "LANG_C_plus_plus";
+  case DW_LANG_Cobol74:                  return "LANG_Cobol74";
+  case DW_LANG_Cobol85:                  return "LANG_Cobol85";
+  case DW_LANG_Fortran77:                return "LANG_Fortran77";
+  case DW_LANG_Fortran90:                return "LANG_Fortran90";
+  case DW_LANG_Pascal83:                 return "LANG_Pascal83";
+  case DW_LANG_Modula2:                  return "LANG_Modula2";
+  case DW_LANG_Java:                     return "LANG_Java";
+  case DW_LANG_C99:                      return "LANG_C99";
+  case DW_LANG_Ada95:                    return "LANG_Ada95";
+  case DW_LANG_Fortran95:                return "LANG_Fortran95";
+  case DW_LANG_PLI:                      return "LANG_PLI";
+  case DW_LANG_ObjC:                     return "LANG_ObjC";
+  case DW_LANG_ObjC_plus_plus:           return "LANG_ObjC_plus_plus";
+  case DW_LANG_UPC:                      return "LANG_UPC";
+  case DW_LANG_D:                        return "LANG_D";
+  case DW_LANG_lo_user:                  return "LANG_lo_user";
+  case DW_LANG_hi_user:                  return "LANG_hi_user";
   }
-  llvm_unreachable("Unknown Dwarf Language");
-  return "";
+  return 0;
 }
 
 /// CaseString - Return the string for the specified identifier case.
 ///
-const char *CaseString(unsigned Case) {
-   switch (Case) {
-    case DW_ID_case_sensitive:             return "ID_case_sensitive";
-    case DW_ID_up_case:                    return "ID_up_case";
-    case DW_ID_down_case:                  return "ID_down_case";
-    case DW_ID_case_insensitive:           return "ID_case_insensitive";
+const char *llvm::dwarf::CaseString(unsigned Case) {
+  switch (Case) {
+  case DW_ID_case_sensitive:             return "ID_case_sensitive";
+  case DW_ID_up_case:                    return "ID_up_case";
+  case DW_ID_down_case:                  return "ID_down_case";
+  case DW_ID_case_insensitive:           return "ID_case_insensitive";
   }
-  llvm_unreachable("Unknown Dwarf Identifier Case");
-  return "";
+  return 0;
 }
 
 /// ConventionString - Return the string for the specified calling convention.
 ///
-const char *ConventionString(unsigned Convention) {
+const char *llvm::dwarf::ConventionString(unsigned Convention) {
    switch (Convention) {
-    case DW_CC_normal:                     return "CC_normal";
-    case DW_CC_program:                    return "CC_program";
-    case DW_CC_nocall:                     return "CC_nocall";
-    case DW_CC_lo_user:                    return "CC_lo_user";
-    case DW_CC_hi_user:                    return "CC_hi_user";
+   case DW_CC_normal:                     return "CC_normal";
+   case DW_CC_program:                    return "CC_program";
+   case DW_CC_nocall:                     return "CC_nocall";
+   case DW_CC_lo_user:                    return "CC_lo_user";
+   case DW_CC_hi_user:                    return "CC_hi_user";
   }
-  llvm_unreachable("Unknown Dwarf Calling Convention");
-  return "";
+  return 0;
 }
 
 /// InlineCodeString - Return the string for the specified inline code.
 ///
-const char *InlineCodeString(unsigned Code) {
-   switch (Code) {
-    case DW_INL_not_inlined:               return "INL_not_inlined";
-    case DW_INL_inlined:                   return "INL_inlined";
-    case DW_INL_declared_not_inlined:      return "INL_declared_not_inlined";
-    case DW_INL_declared_inlined:          return "INL_declared_inlined";
+const char *llvm::dwarf::InlineCodeString(unsigned Code) {
+  switch (Code) {
+  case DW_INL_not_inlined:               return "INL_not_inlined";
+  case DW_INL_inlined:                   return "INL_inlined";
+  case DW_INL_declared_not_inlined:      return "INL_declared_not_inlined";
+  case DW_INL_declared_inlined:          return "INL_declared_inlined";
   }
-  llvm_unreachable("Unknown Dwarf Inline Code");
-  return "";
+  return 0;
 }
 
 /// ArrayOrderString - Return the string for the specified array order.
 ///
-const char *ArrayOrderString(unsigned Order) {
-   switch (Order) {
-    case DW_ORD_row_major:                 return "ORD_row_major";
-    case DW_ORD_col_major:                 return "ORD_col_major";
+const char *llvm::dwarf::ArrayOrderString(unsigned Order) {
+  switch (Order) {
+  case DW_ORD_row_major:                 return "ORD_row_major";
+  case DW_ORD_col_major:                 return "ORD_col_major";
   }
-  llvm_unreachable("Unknown Dwarf Array Order");
-  return "";
+  return 0;
 }
 
 /// DiscriminantString - Return the string for the specified discriminant
 /// descriptor.
-const char *DiscriminantString(unsigned Discriminant) {
-   switch (Discriminant) {
-    case DW_DSC_label:                     return "DSC_label";
-    case DW_DSC_range:                     return "DSC_range";
+const char *llvm::dwarf::DiscriminantString(unsigned Discriminant) {
+  switch (Discriminant) {
+  case DW_DSC_label:                     return "DSC_label";
+  case DW_DSC_range:                     return "DSC_range";
   }
-  llvm_unreachable("Unknown Dwarf Discriminant Descriptor");
-  return "";
+  return 0;
 }
 
 /// LNStandardString - Return the string for the specified line number standard.
 ///
-const char *LNStandardString(unsigned Standard) {
-   switch (Standard) {
-    case DW_LNS_copy:                      return "LNS_copy";
-    case DW_LNS_advance_pc:                return "LNS_advance_pc";
-    case DW_LNS_advance_line:              return "LNS_advance_line";
-    case DW_LNS_set_file:                  return "LNS_set_file";
-    case DW_LNS_set_column:                return "LNS_set_column";
-    case DW_LNS_negate_stmt:               return "LNS_negate_stmt";
-    case DW_LNS_set_basic_block:           return "LNS_set_basic_block";
-    case DW_LNS_const_add_pc:              return "LNS_const_add_pc";
-    case DW_LNS_fixed_advance_pc:          return "LNS_fixed_advance_pc";
-    case DW_LNS_set_prologue_end:          return "LNS_set_prologue_end";
-    case DW_LNS_set_epilogue_begin:        return "LNS_set_epilogue_begin";
-    case DW_LNS_set_isa:                   return "LNS_set_isa";
+const char *llvm::dwarf::LNStandardString(unsigned Standard) {
+  switch (Standard) {
+  case DW_LNS_copy:                      return "LNS_copy";
+  case DW_LNS_advance_pc:                return "LNS_advance_pc";
+  case DW_LNS_advance_line:              return "LNS_advance_line";
+  case DW_LNS_set_file:                  return "LNS_set_file";
+  case DW_LNS_set_column:                return "LNS_set_column";
+  case DW_LNS_negate_stmt:               return "LNS_negate_stmt";
+  case DW_LNS_set_basic_block:           return "LNS_set_basic_block";
+  case DW_LNS_const_add_pc:              return "LNS_const_add_pc";
+  case DW_LNS_fixed_advance_pc:          return "LNS_fixed_advance_pc";
+  case DW_LNS_set_prologue_end:          return "LNS_set_prologue_end";
+  case DW_LNS_set_epilogue_begin:        return "LNS_set_epilogue_begin";
+  case DW_LNS_set_isa:                   return "LNS_set_isa";
   }
-  llvm_unreachable("Unknown Dwarf Line Number Standard");
-  return "";
+  return 0;
 }
 
 /// LNExtendedString - Return the string for the specified line number extended
 /// opcode encodings.
-const char *LNExtendedString(unsigned Encoding) {
-   switch (Encoding) {
-    // Line Number Extended Opcode Encodings
-    case DW_LNE_end_sequence:              return "LNE_end_sequence";
-    case DW_LNE_set_address:               return "LNE_set_address";
-    case DW_LNE_define_file:               return "LNE_define_file";
-    case DW_LNE_lo_user:                   return "LNE_lo_user";
-    case DW_LNE_hi_user:                   return "LNE_hi_user";
+const char *llvm::dwarf::LNExtendedString(unsigned Encoding) {
+  switch (Encoding) {
+  // Line Number Extended Opcode Encodings
+  case DW_LNE_end_sequence:              return "LNE_end_sequence";
+  case DW_LNE_set_address:               return "LNE_set_address";
+  case DW_LNE_define_file:               return "LNE_define_file";
+  case DW_LNE_lo_user:                   return "LNE_lo_user";
+  case DW_LNE_hi_user:                   return "LNE_hi_user";
   }
-  llvm_unreachable("Unknown Dwarf Line Number Extended Opcode Encoding");
-  return "";
+  return 0;
 }
 
 /// MacinfoString - Return the string for the specified macinfo type encodings.
 ///
-const char *MacinfoString(unsigned Encoding) {
-   switch (Encoding) {
-    // Macinfo Type Encodings
-    case DW_MACINFO_define:                return "MACINFO_define";
-    case DW_MACINFO_undef:                 return "MACINFO_undef";
-    case DW_MACINFO_start_file:            return "MACINFO_start_file";
-    case DW_MACINFO_end_file:              return "MACINFO_end_file";
-    case DW_MACINFO_vendor_ext:            return "MACINFO_vendor_ext";
+const char *llvm::dwarf::MacinfoString(unsigned Encoding) {
+  switch (Encoding) {
+  // Macinfo Type Encodings
+  case DW_MACINFO_define:                return "MACINFO_define";
+  case DW_MACINFO_undef:                 return "MACINFO_undef";
+  case DW_MACINFO_start_file:            return "MACINFO_start_file";
+  case DW_MACINFO_end_file:              return "MACINFO_end_file";
+  case DW_MACINFO_vendor_ext:            return "MACINFO_vendor_ext";
   }
-  llvm_unreachable("Unknown Dwarf Macinfo Type Encodings");
-  return "";
+  return 0;
 }
 
 /// CallFrameString - Return the string for the specified call frame instruction
 /// encodings.
-const char *CallFrameString(unsigned Encoding) {
-   switch (Encoding) {
-    case DW_CFA_advance_loc:               return "CFA_advance_loc";
-    case DW_CFA_offset:                    return "CFA_offset";
-    case DW_CFA_restore:                   return "CFA_restore";
-    case DW_CFA_set_loc:                   return "CFA_set_loc";
-    case DW_CFA_advance_loc1:              return "CFA_advance_loc1";
-    case DW_CFA_advance_loc2:              return "CFA_advance_loc2";
-    case DW_CFA_advance_loc4:              return "CFA_advance_loc4";
-    case DW_CFA_offset_extended:           return "CFA_offset_extended";
-    case DW_CFA_restore_extended:          return "CFA_restore_extended";
-    case DW_CFA_undefined:                 return "CFA_undefined";
-    case DW_CFA_same_value:                return "CFA_same_value";
-    case DW_CFA_register:                  return "CFA_register";
-    case DW_CFA_remember_state:            return "CFA_remember_state";
-    case DW_CFA_restore_state:             return "CFA_restore_state";
-    case DW_CFA_def_cfa:                   return "CFA_def_cfa";
-    case DW_CFA_def_cfa_register:          return "CFA_def_cfa_register";
-    case DW_CFA_def_cfa_offset:            return "CFA_def_cfa_offset";
-    case DW_CFA_def_cfa_expression:        return "CFA_def_cfa_expression";
-    case DW_CFA_expression:                return "CFA_expression";
-    case DW_CFA_offset_extended_sf:        return "CFA_offset_extended_sf";
-    case DW_CFA_def_cfa_sf:                return "CFA_def_cfa_sf";
-    case DW_CFA_def_cfa_offset_sf:         return "CFA_def_cfa_offset_sf";
-    case DW_CFA_val_offset:                return "CFA_val_offset";
-    case DW_CFA_val_offset_sf:             return "CFA_val_offset_sf";
-    case DW_CFA_val_expression:            return "CFA_val_expression";
-    case DW_CFA_lo_user:                   return "CFA_lo_user";
-    case DW_CFA_hi_user:                   return "CFA_hi_user";
+const char *llvm::dwarf::CallFrameString(unsigned Encoding) {
+  switch (Encoding) {
+  case DW_CFA_advance_loc:               return "CFA_advance_loc";
+  case DW_CFA_offset:                    return "CFA_offset";
+  case DW_CFA_restore:                   return "CFA_restore";
+  case DW_CFA_set_loc:                   return "CFA_set_loc";
+  case DW_CFA_advance_loc1:              return "CFA_advance_loc1";
+  case DW_CFA_advance_loc2:              return "CFA_advance_loc2";
+  case DW_CFA_advance_loc4:              return "CFA_advance_loc4";
+  case DW_CFA_offset_extended:           return "CFA_offset_extended";
+  case DW_CFA_restore_extended:          return "CFA_restore_extended";
+  case DW_CFA_undefined:                 return "CFA_undefined";
+  case DW_CFA_same_value:                return "CFA_same_value";
+  case DW_CFA_register:                  return "CFA_register";
+  case DW_CFA_remember_state:            return "CFA_remember_state";
+  case DW_CFA_restore_state:             return "CFA_restore_state";
+  case DW_CFA_def_cfa:                   return "CFA_def_cfa";
+  case DW_CFA_def_cfa_register:          return "CFA_def_cfa_register";
+  case DW_CFA_def_cfa_offset:            return "CFA_def_cfa_offset";
+  case DW_CFA_def_cfa_expression:        return "CFA_def_cfa_expression";
+  case DW_CFA_expression:                return "CFA_expression";
+  case DW_CFA_offset_extended_sf:        return "CFA_offset_extended_sf";
+  case DW_CFA_def_cfa_sf:                return "CFA_def_cfa_sf";
+  case DW_CFA_def_cfa_offset_sf:         return "CFA_def_cfa_offset_sf";
+  case DW_CFA_val_offset:                return "CFA_val_offset";
+  case DW_CFA_val_offset_sf:             return "CFA_val_offset_sf";
+  case DW_CFA_val_expression:            return "CFA_val_expression";
+  case DW_CFA_lo_user:                   return "CFA_lo_user";
+  case DW_CFA_hi_user:                   return "CFA_hi_user";
   }
-  llvm_unreachable("Unknown Dwarf Call Frame Instruction Encodings");
-  return "";
+  return 0;
 }
-
-} // End of namespace dwarf.
-
-} // End of namespace llvm.
diff --git a/lib/Support/MemoryBuffer.cpp b/lib/Support/MemoryBuffer.cpp
index df1aa6a..9253b01 100644
--- a/lib/Support/MemoryBuffer.cpp
+++ b/lib/Support/MemoryBuffer.cpp
@@ -46,7 +46,7 @@ MemoryBuffer::~MemoryBuffer() {
 /// successfully.
 void MemoryBuffer::initCopyOf(const char *BufStart, const char *BufEnd) {
   size_t Size = BufEnd-BufStart;
-  BufferStart = (char *)malloc((Size+1) * sizeof(char));
+  BufferStart = (char *)malloc(Size+1);
   BufferEnd = BufferStart+Size;
   memcpy(const_cast<char*>(BufferStart), BufStart, Size);
   *const_cast<char*>(BufferEnd) = 0;   // Null terminate buffer.
@@ -108,7 +108,7 @@ MemoryBuffer *MemoryBuffer::getMemBufferCopy(const char *StartPtr,
 /// the MemoryBuffer object.
 MemoryBuffer *MemoryBuffer::getNewUninitMemBuffer(size_t Size,
                                                   StringRef BufferName) {
-  char *Buf = (char *)malloc((Size+1) * sizeof(char));
+  char *Buf = (char *)malloc(Size+1);
   if (!Buf) return 0;
   Buf[Size] = 0;
   MemoryBufferMem *SB = new MemoryBufferMem(Buf, Buf+Size, BufferName);
diff --git a/lib/Support/SmallVector.cpp b/lib/Support/SmallVector.cpp
new file mode 100644
index 0000000..6821382
--- /dev/null
+++ b/lib/Support/SmallVector.cpp
@@ -0,0 +1,37 @@
+//===- llvm/ADT/SmallVector.cpp - 'Normally small' vectors ----------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+//
+// This file implements the SmallVector class.
+//
+//===----------------------------------------------------------------------===//
+
+#include "llvm/ADT/SmallVector.h"
+using namespace llvm;
+
+/// grow_pod - This is an implementation of the grow() method which only works
+/// on POD-like datatypes and is out of line to reduce code duplication.
+void SmallVectorBase::grow_pod(size_t MinSizeInBytes, size_t TSize) {
+  size_t CurSizeBytes = size_in_bytes();
+  size_t NewCapacityInBytes = 2 * capacity_in_bytes();
+  if (NewCapacityInBytes < MinSizeInBytes)
+    NewCapacityInBytes = MinSizeInBytes;
+  void *NewElts = operator new(NewCapacityInBytes);
+  
+  // Copy the elements over.  No need to run dtors on PODs.
+  memcpy(NewElts, this->BeginX, CurSizeBytes);
+  
+  // If this wasn't grown from the inline copy, deallocate the old space.
+  if (!this->isSmall())
+    operator delete(this->BeginX);
+  
+  this->EndX = (char*)NewElts+CurSizeBytes;
+  this->BeginX = NewElts;
+  this->CapacityX = (char*)this->BeginX + NewCapacityInBytes;
+}
+
diff --git a/lib/Support/StringRef.cpp b/lib/Support/StringRef.cpp
index 2d023e4..e4a9984 100644
--- a/lib/Support/StringRef.cpp
+++ b/lib/Support/StringRef.cpp
@@ -8,6 +8,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/ADT/StringRef.h"
+#include "llvm/ADT/SmallVector.h"
 using namespace llvm;
 
 // MSVC emits references to this into the translation units which reference it.
@@ -35,6 +36,45 @@ int StringRef::compare_lower(StringRef RHS) const {
   return Length < RHS.Length ? -1 : 1;
 }
 
+// Compute the edit distance between the two given strings.
+unsigned StringRef::edit_distance(llvm::StringRef Other, 
+                                  bool AllowReplacements) {
+  // The algorithm implemented below is the "classic"
+  // dynamic-programming algorithm for computing the Levenshtein
+  // distance, which is described here:
+  //
+  //   http://en.wikipedia.org/wiki/Levenshtein_distance
+  //
+  // Although the algorithm is typically described using an m x n
+  // array, only two rows are used at a time, so this implemenation
+  // just keeps two separate vectors for those two rows.
+  size_type m = size();
+  size_type n = Other.size();
+
+  SmallVector<unsigned, 32> previous(n+1, 0);
+  for (SmallVector<unsigned, 32>::size_type i = 0; i <= n; ++i) 
+    previous[i] = i;
+
+  SmallVector<unsigned, 32> current(n+1, 0);
+  for (size_type y = 1; y <= m; ++y) {
+    current.assign(n+1, 0);
+    current[0] = y;
+    for (size_type x = 1; x <= n; ++x) {
+      if (AllowReplacements) {
+        current[x] = min(previous[x-1] + ((*this)[y-1] == Other[x-1]? 0u:1u),
+                         min(current[x-1], previous[x])+1);
+      }
+      else {
+        if ((*this)[y-1] == Other[x-1]) current[x] = previous[x-1];
+        else current[x] = min(current[x-1], previous[x]) + 1;
+      }
+    }
+    current.swap(previous);
+  }
+
+  return previous[n];
+}
+
 //===----------------------------------------------------------------------===//
 // String Searching
 //===----------------------------------------------------------------------===//
diff --git a/lib/Support/circular_raw_ostream.cpp b/lib/Support/circular_raw_ostream.cpp
new file mode 100644
index 0000000..e52996d
--- /dev/null
+++ b/lib/Support/circular_raw_ostream.cpp
@@ -0,0 +1,47 @@
+//===- circulat_raw_ostream.cpp - Implement the circular_raw_ostream class -===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+//
+// This implements support for circular buffered streams.
+//
+//===----------------------------------------------------------------------===//
+
+#include "llvm/Support/circular_raw_ostream.h"
+
+#include <algorithm>
+
+using namespace llvm;
+
+void circular_raw_ostream::write_impl(const char *Ptr, size_t Size) {
+  if (BufferSize == 0) {
+    TheStream->write(Ptr, Size);
+    return;
+  }
+
+  // Write into the buffer, wrapping if necessary.
+  while (Size != 0) {
+    unsigned Bytes = std::min(Size, BufferSize - (Cur - BufferArray));
+    memcpy(Cur, Ptr, Bytes);
+    Size -= Bytes;
+    Cur += Bytes;
+    if (Cur == BufferArray + BufferSize) {
+      // Reset the output pointer to the start of the buffer.
+      Cur = BufferArray;
+      Filled = true;
+    }
+  }    
+}
+
+void circular_raw_ostream::flushBufferWithBanner(void) {
+  if (BufferSize != 0) {
+    // Write out the buffer
+    int num = std::strlen(Banner); 
+    TheStream->write(Banner, num);
+    flushBuffer();
+  }
+}
diff --git a/lib/Support/raw_os_ostream.cpp b/lib/Support/raw_os_ostream.cpp
index 3374dd7..44f2325 100644
--- a/lib/Support/raw_os_ostream.cpp
+++ b/lib/Support/raw_os_ostream.cpp
@@ -27,4 +27,4 @@ void raw_os_ostream::write_impl(const char *Ptr, size_t Size) {
   OS.write(Ptr, Size);
 }
 
-uint64_t raw_os_ostream::current_pos() { return OS.tellp(); }
+uint64_t raw_os_ostream::current_pos() const { return OS.tellp(); }
diff --git a/lib/Support/raw_ostream.cpp b/lib/Support/raw_ostream.cpp
index 0c90e77..a820210 100644
--- a/lib/Support/raw_ostream.cpp
+++ b/lib/Support/raw_ostream.cpp
@@ -67,7 +67,7 @@ raw_ostream::~raw_ostream() {
 // An out of line virtual method to provide a home for the class vtable.
 void raw_ostream::handle() {}
 
-size_t raw_ostream::preferred_buffer_size() {
+size_t raw_ostream::preferred_buffer_size() const {
   // BUFSIZ is intended to be a reasonable default.
   return BUFSIZ;
 }
@@ -440,20 +440,20 @@ uint64_t raw_fd_ostream::seek(uint64_t off) {
   return pos;  
 }
 
-size_t raw_fd_ostream::preferred_buffer_size() {
+size_t raw_fd_ostream::preferred_buffer_size() const {
 #if !defined(_MSC_VER) && !defined(__MINGW32__) // Windows has no st_blksize.
   assert(FD >= 0 && "File not yet open!");
   struct stat statbuf;
-  if (fstat(FD, &statbuf) == 0) {
-    // If this is a terminal, don't use buffering. Line buffering
-    // would be a more traditional thing to do, but it's not worth
-    // the complexity.
-    if (S_ISCHR(statbuf.st_mode) && isatty(FD))
-      return 0;
-    // Return the preferred block size.
-    return statbuf.st_blksize;
-  }
-  error_detected();
+  if (fstat(FD, &statbuf) != 0)
+    return 0;
+  
+  // If this is a terminal, don't use buffering. Line buffering
+  // would be a more traditional thing to do, but it's not worth
+  // the complexity.
+  if (S_ISCHR(statbuf.st_mode) && isatty(FD))
+    return 0;
+  // Return the preferred block size.
+  return statbuf.st_blksize;
 #endif
   return raw_ostream::preferred_buffer_size();
 }
@@ -578,7 +578,9 @@ void raw_svector_ostream::write_impl(const char *Ptr, size_t Size) {
   SetBuffer(OS.end(), OS.capacity() - OS.size());
 }
 
-uint64_t raw_svector_ostream::current_pos() { return OS.size(); }
+uint64_t raw_svector_ostream::current_pos() const {
+   return OS.size();
+}
 
 StringRef raw_svector_ostream::str() {
   flush();
@@ -601,6 +603,6 @@ raw_null_ostream::~raw_null_ostream() {
 void raw_null_ostream::write_impl(const char *Ptr, size_t Size) {
 }
 
-uint64_t raw_null_ostream::current_pos() {
+uint64_t raw_null_ostream::current_pos() const {
   return 0;
 }