[clang][Interp][NFC] Clean up Context includes

Author: tbaederr

clang/lib/AST/Interp/ByteCodeEmitter.cpp

@@ -7,6 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "ByteCodeEmitter.h"
+#include "ByteCodeGenError.h"
 #include "Context.h"
 #include "Floating.h"
 #include "Opcode.h"
@@ -18,9 +19,6 @@
 using namespace clang;
 using namespace clang::interp;
 
-using APSInt = llvm::APSInt;
-using Error = llvm::Error;
-
 Expected<Function *>
 ByteCodeEmitter::compileFunc(const FunctionDecl *FuncDecl) {
   // Set up argument indices.

clang/lib/AST/Interp/ByteCodeEmitter.h

@@ -13,19 +13,14 @@
 #ifndef LLVM_CLANG_AST_INTERP_LINKEMITTER_H
 #define LLVM_CLANG_AST_INTERP_LINKEMITTER_H
 
-#include "ByteCodeGenError.h"
 #include "Context.h"
-#include "InterpStack.h"
-#include "InterpState.h"
 #include "PrimType.h"
 #include "Program.h"
 #include "Source.h"
 #include "llvm/Support/Error.h"
 
 namespace clang {
 namespace interp {
-class Context;
-class SourceInfo;
 enum Opcode : uint32_t;
 
 /// An emitter which links the program to bytecode for later use.

clang/lib/AST/Interp/Context.cpp

@@ -9,6 +9,7 @@
 #include "Context.h"
 #include "ByteCodeEmitter.h"
 #include "ByteCodeExprGen.h"
+#include "ByteCodeGenError.h"
 #include "ByteCodeStmtGen.h"
 #include "EvalEmitter.h"
 #include "Interp.h"

clang/lib/AST/Interp/Context.h

@@ -17,13 +17,13 @@
 #define LLVM_CLANG_AST_INTERP_CONTEXT_H
 
 #include "InterpStack.h"
-#include "clang/AST/APValue.h"
 
 namespace clang {
 class ASTContext;
 class LangOptions;
 class FunctionDecl;
 class VarDecl;
+class APValue;
 
 namespace interp {
 class Function;