Merge commit '59a2e4fb0e4e' from apple/master into swift/master-next

Author: git apple-llvm automerger

llvm/include/llvm/CodeGen/MIRFormatter.h

@@ -14,11 +14,15 @@
 #ifndef LLVM_CODEGEN_MIRFORMATTER_H
 #define LLVM_CODEGEN_MIRFORMATTER_H
 
-#include "llvm/CodeGen/MachineInstr.h"
+#include "llvm/ADT/Optional.h"
 #include "llvm/CodeGen/PseudoSourceValue.h"
+#include "llvm/Support/raw_ostream.h"
+#include <cstdint>
 
 namespace llvm {
 
+class MachineFunction;
+class MachineInstr;
 struct PerFunctionMIParsingState;
 struct SlotMapping;