From 1cff1d98f4d2cf92db99fecfc0b006c27c7c8c38 Mon Sep 17 00:00:00 2001
From: Robert Konicar <robert.konicar@trailofbits.com>
Date: Tue, 12 Mar 2024 10:14:30 +0100
Subject: [PATCH] builtin: Obliterate empty definition of dialect types.

---
 include/vast/Dialect/Builtin/Builtin.td |  7 -------
 include/vast/Dialect/Builtin/Ops.hpp    |  1 -
 include/vast/Dialect/Builtin/Types.hpp  |  8 --------
 include/vast/Dialect/Builtin/Types.td   | 20 --------------------
 lib/vast/Dialect/Builtin/CMakeLists.txt |  1 -
 lib/vast/Dialect/Builtin/Dialect.cpp    |  3 ---
 lib/vast/Dialect/Builtin/Ops.cpp        |  1 -
 lib/vast/Dialect/Builtin/Types.cpp      | 25 -------------------------
 8 files changed, 66 deletions(-)
 delete mode 100644 include/vast/Dialect/Builtin/Types.hpp
 delete mode 100644 include/vast/Dialect/Builtin/Types.td
 delete mode 100644 lib/vast/Dialect/Builtin/Types.cpp

diff --git a/include/vast/Dialect/Builtin/Builtin.td b/include/vast/Dialect/Builtin/Builtin.td
index 2895e6f27e..b493d46c9a 100644
--- a/include/vast/Dialect/Builtin/Builtin.td
+++ b/include/vast/Dialect/Builtin/Builtin.td
@@ -21,19 +21,12 @@ def Builtin_Dialect : Dialect {
     TODO
   }];
 
-  let extraClassDeclaration = [{
-      void registerTypes();
-  }];
-
-  let useDefaultTypePrinterParser = 1;
-
   let hasConstantMaterializer = 1;
 }
 
 class Builtin_Op< string mnemonic, list< Trait > traits = [] >
   : Op< Builtin_Dialect, mnemonic, traits >;
 
-include "vast/Dialect/Builtin/Types.td"
 include "vast/Dialect/Builtin/Ops.td"
 
 #endif // VAST_DIALECT_BUILTIN
diff --git a/include/vast/Dialect/Builtin/Ops.hpp b/include/vast/Dialect/Builtin/Ops.hpp
index 417eb6c6ea..ea8290b7c6 100644
--- a/include/vast/Dialect/Builtin/Ops.hpp
+++ b/include/vast/Dialect/Builtin/Ops.hpp
@@ -11,7 +11,6 @@ VAST_RELAX_WARNINGS
 VAST_UNRELAX_WARNINGS
 
 #include "vast/Dialect/Builtin/Dialect.hpp"
-#include "vast/Dialect/Builtin/Types.hpp"
 #include "vast/Util/Common.hpp"
 
 #define GET_OP_CLASSES
diff --git a/include/vast/Dialect/Builtin/Types.hpp b/include/vast/Dialect/Builtin/Types.hpp
deleted file mode 100644
index 9183844791..0000000000
--- a/include/vast/Dialect/Builtin/Types.hpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright (c) 2024-present, Trail of Bits, Inc.
-
-#pragma once
-
-#include "vast/Dialect/Builtin/Dialect.hpp"
-
-#define GET_TYPEDEF_CLASSES
-#include "vast/Dialect/Builtin/BuiltinTypes.h.inc"
diff --git a/include/vast/Dialect/Builtin/Types.td b/include/vast/Dialect/Builtin/Types.td
deleted file mode 100644
index 70002d14e4..0000000000
--- a/include/vast/Dialect/Builtin/Types.td
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright (c) 2024-present, Trail of Bits, Inc.
-
-#ifndef VAST_DIALECT_BUILTINTYPES
-#define VAST_DIALECT_BUILTINTYPES
-
-include "mlir/Interfaces/DataLayoutInterfaces.td"
-include "mlir/IR/BuiltinTypeInterfaces.td"
-
-class BuiltinType< string name, string mnem, list< Trait > traits = [] >
-  : TypeDef< Builtin_Dialect, name, traits >
-{
-  let mnemonic = mnem;
-}
-
-def VaList : BuiltinType< "VaList", "va_list" >
-{
-
-}
-
-#endif // VAST_DIALECT_BUILTINTYPES
diff --git a/lib/vast/Dialect/Builtin/CMakeLists.txt b/lib/vast/Dialect/Builtin/CMakeLists.txt
index c4544c61d0..7b51c2bd6a 100644
--- a/lib/vast/Dialect/Builtin/CMakeLists.txt
+++ b/lib/vast/Dialect/Builtin/CMakeLists.txt
@@ -2,5 +2,4 @@
 add_vast_dialect_library(Builtin
     Dialect.cpp
     Ops.cpp
-    Types.cpp
 )
