Merge pull request #156 from CodaFi/mistakes

Correct some constant mistakes

Author: CodaFi

Sources/LLVM/ArrayType.swift

@@ -24,10 +24,10 @@ public struct ArrayType: IRType {
   /// - parameter type: The type of the provided IR values.
   ///
   /// - returns: A constant array value containing the given values.
-  public static func constant(_ values: [IRValue], type: IRType) -> IRValue {
+  public static func constant(_ values: [IRValue], type: IRType) -> IRConstant {
     var vals = values.map { $0.asLLVM() as Optional }
     return vals.withUnsafeMutableBufferPointer { buf in
-      return LLVMConstArray(type.asLLVM(), buf.baseAddress, UInt32(buf.count))
+      return Constant<Struct>(llvm: LLVMConstArray(type.asLLVM(), buf.baseAddress, UInt32(buf.count)))
     }
   }
 
@@ -39,9 +39,9 @@ public struct ArrayType: IRType {
   ///
   /// - returns: A null terminated constant array value containing
   ///   `string.utf8.count + 1` i8's.
-  public static func constant(string: String, in context: Context = .global) -> IRValue {
+  public static func constant(string: String, in context: Context = .global) -> IRConstant {
     let length = string.utf8.count
-    return LLVMConstStringInContext(context.llvm, string, UInt32(length), 0)
+    return Constant<Struct>(llvm: LLVMConstStringInContext(context.llvm, string, UInt32(length), 0))
   }
 
   /// Retrieves the underlying LLVM type object.

Sources/LLVM/CallingConvention.swift

@@ -42,8 +42,7 @@ public enum CallingConvention {
   /// floating-point parameters.
   ///
   /// This calling convention supports `tail call
-  /// optimization <CodeGenerator.html#id80>`_ but requires both the
-  /// caller and callee are using it.
+  /// optimization but requires both the caller and callee are using it.
   case ghc
   /// This calling convention has been implemented specifically for use by
   /// the High-Performance Erlang (HiPE) compiler, *the*

Sources/LLVM/Constant.swift

@@ -7,6 +7,22 @@ import cllvm
 /// addresses are constant, and constant expressions.
 public protocol IRConstant: IRValue {}
 
+extension IRConstant {
+  /// Perform a GEP (Get Element Pointer) with this value as the base.
+  ///
+  /// - parameter indices: A list of indices that indicate which of the elements
+  ///   of the aggregate object are indexed.
+  ///
+  /// - returns: A value representing the address of a subelement of the given
+  ///   aggregate data structure value.
+  public func constGEP(indices: [IRConstant]) -> IRConstant {
+    var idxs = indices.map { $0.asLLVM() as Optional }
+    return idxs.withUnsafeMutableBufferPointer { buf in
+      return Constant<Struct>(llvm: LLVMConstGEP(asLLVM(), buf.baseAddress, UInt32(buf.count)))
+    }
+  }
+}
+
 /// A protocol to which the phantom types for a constant's representation conform.
 public protocol ConstantRepresentation {}
 /// A protocol to which the phantom types for all numerical constants conform.

Sources/LLVM/IRType.swift

@@ -11,8 +11,8 @@ public protocol IRType {
 
 public extension IRType {
   /// Returns the special `null` value for this type.
-  public func null() -> IRValue {
-    return LLVMConstNull(asLLVM())
+  public func null() -> IRConstant {
+    return Constant<Struct>(llvm: LLVMConstNull(asLLVM()))
   }
 
   /// Returns the special LLVM `undef` value for this type.
@@ -26,8 +26,8 @@ public extension IRType {
 
   /// Returns the special LLVM constant `null` pointer value for this type
   /// initialized to `null`.
-  public func constPointerNull() -> IRValue {
-    return LLVMConstPointerNull(asLLVM())
+  public func constPointerNull() -> IRConstant {
+    return Constant<Struct>(llvm: LLVMConstPointerNull(asLLVM()))
   }
 
   /// Returns the context associated with this type

Sources/LLVM/IRValue.swift

@@ -41,20 +41,6 @@ public extension IRValue {
     }
   }
 
-  /// Perform a GEP (Get Element Pointer) with this value as the base.
-  ///
-  /// - parameter indices: A list of indices that indicate which of the elements
-  ///   of the aggregate object are indexed.
-  ///
-  /// - returns: A value representing the address of a subelement of the given
-  ///   aggregate data structure value.
-  public func constGEP(indices: [IRValue]) -> IRValue {
-    var idxs = indices.map { $0.asLLVM() as Optional }
-    return idxs.withUnsafeMutableBufferPointer { buf in
-      return LLVMConstGEP(asLLVM(), buf.baseAddress, UInt32(buf.count))
-    }
-  }
-
   /// Replaces all uses of this value with the specified value.
   ///
   /// - parameter value: The new value to swap in.

Sources/LLVM/IntType.swift

@@ -41,7 +41,7 @@ public struct IntType: IRType {
   /// zero-bits.
   ///
   /// - returns: A value consisting of all zero-bits of this type's bit width.
-  public func zero() -> IRValue {
+  public func zero() -> IRConstant {
     return null()
   }
 
@@ -91,8 +91,8 @@ public struct IntType: IRType {
   /// one-bits.
   ///
   /// - returns: A value consisting of all one-bits of this type's bit width.
-  public func allOnes() -> IRValue {
-    return LLVMConstAllOnes(asLLVM())
+  public func allOnes() -> IRConstant {
+    return Constant<Struct>(llvm: LLVMConstAllOnes(asLLVM()))
   }
 
   /// Retrieves the underlying LLVM type object.