cleanup

Author: joaosaffran

llvm/include/llvm/BinaryFormat/DXContainer.h

@@ -14,12 +14,11 @@
 #define LLVM_BINARYFORMAT_DXCONTAINER_H
 
 #include "llvm/ADT/StringRef.h"
-#include "llvm/Object/Error.h"
+#include "llvm/Support/BinaryStreamError.h"
 #include "llvm/Support/Error.h"
 #include "llvm/Support/SwapByteOrder.h"
 #include "llvm/TargetParser/Triple.h"
 
-#include <cstdint>
 #include <stdint.h>
 
 namespace llvm {
@@ -553,13 +552,13 @@ struct RootSignatureValidations {
 
   static Expected<uint32_t> validateRootFlag(uint32_t Flags) {
     if ((Flags & ~0x80000fff) != 0)
-      return llvm::make_error<object::GenericBinaryError>("Invalid flag");
+      return llvm::make_error<BinaryStreamError>("Invalid flag");
     return Flags;
   }
 
   static Expected<uint32_t> validateVersion(uint32_t Version) {
     if (Version < 1 || Version > 2)
-      return llvm::make_error<object::GenericBinaryError>("Invalid Version");
+      return llvm::make_error<BinaryStreamError>("Invalid Version");
     return Version;
   }
 };

llvm/include/llvm/Object/DXContainer.h

@@ -18,7 +18,6 @@
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/BinaryFormat/DXContainer.h"
-#include "llvm/Object/Error.h"
 #include "llvm/Support/Error.h"
 #include "llvm/Support/MemoryBufferRef.h"
 #include "llvm/TargetParser/Triple.h"

llvm/lib/Object/DXContainer.cpp

@@ -7,14 +7,11 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/Object/DXContainer.h"
-#include "llvm/ADT/StringRef.h"
 #include "llvm/BinaryFormat/DXContainer.h"
 #include "llvm/Object/Error.h"
 #include "llvm/Support/Alignment.h"
 #include "llvm/Support/Endian.h"
-#include "llvm/Support/Error.h"
 #include "llvm/Support/FormatVariadic.h"
-#include <cstdint>
 
 using namespace llvm;
 using namespace llvm::object;

llvm/lib/ObjectYAML/DXContainerYAML.cpp

@@ -14,7 +14,6 @@
 #include "llvm/ObjectYAML/DXContainerYAML.h"
 #include "llvm/ADT/ScopeExit.h"
 #include "llvm/BinaryFormat/DXContainer.h"
-#include "llvm/Object/DXContainer.h"
 #include "llvm/Support/ScopedPrinter.h"
 
 namespace llvm {