All types have a context therefore context should be non optional

Author: vdka

Sources/LLVM/FloatType.swift

@@ -10,14 +10,14 @@ public struct FloatType: IRType {
   public var kind: Kind
 
   /// Returns the context associated with this module.
-  public let context: Context?
+  public let context: Context
 
   /// Creates a float type of a particular kind
   ///
   /// - parameter kind: The kind of floating point type to create
   /// - parameter context: The context to create this type in
   /// - SeeAlso: http://llvm.org/docs/ProgrammersManual.html#achieving-isolation-with-llvmcontext
-  public init(kind: Kind, in context: Context? = nil) {
+  public init(kind: Kind, in context: Context = Context.global) {
     self.kind = kind
     self.context = context
   }
@@ -57,23 +57,13 @@ public struct FloatType: IRType {
 
   /// Retrieves the underlying LLVM type object.
   public func asLLVM() -> LLVMTypeRef {
-    if let context = context {
-        switch kind {
-        case .half: return LLVMHalfTypeInContext(context.llvm)
-        case .float: return LLVMFloatTypeInContext(context.llvm)
-        case .double: return LLVMDoubleTypeInContext(context.llvm)
-        case .x86FP80: return LLVMX86FP80TypeInContext(context.llvm)
-        case .fp128: return LLVMFP128TypeInContext(context.llvm)
-        case .ppcFP128: return LLVMPPCFP128TypeInContext(context.llvm)
-        }
-    }
     switch kind {
-    case .half: return LLVMHalfType()
-    case .float: return LLVMFloatType()
-    case .double: return LLVMDoubleType()
-    case .x86FP80: return LLVMX86FP80Type()
-    case .fp128: return LLVMFP128Type()
-    case .ppcFP128: return LLVMPPCFP128Type()
+    case .half: return LLVMHalfTypeInContext(context.llvm)
+    case .float: return LLVMFloatTypeInContext(context.llvm)
+    case .double: return LLVMDoubleTypeInContext(context.llvm)
+    case .x86FP80: return LLVMX86FP80TypeInContext(context.llvm)
+    case .fp128: return LLVMFP128TypeInContext(context.llvm)
+    case .ppcFP128: return LLVMPPCFP128TypeInContext(context.llvm)
     }
   }
 }

Sources/LLVM/IRType.swift

@@ -31,7 +31,7 @@ public extension IRType {
   }
 
   /// Returns the context associated with this type
-  public func context() -> Context {
+  public var context: Context {
     return Context(llvm: LLVMGetTypeContext(asLLVM()))
   }
 

Sources/LLVM/IntType.swift

@@ -12,14 +12,14 @@ public struct IntType: IRType {
   public let width: Int
 
   /// Returns the context associated with this module.
-  public let context: Context?
+  public let context: Context
 
   /// Creates an integer type with the specified bit width.
   ///
   /// - parameter width: The width in bits of the integer type
   /// - parameter context: The context to create this type in
   /// - SeeAlso: http://llvm.org/docs/ProgrammersManual.html#achieving-isolation-with-llvmcontext
-  public init(width: Int, in context: Context? = nil) {
+  public init(width: Int, in context: Context = Context.global) {
     self.width = width
     self.context = context
   }
@@ -78,9 +78,6 @@ public struct IntType: IRType {
 
   /// Retrieves the underlying LLVM type object.
   public func asLLVM() -> LLVMTypeRef {
-    if let context = context {
-        return LLVMIntTypeInContext(context.llvm, UInt32(width))
-    }
-    return LLVMIntType(UInt32(width))
+    return LLVMIntTypeInContext(context.llvm, UInt32(width))
   }
 }

Sources/LLVM/LabelType.swift

@@ -6,21 +6,18 @@ import cllvm
 public struct LabelType: IRType {
 
   /// Returns the context associated with this module.
-  public let context: Context?
+  public let context: Context
 
   /// Creates a code label.
   ///
   /// - parameter context: The context to create this type in
   /// - SeeAlso: http://llvm.org/docs/ProgrammersManual.html#achieving-isolation-with-llvmcontext
-  public init(in context: Context? = nil) {
+  public init(in context: Context = Context.global) {
       self.context = context
   }
 
   /// Retrieves the underlying LLVM type object.
   public func asLLVM() -> LLVMTypeRef {
-    if let context = context {
-       return LLVMLabelTypeInContext(context.llvm)
-    }
-    return LLVMLabelType()
+   return LLVMLabelTypeInContext(context.llvm)
   }
 }

Sources/LLVM/VoidType.swift

@@ -6,21 +6,18 @@ import cllvm
 public struct VoidType: IRType {
 
   /// Returns the context associated with this module.
-  public let context: Context?
+  public let context: Context
 
   /// Creates an instance of the `Void` type.
   ///
   /// - parameter context: The context to create this type in
   /// - SeeAlso: http://llvm.org/docs/ProgrammersManual.html#achieving-isolation-with-llvmcontext
-  public init(in context: Context? = nil) {
+  public init(in context: Context = Context.global) {
     self.context = context
   }
 
   /// Retrieves the underlying LLVM type object.
   public func asLLVM() -> LLVMTypeRef {
-    if let context = context {
-      return LLVMVoidTypeInContext(context.llvm)
-    }
-    return LLVMVoidType()
+    return LLVMVoidTypeInContext(context.llvm)
   }
 }

Sources/LLVM/X86MMXType.swift

@@ -11,21 +11,18 @@ import cllvm
 public struct X86MMXType: IRType {
 
   /// Returns the context associated with this module.
-  public let context: Context?
-  
+  public let context: Context
+
   /// Creates an `X86MMXType`.
   ///
   /// - parameter context: The context to create this type in
   /// - SeeAlso: http://llvm.org/docs/ProgrammersManual.html#achieving-isolation-with-llvmcontext
-  public init(in context: Context? = nil) {
+  public init(in context: Context = Context.global) {
     self.context = context
   }
 
   /// Retrieves the underlying LLVM type object.
   public func asLLVM() -> LLVMTypeRef {
-    if let context = context {
-      return LLVMX86MMXTypeInContext(context.llvm)
-    }
-    return LLVMX86MMXType()
+    return LLVMX86MMXTypeInContext(context.llvm)
   }
 }