Upgrade to LLVM 19

.devcontainer/Dockerfile

@@ -2,7 +2,7 @@
 
 # [Choice] Debian / Ubuntu version (use Debian 11, Ubuntu 18.04/22.04 on local arm64/Apple Silicon): debian-11, debian-10, ubuntu-22.04, ubuntu-20.04, ubuntu-18.04
 ARG IMAGE="ubuntu-22.04"
-ARG LLVM_VERSION="18"
+ARG LLVM_VERSION="19"
 
 FROM mcr.microsoft.com/vscode/devcontainers/cpp:${IMAGE}
 ARG LLVM_VERSION

.devcontainer/devcontainer.json

@@ -24,7 +24,7 @@
 		"python": "os-provided"
 	},
 	"containerEnv": {
-		"CMAKE_PREFIX_PATH": "/usr/lib/llvm-18/lib/cmake/mlir/;/usr/lib/llvm-18/lib/cmake/clang/",
+		"CMAKE_PREFIX_PATH": "/usr/lib/llvm-19/lib/cmake/mlir/;/usr/lib/llvm-19/lib/cmake/clang/",
 		"LLVM_EXTERNAL_LIT": "/usr/local/bin/lit"
 	}
 

.devcontainer/install-llvm.sh

@@ -11,7 +11,7 @@ usage() {
     exit 1;
 }
 
-CURRENT_LLVM_STABLE=18
+CURRENT_LLVM_STABLE=19
 BASE_URL="http://apt.llvm.org"
 
 # Check for required tools
@@ -118,6 +118,7 @@ LLVM_VERSION_PATTERNS[15]="-15"
 LLVM_VERSION_PATTERNS[16]="-16"
 LLVM_VERSION_PATTERNS[17]="-17"
 LLVM_VERSION_PATTERNS[18]="-18"
+LLVM_VERSION_PATTERNS[19]="-19"
 
 if [ ! ${LLVM_VERSION_PATTERNS[$LLVM_VERSION]+_} ]; then
     echo "This script does not support LLVM version $LLVM_VERSION"

.github/workflows/build.yml

@@ -24,10 +24,10 @@ jobs:
   build:
     strategy:
       matrix:
-        llvm-version: [18]
+        llvm-version: [19]
         image-version: [22.04]
         build-type: [Release, Debug]
-        sanitizers: [ON, OFF]
+        sanitizers: [OFF]
         features: ["nosarif", "sarif"]
 
     runs-on: ubuntu-${{ matrix.image-version }}
@@ -57,4 +57,3 @@ jobs:
 
       - name: Test ${{ matrix.build-type }} with sanitizers set ${{ matrix.sanitizers }}
         run: ctest --preset ci-${{ matrix.features }} --build-config ${{ matrix.build-type }}
-

.github/workflows/devcontainer.yml

@@ -14,7 +14,7 @@ jobs:
   build:
     strategy:
       matrix:
-        llvm-version: [18]
+        llvm-version: [19]
         image-version: [22.04]
     runs-on: ubuntu-22.04
     timeout-minutes: 45

.github/workflows/linter.yml

@@ -16,7 +16,7 @@ jobs:
   cpp-linter:
     strategy:
       matrix:
-        llvm-version: [18]
+        llvm-version: [19]
         image-version: [22.04]
 
     runs-on: ubuntu-${{ matrix.image-version }}

.github/workflows/prerelease.yml

@@ -25,7 +25,7 @@ jobs:
   build:
     strategy:
       matrix:
-        llvm-version: [18]
+        llvm-version: [19]
         image-version: [22.04]
 
     name: "Pre Release"
@@ -89,7 +89,7 @@ jobs:
     needs: build
     strategy:
       matrix:
-        llvm-version: [18]
+        llvm-version: [19]
         image-version: [22.04]
         vast-target: ['hl', 'llvm', 'bin']
         disable-unsup: ['ON','OFF']
@@ -217,7 +217,7 @@ jobs:
     needs: build
     strategy:
       matrix:
-        llvm-version: [18]
+        llvm-version: [19]
         image-version: [22.04]
         vast-target: ['hl']
         disable-unsup: [true, false]
@@ -321,7 +321,7 @@ jobs:
     needs: build
     strategy:
       matrix:
-        llvm-version: [18]
+        llvm-version: [19]
         image-version: [22.04]
         vast-target: ['hl']
         disable-unsup: [true, false]
@@ -440,7 +440,7 @@ jobs:
   build_doc:
     strategy:
       matrix:
-        llvm-version: [18]
+        llvm-version: [19]
         image-version: [22.04]
     name: "Build VAST doc"
     runs-on: ubuntu-${{ matrix.image-version }}

