[CIR] Merge two copies of CIRGenAction.h (#1085)

We have both clang/include/clang/CIRFrontendAction/CIRGenAction.h and
clang/include/clang/cir/FrontendAction/CIRGenAction.h, which is a
historical artifact. The latter is what's being upstreamed, so merge the
former into it to avoid any confusion.

Author: smeenai

clang/include/clang/CIRFrontendAction/CIRGenAction.h renamed to clang/include/clang/CIR/FrontendAction/CIRGenAction.h

@@ -129,7 +129,8 @@ class EmitObjAction : public CIRGenAction {
   EmitObjAction(mlir::MLIRContext *mlirCtx = nullptr);
 };
 
-// Used for -fclangir-analysis-only: use CIR analysis but still use original LLVM codegen path
+// Used for -fclangir-analysis-only: use CIR analysis but still use original
+// LLVM codegen path
 class AnalysisOnlyActionBase : public clang::CodeGenAction {
   virtual void anchor();
 

clang/lib/CIR/FrontendAction/CIRGenAction.cpp

@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/CIRFrontendAction/CIRGenAction.h"
+#include "clang/CIR/FrontendAction/CIRGenAction.h"
 #include "mlir/Dialect/Func/IR/FuncOps.h"
 #include "mlir/Dialect/MemRef/IR/MemRef.h"
 #include "mlir/IR/BuiltinOps.h"

clang/lib/FrontendTool/ExecuteCompilerInvocation.cpp

@@ -36,7 +36,7 @@
 #include "mlir/IR/MLIRContext.h"
 #include "mlir/Pass/PassManager.h"
 #include "clang/CIR/Dialect/Passes.h"
-#include "clang/CIRFrontendAction/CIRGenAction.h"
+#include "clang/CIR/FrontendAction/CIRGenAction.h"
 #endif
 
 using namespace clang;