diff --git a/lib/vast/Dialect/Builtin/Dialect.cpp b/lib/vast/Dialect/Builtin/Dialect.cpp
index aa748fe6f0..6ff07edef9 100644
--- a/lib/vast/Dialect/Builtin/Dialect.cpp
+++ b/lib/vast/Dialect/Builtin/Dialect.cpp
@@ -2,7 +2,6 @@
 //
 #include "vast/Dialect/Builtin/Dialect.hpp"
 #include "vast/Dialect/Builtin/Ops.hpp"
-#include "vast/Dialect/Builtin/Types.hpp"
 
 #include <mlir/IR/Builders.h>
 #include <mlir/IR/DialectImplementation.h>
@@ -14,8 +13,6 @@ namespace vast::hlbi {
     using OpBuilder = mlir::OpBuilder;
 
     void BuiltinDialect::initialize() {
-        registerTypes();
-
         addOperations<
 #define GET_OP_LIST
 #include "vast/Dialect/Builtin/Builtin.cpp.inc"
diff --git a/lib/vast/Dialect/Builtin/Ops.cpp b/lib/vast/Dialect/Builtin/Ops.cpp
index 858920492b..474975b5e8 100644
--- a/lib/vast/Dialect/Builtin/Ops.cpp
+++ b/lib/vast/Dialect/Builtin/Ops.cpp
@@ -18,7 +18,6 @@ VAST_UNRELAX_WARNINGS
 
 #include "vast/Dialect/Builtin/Dialect.hpp"
 #include "vast/Dialect/Builtin/Ops.hpp"
-#include "vast/Dialect/Builtin/Types.hpp"
 
 using namespace vast::hlbi;
 
diff --git a/lib/vast/Dialect/Builtin/Types.cpp b/lib/vast/Dialect/Builtin/Types.cpp
deleted file mode 100644
index 4abd7e14fc..0000000000
--- a/lib/vast/Dialect/Builtin/Types.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) 2024-present, Trail of Bits, Inc.
-
-#include "vast/Util/Warnings.hpp"
-
-VAST_RELAX_WARNINGS
-#include <llvm/ADT/TypeSwitch.h>
-#include <mlir/IR/DialectImplementation.h>
-#include <mlir/IR/OpImplementation.h>
-VAST_RELAX_WARNINGS
-
-#include "vast/Dialect/Builtin/Dialect.hpp"
-#include "vast/Dialect/Builtin/Ops.hpp"
-#include "vast/Dialect/Builtin/Types.hpp"
-
-namespace vast::hlbi {
-    void BuiltinDialect::registerTypes() {
-        addTypes<
-#define GET_TYPEDEF_LIST
-#include "vast/Dialect/Builtin/BuiltinTypes.cpp.inc"
-            >();
-    }
-} // namespace vast::hlbi
-
-#define GET_TYPEDEF_CLASSES
-#include "vast/Dialect/Builtin/BuiltinTypes.cpp.inc"