CMakeLists.txt

@@ -99,7 +99,7 @@ FindAndSelectClangCompiler()
 #
 # LLVM & MLIR & Clang
 #
-find_package(LLVM 18.1 REQUIRED CONFIG)
+find_package(LLVM 19.1 REQUIRED CONFIG)
 message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}")
 message(STATUS "Using LLVMConfig.cmake in: ${LLVM_DIR}")
 #

CMakePresets.json

@@ -54,13 +54,13 @@
             "displayName": "Configure VAST for Compiler Explorer",
             "inherits": "base",
             "environment": {
-                "CMAKE_PREFIX_PATH": "/usr/lib/llvm-18"
+                "CMAKE_PREFIX_PATH": "/usr/lib/llvm-19"
             },
             "cacheVariables": {
                 "CMAKE_CONFIGURATION_TYPES": "Release",
                 "VAST_ENABLE_TESTING": "OFF",
-                "CMAKE_C_COMPILER": "/usr/bin/clang-18",
-                "CMAKE_CXX_COMPILER": "/usr/bin/clang++-18",
+                "CMAKE_C_COMPILER": "/usr/bin/clang-19",
+                "CMAKE_CXX_COMPILER": "/usr/bin/clang++-19",
                 "CMAKE_INSTALL_PREFIX": "$env{STAGING_DIR}",
                 "CMAKE_INSTALL_RPATH": "$env{ORIGIN}/../lib"
             }

docs/GettingStarted/build.md

@@ -3,11 +3,11 @@
 
 Currently, it is necessary to use `clang` (due to `gcc` bug) to build VAST. On Linux it is also necessary to use `lld` at the moment.
 
