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

[Timm Bäder via cfe-commits]

Author: Timm Bäder
Date: 2023-09-24T10:40:17+02:00
New Revision: a7fdbecfb3ce2446e6016a9c868805c97d8f1468

URL: https://github.com/llvm/llvm-project/commit/a7fdbecfb3ce2446e6016a9c868805c97d8f1468
DIFF: https://github.com/llvm/llvm-project/commit/a7fdbecfb3ce2446e6016a9c868805c97d8f1468.diff

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

Added: 
    

Modified: 
    clang/lib/AST/Interp/ByteCodeEmitter.cpp
    clang/lib/AST/Interp/ByteCodeEmitter.h
    clang/lib/AST/Interp/Context.cpp
    clang/lib/AST/Interp/Context.h

Removed: 
    


################################################################################
diff  --git a/clang/lib/AST/Interp/ByteCodeEmitter.cpp b/clang/lib/AST/Interp/ByteCodeEmitter.cpp
index 9b6adcc29bac5f1..14593fbffa0e99d 100644
--- a/clang/lib/AST/Interp/ByteCodeEmitter.cpp
+++ b/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.

diff  --git a/clang/lib/AST/Interp/ByteCodeEmitter.h b/clang/lib/AST/Interp/ByteCodeEmitter.h
index c917622a1864fac..d184484a9197f93 100644
--- a/clang/lib/AST/Interp/ByteCodeEmitter.h
+++ b/clang/lib/AST/Interp/ByteCodeEmitter.h
@@ -13,10 +13,7 @@
 #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"
@@ -24,8 +21,6 @@
 
 namespace clang {
 namespace interp {
-class Context;
-class SourceInfo;
 enum Opcode : uint32_t;
 
 /// An emitter which links the program to bytecode for later use.

diff  --git a/clang/lib/AST/Interp/Context.cpp b/clang/lib/AST/Interp/Context.cpp
index 1a732b6c1a092ac..1c1aacbc8bb9e7d 100644
--- a/clang/lib/AST/Interp/Context.cpp
+++ b/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"

diff  --git a/clang/lib/AST/Interp/Context.h b/clang/lib/AST/Interp/Context.h
index 617fbaa928f40ee..958b50b1615ad18 100644
--- a/clang/lib/AST/Interp/Context.h
+++ b/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;