Index: llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp
===================================================================
--- llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp
+++ llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp
@@ -6382,6 +6382,9 @@
 }
 
 namespace {
+// FIXME: This class is only here to support the transition to llvm::Error. It
+// will be removed once this transition is complete. Clients should prefer to
+// deal with the Error value directly, rather than converting to error_code.
 class BitcodeErrorCategoryType : public std::error_category {
   const char *name() const LLVM_NOEXCEPT override {
     return "llvm.bitcode";
Index: llvm/trunk/lib/DebugInfo/PDB/DIA/DIAError.cpp
===================================================================
--- llvm/trunk/lib/DebugInfo/PDB/DIA/DIAError.cpp
+++ llvm/trunk/lib/DebugInfo/PDB/DIA/DIAError.cpp
@@ -5,6 +5,9 @@
 using namespace llvm;
 using namespace llvm::pdb;
 
+// FIXME: This class is only here to support the transition to llvm::Error. It
+// will be removed once this transition is complete. Clients should prefer to
+// deal with the Error value directly, rather than converting to error_code.
 class DIAErrorCategory : public std::error_category {
 public:
   const char *name() const LLVM_NOEXCEPT override { return "llvm.pdb.dia"; }
Index: llvm/trunk/lib/DebugInfo/PDB/GenericError.cpp
===================================================================
--- llvm/trunk/lib/DebugInfo/PDB/GenericError.cpp
+++ llvm/trunk/lib/DebugInfo/PDB/GenericError.cpp
@@ -15,6 +15,9 @@
 using namespace llvm::pdb;
 
 namespace {
+// FIXME: This class is only here to support the transition to llvm::Error. It
+// will be removed once this transition is complete. Clients should prefer to
+// deal with the Error value directly, rather than converting to error_code.
 class GenericErrorCategory : public std::error_category {
 public:
   const char *name() const LLVM_NOEXCEPT override { return "llvm.pdb"; }
Index: llvm/trunk/lib/DebugInfo/PDB/Raw/RawError.cpp
===================================================================
--- llvm/trunk/lib/DebugInfo/PDB/Raw/RawError.cpp
+++ llvm/trunk/lib/DebugInfo/PDB/Raw/RawError.cpp
@@ -6,6 +6,9 @@
 using namespace llvm::pdb;
 
 namespace {
+// FIXME: This class is only here to support the transition to llvm::Error. It
+// will be removed once this transition is complete. Clients should prefer to
+// deal with the Error value directly, rather than converting to error_code.
 class RawErrorCategory : public std::error_category {
 public:
   const char *name() const LLVM_NOEXCEPT override { return "llvm.pdb.raw"; }
Index: llvm/trunk/lib/ExecutionEngine/Orc/OrcError.cpp
===================================================================
--- llvm/trunk/lib/ExecutionEngine/Orc/OrcError.cpp
+++ llvm/trunk/lib/ExecutionEngine/Orc/OrcError.cpp
@@ -20,6 +20,9 @@
 
 namespace {
 
+// FIXME: This class is only here to support the transition to llvm::Error. It
+// will be removed once this transition is complete. Clients should prefer to
+// deal with the Error value directly, rather than converting to error_code.
 class OrcErrorCategory : public std::error_category {
 public:
   const char *name() const LLVM_NOEXCEPT override { return "orc"; }
Index: llvm/trunk/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp
===================================================================
--- llvm/trunk/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp
+++ llvm/trunk/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp
@@ -34,6 +34,9 @@
   GenericRTDyldError = 1
 };
 
+// FIXME: This class is only here to support the transition to llvm::Error. It
+// will be removed once this transition is complete. Clients should prefer to
+// deal with the Error value directly, rather than converting to error_code.
 class RuntimeDyldErrorCategory : public std::error_category {
 public:
   const char *name() const LLVM_NOEXCEPT override { return "runtimedyld"; }
Index: llvm/trunk/lib/Object/Error.cpp
===================================================================
--- llvm/trunk/lib/Object/Error.cpp
+++ llvm/trunk/lib/Object/Error.cpp
@@ -19,6 +19,9 @@
 using namespace object;
 
 namespace {
+// FIXME: This class is only here to support the transition to llvm::Error. It
+// will be removed once this transition is complete. Clients should prefer to
+// deal with the Error value directly, rather than converting to error_code.
 class _object_error_category : public std::error_category {
 public:
   const char* name() const LLVM_NOEXCEPT override;
Index: llvm/trunk/lib/ProfileData/Coverage/CoverageMapping.cpp
===================================================================
--- llvm/trunk/lib/ProfileData/Coverage/CoverageMapping.cpp
+++ llvm/trunk/lib/ProfileData/Coverage/CoverageMapping.cpp
@@ -556,6 +556,9 @@
   llvm_unreachable("A value of coveragemap_error has no message.");
 }
 
+// FIXME: This class is only here to support the transition to llvm::Error. It
+// will be removed once this transition is complete. Clients should prefer to
+// deal with the Error value directly, rather than converting to error_code.
 class CoverageMappingErrorCategoryType : public std::error_category {
   const char *name() const LLVM_NOEXCEPT override { return "llvm.coveragemap"; }
   std::string message(int IE) const override {
Index: llvm/trunk/lib/ProfileData/InstrProf.cpp
===================================================================
--- llvm/trunk/lib/ProfileData/InstrProf.cpp
+++ llvm/trunk/lib/ProfileData/InstrProf.cpp
@@ -67,6 +67,9 @@
   llvm_unreachable("A value of instrprof_error has no message.");
 }
 
+// FIXME: This class is only here to support the transition to llvm::Error. It
+// will be removed once this transition is complete. Clients should prefer to
+// deal with the Error value directly, rather than converting to error_code.
 class InstrProfErrorCategoryType : public std::error_category {
   const char *name() const LLVM_NOEXCEPT override { return "llvm.instrprof"; }
   std::string message(int IE) const override {
Index: llvm/trunk/lib/ProfileData/SampleProf.cpp
===================================================================
--- llvm/trunk/lib/ProfileData/SampleProf.cpp
+++ llvm/trunk/lib/ProfileData/SampleProf.cpp
@@ -20,6 +20,9 @@
 using namespace llvm;
 
 namespace {
+// FIXME: This class is only here to support the transition to llvm::Error. It
+// will be removed once this transition is complete. Clients should prefer to
+// deal with the Error value directly, rather than converting to error_code.
 class SampleProfErrorCategoryType : public std::error_category {
   const char *name() const LLVM_NOEXCEPT override { return "llvm.sampleprof"; }
   std::string message(int IE) const override {
Index: llvm/trunk/lib/Support/Error.cpp
===================================================================
--- llvm/trunk/lib/Support/Error.cpp
+++ llvm/trunk/lib/Support/Error.cpp
@@ -19,6 +19,9 @@
     MultipleErrors
   };
 
+  // FIXME: This class is only here to support the transition to llvm::Error. It
+  // will be removed once this transition is complete. Clients should prefer to
+  // deal with the Error value directly, rather than converting to error_code.
   class ErrorErrorCategory : public std::error_category {
   public:
     const char *name() const LLVM_NOEXCEPT override { return "Error"; }
Index: llvm/trunk/tools/llvm-cxxdump/Error.cpp
===================================================================
--- llvm/trunk/tools/llvm-cxxdump/Error.cpp
+++ llvm/trunk/tools/llvm-cxxdump/Error.cpp
@@ -17,6 +17,9 @@
 using namespace llvm;
 
 namespace {
+// FIXME: This class is only here to support the transition to llvm::Error. It
+// will be removed once this transition is complete. Clients should prefer to
+// deal with the Error value directly, rather than converting to error_code.
 class cxxdump_error_category : public std::error_category {
 public:
   const char *name() const LLVM_NOEXCEPT override { return "llvm.cxxdump"; }
Index: llvm/trunk/tools/llvm-readobj/Error.cpp
===================================================================
--- llvm/trunk/tools/llvm-readobj/Error.cpp
+++ llvm/trunk/tools/llvm-readobj/Error.cpp
@@ -17,6 +17,9 @@
 using namespace llvm;
 
 namespace {
+// FIXME: This class is only here to support the transition to llvm::Error. It
+// will be removed once this transition is complete. Clients should prefer to
+// deal with the Error value directly, rather than converting to error_code.
 class _readobj_error_category : public std::error_category {
 public:
   const char* name() const LLVM_NOEXCEPT override;
Index: llvm/trunk/tools/obj2yaml/Error.cpp
===================================================================
--- llvm/trunk/tools/obj2yaml/Error.cpp
+++ llvm/trunk/tools/obj2yaml/Error.cpp
@@ -13,6 +13,9 @@
 using namespace llvm;
 
 namespace {
+// FIXME: This class is only here to support the transition to llvm::Error. It
+// will be removed once this transition is complete. Clients should prefer to
+// deal with the Error value directly, rather than converting to error_code.
 class _obj2yaml_error_category : public std::error_category {
 public:
   const char *name() const LLVM_NOEXCEPT override;