cc: Refactor cc action includes.

MATRIXKOO · Oct 27, 2023 · 71212c9 · 71212c9
1 parent 52f1575
commit 71212c9
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 32 deletions.
diff --git a/include/vast/Frontend/GenAction.hpp → include/vast/Frontend/Action.hpp b/include/vast/Frontend/GenAction.hpp → include/vast/Frontend/Action.hpp
@@ -9,8 +9,8 @@ VAST_RELAX_WARNINGS
 VAST_UNRELAX_WARNINGS
 
 #include "vast/Util/Common.hpp"
-#include "vast/Frontend/CompilerInstance.hpp"
 #include "vast/Frontend/FrontendAction.hpp"
+#include "vast/Frontend/CompilerInstance.hpp"
 #include "vast/CodeGen/Generator.hpp"
 
 namespace llvm {

diff --git a/include/vast/Frontend/Builder.hpp b/include/vast/Frontend/Builder.hpp
diff --git a/include/vast/Frontend/CompilerInvocation.hpp b/include/vast/Frontend/CompilerInvocation.hpp
@@ -9,7 +9,6 @@ VAST_RELAX_WARNINGS
 VAST_UNRELAX_WARNINGS
 
 #include "vast/Frontend/Diagnostics.hpp"
-#include "vast/Frontend/CompilerInstance.hpp"
 #include "vast/Frontend/Options.hpp"
 
 namespace vast::cc

diff --git a/include/vast/Frontend/Driver.hpp b/include/vast/Frontend/Driver.hpp
@@ -21,7 +21,7 @@ VAST_RELAX_WARNINGS
 VAST_UNRELAX_WARNINGS
 
 #include "vast/Frontend/Diagnostics.hpp"
-#include "vast/Frontend/GenAction.hpp"
+#include "vast/Frontend/Action.hpp"
 
 #include "vast/Config/config.h"
 

diff --git a/lib/vast/Frontend/GenAction.cpp → lib/vast/Frontend/Action.cpp b/lib/vast/Frontend/GenAction.cpp → lib/vast/Frontend/Action.cpp
@@ -1,6 +1,6 @@
 // Copyright (c) 2023-present, Trail of Bits, Inc.
 
-#include "vast/Frontend/GenAction.hpp"
+#include "vast/Frontend/Action.hpp"
 #include "vast/Util/Warnings.hpp"
 
 VAST_RELAX_WARNINGS

diff --git a/lib/vast/Frontend/CMakeLists.txt b/lib/vast/Frontend/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Copyright (c) 2022-present, Trail of Bits, Inc.
 
 add_vast_library(Frontend
-    GenAction.cpp
+    Action.cpp
     Options.cpp
 
     LINK_LIBS PUBLIC

diff --git a/tools/vast-front/cc1.cpp b/tools/vast-front/cc1.cpp
@@ -31,8 +31,8 @@ VAST_RELAX_WARNINGS
 #include <llvm/Support/Timer.h>
 VAST_UNRELAX_WARNINGS
 
-#include "vast/Frontend/CompilerInstance.hpp"
 #include "vast/Frontend/CompilerInvocation.hpp"
+#include "vast/Frontend/CompilerInstance.hpp"
 #include "vast/Frontend/Diagnostics.hpp"
 
 using namespace vast::cc;

diff --git a/tools/vast-front/compiler_invocation.cpp b/tools/vast-front/compiler_invocation.cpp
@@ -12,14 +12,11 @@ VAST_RELAX_WARNINGS
 #include <llvm/Option/OptTable.h>
 VAST_UNRELAX_WARNINGS
 
+#include "vast/Frontend/Action.hpp"
 #include "vast/Frontend/CompilerInstance.hpp"
-#include "vast/Frontend/GenAction.hpp"
 
 namespace vast::cc
 {
-    using frontend_action_ptr = std::unique_ptr< clang::FrontendAction >;
-    using compiler_instance   = clang::CompilerInstance;
-
     frontend_action_ptr create_frontend_action(compiler_instance &ci, const vast_args &vargs) {
         auto &opts = ci.getFrontendOpts();
         auto act   = opts.ProgramAction;