Extended context with Diagnostc Handler

Author: mrLSD

Package.swift

@@ -6,10 +6,10 @@ import PackageDescription
 let package = Package(
     name: "llvm-codegen",
     products: [
-        .executable(name: "llvm-codegen", targets: ["llvm-codegen"])
+        .executable(name: "llvm-codegen", targets: ["llvm-codegen"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/apple/swift-argument-parser.git", from: "1.3.0")
+        .package(url: "https://github.com/apple/swift-argument-parser.git", from: "1.3.0"),
     ],
     targets: [
         .executableTarget(
@@ -19,7 +19,7 @@ let package = Package(
                 .product(
                     name: "ArgumentParser",
                     package: "swift-argument-parser"
-                )
+                ),
             ],
             path: "llvm-codegen/cli"
         ),
@@ -28,14 +28,14 @@ let package = Package(
             path: "llvm-codegen/CLLVM",
             pkgConfig: "CLLVM",
             providers: [
-                .brew(["llvm"])
+                .brew(["llvm"]),
             ]
         ),
         .target(
             name: "LLVM",
             dependencies: ["CLLVM"],
             path: "llvm-codegen/LLVM"
-        )
+        ),
     ],
     cxxLanguageStandard: .cxx20
 )

llvm-codegen/LLVM/AddressSpace.swift

@@ -59,6 +59,6 @@ public struct AddressSpace: Equatable {
     /// Creates and initializes an address space with the given identifier.
     /// - Parameter identifier: The raw, integral address space identifier.
     public init(_ identifier: UInt32) {
-        self.rawValue = identifier
+        rawValue = identifier
     }
 }

llvm-codegen/LLVM/Context.swift