-VAST uses `llvm-18` which can be obtained from the [repository](https://apt.llvm.org/) provided by LLVM.
+VAST uses `llvm-19` which can be obtained from the [repository](https://apt.llvm.org/) provided by LLVM.
 
 Before building (for Ubuntu) get all the necessary dependencies by running
 ```
-apt-get install build-essential cmake ninja-build libstdc++-12-dev llvm-18 libmlir-18 libmlir-18-dev mlir-18-tools libclang-18-dev
+apt-get install build-essential cmake ninja-build libstdc++-12-dev llvm-19 libmlir-19 libmlir-19-dev mlir-19-tools libclang-19-dev
 ```
 or an equivalent command for your operating system of choice.
 

include/vast/Conversion/TypeConverters/HLToStd.hpp

@@ -89,7 +89,7 @@ namespace vast::conv::tc {
       protected:
         auto convert_pointer_element_type() {
             return [&](auto t) -> maybe_type_t {
-                if (t.template isa< hl::VoidType >()) {
+                if (mlir::isa< hl::VoidType >(t)) {
                     auto sign = mlir::IntegerType::SignednessSemantics::Signless;
                     return underlying().int_type(8u, sign);
                 }

include/vast/Conversion/TypeConverters/LLVMTypeConverter.hpp

@@ -1,8 +1,8 @@
 // Copyright (c) 2022, Trail of Bits, Inc.
 
 #pragma once
 
 VAST_RELAX_WARNINGS
 #include <mlir/Analysis/DataLayoutAnalysis.h>
 
 #include <mlir/Conversion/LLVMCommon/TypeConverter.h>
@@ -12,7 +12,7 @@
 #include <mlir/IR/Types.h>
 
 #include <llvm/ADT/ScopeExit.h>
 VAST_UNRELAX_WARNINGS
 
 #include "vast/Dialect/Core/CoreOps.hpp"
 
@@ -99,7 +99,7 @@
 
         auto make_ptr_type() {
             return [&](auto t) {
-                VAST_ASSERT(!t.template isa< mlir::NoneType >());
+                VAST_ASSERT(!mlir::isa< mlir::NoneType >(t));
                 return LLVM::LLVMPointerType::get(&this->getContext(), 0);
             };
         }
@@ -139,9 +139,9 @@
         maybe_type_t convert_memref_type(mlir::UnrankedMemRefType t) { return {}; }
 
         maybe_signature_conversion_t
-        get_conversion_signature(mlir::FunctionOpInterface fn, bool variadic) {
+        get_conversion_signature(core::function_op_interface fn, bool variadic) {
             signature_conversion_t conversion(fn.getNumArguments());
-            auto fn_type = fn.getFunctionType().dyn_cast< core::FunctionType >();
+            auto fn_type = mlir::dyn_cast< core::FunctionType >(fn.getFunctionType());
             VAST_ASSERT(fn_type);
             for (auto arg : llvm::enumerate(fn_type.getInputs())) {
                 auto cty = convert_arg_t(arg.value());
@@ -186,14 +186,14 @@
         }
 
         maybe_types_t convert_arg_t(mlir::Type t) {
-            if (auto lvalue = t.dyn_cast< hl::LValueType >()) {
+            if (auto lvalue = mlir::dyn_cast< hl::LValueType >(t)) {
                 return this->convert_type_to_types(lvalue.getElementType());
             }
             return this->convert_type_to_types(t);
         }
 
         maybe_types_t convert_ret_t(mlir::Type t) {
-            if (auto lvalue = t.dyn_cast< hl::LValueType >()) {
+            if (auto lvalue = mlir::dyn_cast< hl::LValueType >(t))  {
                 return this->convert_type_to_types(lvalue.getElementType());
             }
             return this->convert_type_to_types(t);

include/vast/Conversion/TypeConverters/TypeConverter.hpp

@@ -13,6 +13,8 @@ VAST_UNRELAX_WARNINGS
 #include <gap/core/crtp.hpp>
 
 #include "vast/Dialect/Core/CoreTypes.hpp"
+#include "vast/Dialect/Core/Interfaces/FunctionInterface.hpp"
+
 #include "vast/Dialect/HighLevel/HighLevelDialect.hpp"
 
 #include "vast/Util/Common.hpp"

include/vast/Conversion/TypeConverters/TypeConvertingPattern.hpp

@@ -1,4 +1,4 @@
 // Copyright (c) 2022, Trail of Bits, Inc.
 
 #pragma once
 
@@ -34,7 +34,7 @@
         // TODO(conv:tc): This should probably be some interface instead, since
         //                 we are only updating the root?
         logical_result replace(
-            mlir::FunctionOpInterface fn,
+            core::function_op_interface fn,
             auto &rewriter
         ) const {
             auto old_type = fn.getFunctionType();
@@ -115,7 +115,7 @@
             operation op, mlir::ArrayRef< mlir::Value >,
             conversion_rewriter &rewriter
         ) const override {
-            if (auto func_op = mlir::dyn_cast< mlir::FunctionOpInterface >(op))
+            if (auto func_op = mlir::dyn_cast< core::function_op_interface >(op))
                 return this->replace(func_op, rewriter);
             return this->replace(op, rewriter);
         }

include/vast/Dialect/ABI/ABIOps.hpp

@@ -21,6 +21,8 @@ VAST_RELAX_WARNINGS
 #include "vast/Dialect/Core/CoreTypes.hpp"
 #include "vast/Dialect/Core/CoreAttributes.hpp"
 #include "vast/Dialect/Core/Func.hpp"
+
+#include "vast/Dialect/Core/Interfaces/FunctionInterface.hpp"
 #include "vast/Dialect/Core/Interfaces/SymbolInterface.hpp"
 #include "vast/Dialect/Core/Interfaces/SymbolTableInterface.hpp"
 

include/vast/Dialect/Builtin/Ops.hpp

@@ -5,7 +5,6 @@
 #include "vast/Util/Warnings.hpp"
 
 VAST_RELAX_WARNINGS
-#include <mlir/Interfaces/FunctionInterfaces.h>
 #include <mlir/Interfaces/CallInterfaces.h>
 #include <mlir/Interfaces/InferTypeOpInterface.h>
 VAST_UNRELAX_WARNINGS

include/vast/Dialect/Core/CoreLazy.td

@@ -7,7 +7,6 @@ include "mlir/IR/OpBase.td"
 
 include "mlir/Interfaces/CallInterfaces.td"
 include "mlir/Interfaces/CastInterfaces.td"
-include "mlir/Interfaces/FunctionInterfaces.td"
 include "vast/Dialect/Core/Interfaces/SymbolInterface.td"
 
 class Core_LazyEval< string mnemonic, list < Trait > traits = [] >

include/vast/Dialect/Core/CoreOps.hpp

@@ -11,7 +11,6 @@
 #include "vast/Util/Common.hpp"
 #include "vast/Util/TypeList.hpp"
 
-#include <mlir/Interfaces/FunctionInterfaces.h>
 #include <mlir/Interfaces/CallInterfaces.h>
 #include <mlir/Interfaces/InferTypeOpInterface.h>
 #include <mlir/Interfaces/DataLayoutInterfaces.h>
@@ -24,4 +23,4 @@
 
 namespace vast::core {
     using module      = core::ModuleOp;
-} // namespace vast::core
+} // namespace vast::core

include/vast/Dialect/Core/Func.hpp

@@ -1,4 +1,4 @@
 // Copyright (c) 2021-present, Trail of Bits, Inc.
 
 #pragma once
 
@@ -13,6 +13,9 @@
 #include "vast/Dialect/Core/Linkage.hpp"
 #include "vast/Dialect/Core/CoreTypes.hpp"
 
+#include "vast/Dialect/Core/Interfaces/FunctionInterface.hpp"
+#include "vast/Dialect/Core/Interfaces/FunctionImplementation.hpp"
+
 namespace vast::core {
 
     llvm::StringRef getLinkageAttrNameString();
@@ -77,11 +80,11 @@
         }
 
         auto fty = op.getFunctionType();
-        mlir::function_interface_impl::printFunctionSignature(
+        vast::core::function_interface_impl::printFunctionSignature(
             printer, op, fty.getInputs(), fty.isVarArg(), fty.getResults()
         );
 
-        mlir::function_interface_impl::printFunctionAttributes(
+        vast::core::function_interface_impl::printFunctionAttributes(
             printer, op, { getLinkageAttrNameString(), op.getFunctionTypeAttrName() }
         );
 
@@ -160,7 +163,7 @@
 
     template< typename DstFuncOp >
     logical_result convert_and_replace_function(auto src, auto &rewriter) {
-        return convert_and_replace_function< DstFuncOp >(src, rewriter, src.getName());
+        return convert_and_replace_function< DstFuncOp >(src, rewriter, src.getSymbolName());
     }
 
 } // namespace vast::core

include/vast/Dialect/Core/Func.td

@@ -6,8 +6,8 @@
 include "mlir/IR/OpBase.td"
 
 include "mlir/Interfaces/CallInterfaces.td"
-include "mlir/Interfaces/FunctionInterfaces.td"
 include "vast/Dialect/Core/Interfaces/SymbolInterface.td"
+include "vast/Dialect/Core/Interfaces/FunctionInterface.td"
 
 include "vast/Dialect/Core/CoreTraits.td"
 include "vast/Dialect/Core/LinkageHelper.td"
@@ -22,9 +22,8 @@ class Core_FuncBaseOp< Dialect dialect, string mnemonic, list< Trait > traits =
   : Op< dialect, mnemonic,
     !listconcat(traits, [
       AutomaticAllocationScope,
-      CallableOpInterface,
-      FunctionOpInterface,
       IsolatedFromAbove,
+      Core_FunctionOpInterface,
       Core_FuncSymbol,
       NoTerminator
     ])
@@ -86,7 +85,7 @@ class Core_FuncBaseOp< Dialect dialect, string mnemonic, list< Trait > traits =
       if (arg_attrs.empty())
         return;
 
-      mlir::function_interface_impl::addArgAndResultAttrs(
+      vast::core::function_interface_impl::addArgAndResultAttrs(
         $_builder, $_state, arg_attrs, res_attrs,
         getArgAttrsAttrName($_state.name), getResAttrsAttrName($_state.name)
       );

include/vast/Dialect/Core/Interfaces/CMakeLists.txt

@@ -1,4 +1,5 @@
 add_vast_op_interface(DeclStorageInterface)
+add_vast_op_interface(FunctionInterface)
 add_vast_op_interface(TypeDefinitionInterface)
 
 add_vast_op_interface(SymbolInterface)

include/vast/Dialect/Core/Interfaces/DeclStorageInterface.hpp

@@ -5,14 +5,14 @@
 #include "vast/Util/Warnings.hpp"
 
 VAST_RELAX_WARNINGS
-#include <mlir/Interfaces/FunctionInterfaces.h>
 #include <mlir/IR/BuiltinOps.h>
 #include <mlir/IR/BuiltinTypes.h>
 #include <mlir/IR/Dialect.h>
 #include <mlir/IR/OperationSupport.h>
 VAST_RELAX_WARNINGS
 
 #include "vast/Dialect/Core/CoreOps.hpp"
+#include "vast/Dialect/Core/Interfaces/FunctionInterface.hpp"
 
 #define GET_OP_FWD_DEFINES
 #include "vast/Dialect/HighLevel/HighLevel.h.inc"

include/vast/Dialect/Core/Interfaces/DeclStorageInterface.td

@@ -72,7 +72,7 @@ def Core_DeclStorageInterface : Core_OpInterface< "DeclStorageInterface" > {
                     return kind_attr.getValue();
                 }
                 auto st = core::get_effective_symbol_table_for< core::var_symbol >($_op)->get_defining_operation();
-                if (mlir::isa< mlir::FunctionOpInterface >(st))
+                if (mlir::isa< core::function_op_interface >(st))
                     return DeclContextKind::dc_function;
                 if (st->template hasTrait< core::ScopeLikeTrait >())
                     return DeclContextKind::dc_function;