@@ -18,6 +18,9 @@ public class Context: ContextRef {
     /// Retrieves the underlying LLVM type object.
     public var contextRef: LLVMContextRef { llvm }
 
+    /// Diagnostic handler type
+    public typealias DiagnosticHandler = @convention(c) (LLVMDiagnosticInfoRef, UnsafeMutableRawPointer?) -> Void
+
     /// Retrieves the global context instance.
     ///
     /// The global context is an particularly convenient instance managed by LLVM
@@ -41,14 +44,34 @@ public class Context: ContextRef {
         self.llvm = llvm
     }
 
+    /// Get the diagnostic handler of current context.
+    public var getContextDiagnosticHandler: DiagnosticHandler? {
+        if let handler = LLVMContextGetDiagnosticHandler(contextRef) {
+            return unsafeBitCast(handler, to: DiagnosticHandler.self)
+        } else {
+            return nil
+        }
+    }
+
+    /// Set the diagnostic handler for current context.
+    public func setContextDiagnosticHandler(handler: LLVMDiagnosticHandler?, diagnosticContext: UnsafeMutableRawPointer?) {
+        LLVMContextSetDiagnosticHandler(contextRef, handler, diagnosticContext)
+    }
+
     /// Returns whether the given context is set to discard all value names.
     ///
     /// If true, only the names of GlobalValue objects will be available in
     /// the IR.  This can be used to save memory and processing time, especially
     /// in release environments.
     public var discardValueNames: Bool {
-        get { return LLVMContextShouldDiscardValueNames(llvm) != 0 }
-        set { LLVMContextSetDiscardValueNames(llvm, newValue.llvm) }
+        get {
+            // Retrieve whether the given context is set to discard all value names.
+            return LLVMContextShouldDiscardValueNames(llvm) != 0
+        }
+        set {
+            // Set whether the given context discards all value names.
+            LLVMContextSetDiscardValueNames(llvm, newValue.llvm)
+        }
     }
 
     /// Deinitialize this value and dispose of its resources.

llvm-codegen/LLVM/Functions.swift

@@ -114,7 +114,7 @@ public struct Function: ValueRef {
     public var getEntryBasicBlock: BasicBlockRef? { BasicBlock.getEntryBasicBlock(funcValueRef: self) }
 
     /// Append the given basic block to the basic block list for the current function.
-    public func appendExistingBasicBlock(funcValueRef: ValueRef, blockRef: BasicBlockRef) { BasicBlock.appendExistingBasicBlock(funcValueRef: self, blockRef: blockRef)
+    public func appendExistingBasicBlock(funcValueRef _: ValueRef, blockRef: BasicBlockRef) { BasicBlock.appendExistingBasicBlock(funcValueRef: self, blockRef: blockRef)
     }
 
     /// Append named basic block to the end of a function in Context.

llvm-codegen/LLVM/Types/Array.swift

@@ -29,7 +29,7 @@ public struct ArrayType: TypeRef {
     public init(elementType: TypeRef, count: UInt32) {
         self.elementType = elementType
         self.count = .x32(count)
-        self.llvm = LLVMArrayType(elementType.typeRef, count)
+        llvm = LLVMArrayType(elementType.typeRef, count)
     }
 
     /// Creates an array type from an underlying element type and count.
@@ -38,14 +38,14 @@ public struct ArrayType: TypeRef {
     public init(elementType: TypeRef, count: UInt64) {
         self.elementType = elementType
         self.count = .x64(count)
-        self.llvm = LLVMArrayType2(elementType.typeRef, count)
+        llvm = LLVMArrayType2(elementType.typeRef, count)
     }
 
     /// Init with predefined `TypeRef`
     public init(typeRef: TypeRef) {
-        self.elementType = ArrayType.getElementType(typeRef: typeRef)!
-        self.count = .x64(ArrayType.getArrayLength2(typeRef: typeRef))
-        self.llvm = typeRef.typeRef
+        elementType = ArrayType.getElementType(typeRef: typeRef)!
+        count = .x64(ArrayType.getArrayLength2(typeRef: typeRef))
+        llvm = typeRef.typeRef
     }
 
     /// Get the length of an array type for 32 bits array size.

llvm-codegen/LLVM/Types/Function.swift

@@ -16,7 +16,7 @@ public struct FunctionType: TypeRef {
     /// For parent classes init with predefined `FunctionType` in Context
     public init(returnType: TypeRef, parameterTypes: [TypeRef], isVariadic: Bool = false) {
         var mutableParamTypes = parameterTypes.map { $0.typeRef as Optional }
-        self.llvm = mutableParamTypes.withUnsafeMutableBufferPointer { paramsBuffer in
+        llvm = mutableParamTypes.withUnsafeMutableBufferPointer { paramsBuffer in
             LLVMFunctionType(returnType.typeRef, paramsBuffer.baseAddress, UInt32(parameterTypes.count), isVariadic.llvm)!
         }
         self.returnType = returnType

llvm-codegen/LLVM/Types/Other/TargetExt.swift

@@ -14,7 +14,7 @@ public struct TargetExtType: TypeRef {
     public init(in context: Context, name: String, typeParams: [TypeRef], intParams: [UInt32]) {
         var mutableTypeParams = typeParams.map { $0.typeRef as Optional }
         var mutableIntParams = intParams
-        self.llvm = name.withCString { cName in
+        llvm = name.withCString { cName in
             mutableTypeParams.withUnsafeMutableBufferPointer { typeParamsBuffer in
                 mutableIntParams.withUnsafeMutableBufferPointer { intParamsBuffer in
                     LLVMTargetExtTypeInContext(context.contextRef, cName,

llvm-codegen/LLVM/Types/Types.swift

@@ -214,7 +214,7 @@ public struct Types: TypeRef {
 
     /// Init `Types` by `TypeRef`
     public init(typeRef: TypeRef) {
-        self.llvm = typeRef.typeRef
+        llvm = typeRef.typeRef
     }
 
     /// Init `Types` by `LLVMTypeRef`

llvm-codegen/LLVM/Types/Vector.swift

@@ -21,21 +21,21 @@ public class VectorType: TypeRef {
     public init(elementType: TypeRef, count: UInt32) {
         self.elementType = elementType
         self.count = count
-        self.llvm = LLVMVectorType(elementType.typeRef, count)
+        llvm = LLVMVectorType(elementType.typeRef, count)
     }
 
     /// Init with predefined `TypeRef`
     public init(typeRef: TypeRef) {
-        self.elementType = VectorType.getElementType(typeRef: typeRef)!
-        self.count = VectorType.getVectorSize(typeRef: typeRef)
-        self.llvm = typeRef.typeRef
+        elementType = VectorType.getElementType(typeRef: typeRef)!
+        count = VectorType.getVectorSize(typeRef: typeRef)
+        llvm = typeRef.typeRef
     }
 
     /// Init for pre-init vector for depended class
     init(for vecTy: LLVMTypeRef, elementType: TypeRef, count: UInt32) {
         self.elementType = elementType
         self.count = count
-        self.llvm = vecTy
+        llvm = vecTy
     }
 
     /// Get the (possibly scalable) number of elements in the current vector type.

llvm-codegen/LLVM/Values/Values.swift

@@ -8,7 +8,7 @@ public struct Values: ValueRef {
 
     /// Init `Values` by `ValueRef`
     public init(valueRef: ValueRef) {
-        self.llvm = valueRef.valueRef
+        llvm = valueRef.valueRef
     }
 
     /// Init `Values` by `LLVMValueRef`