Adding span overloads for most of the interop extensions (#136)

dotnet · Apr 18, 2020 · 1017748 · 1017748
1 parent 0acab90
commit 1017748
Show file tree

Hide file tree

Showing 13 changed files with 727 additions and 345 deletions.
diff --git a/sources/LLVMSharp/Internals/MarshaledArray`1.cs b/sources/LLVMSharp/Internals/MarshaledArray`1.cs
@@ -0,0 +1,46 @@
+// Copyright (c) Microsoft and Contributors. All rights reserved. Licensed under the University of Illinois/NCSA Open Source License. See LICENSE.txt in the project root for license information.
+
+using System;
+using System.Buffers;
+
+namespace LLVMSharp
+{
+    internal unsafe struct MarshaledArray<T, U> : IDisposable
+    {
+        public MarshaledArray(ReadOnlySpan<T> inputs, Func<T, U> marshal)
+        {
+            if (inputs.IsEmpty)
+            {
+                Count = 0;
+                Values = null;
+            }
+            else
+            {
+                Count = inputs.Length;
+                Values = ArrayPool<U>.Shared.Rent(Count);
+
+                for (int i = 0; i < Count; i++)
+                {
+                    Values[i] = marshal(inputs[i]);
+                }
+            }
+        }
+
+        public int Count { get; private set; }
+
+        public U[] Values { get; private set; }
+
+        public static implicit operator ReadOnlySpan<U>(in MarshaledArray<T, U> value)
+        {
+            return value.Values;
+        }
+
+        public void Dispose()
+        {
+            if (Values != null)
+            {
+                ArrayPool<U>.Shared.Return(Values);
+            }
+        }
+    }
+}
diff --git a/sources/LLVMSharp/Internals/MarshaledString.cs b/sources/LLVMSharp/Internals/MarshaledString.cs
@@ -8,9 +8,9 @@ namespace LLVMSharp
 {
     internal unsafe struct MarshaledString : IDisposable
     {
-        public MarshaledString(string input)
+        public MarshaledString(ReadOnlySpan<char> input)
         {
-            if ((input is null) || (input.Length == 0))
+            if (input.IsEmpty)
             {
                 var value = Marshal.AllocHGlobal(1);
                 Marshal.WriteByte(value, 0, 0);
@@ -20,7 +20,7 @@ public MarshaledString(string input)
             }
             else
             {
-                var valueBytes = Encoding.UTF8.GetBytes(input);
+                var valueBytes = Encoding.UTF8.GetBytes(input.ToString());
                 var length = valueBytes.Length;
                 var value = Marshal.AllocHGlobal(length + 1);
                 Marshal.Copy(valueBytes, 0, value, length);

diff --git a/sources/LLVMSharp/Internals/MarshaledStringArray.cs b/sources/LLVMSharp/Internals/MarshaledStringArray.cs
@@ -6,9 +6,9 @@ namespace LLVMSharp
 {
     internal unsafe struct MarshaledStringArray : IDisposable
     {
-        public MarshaledStringArray(string[] inputs)
+        public MarshaledStringArray(ReadOnlySpan<string> inputs)
         {
-            if ((inputs is null) || (inputs.Length == 0))
+            if (inputs.IsEmpty)
             {
                 Count = 0;
                 Values = null;
@@ -20,7 +20,7 @@ public MarshaledStringArray(string[] inputs)
 
                 for (int i = 0; i < Count; i++)
                 {
-                    Values[i] = new MarshaledString(inputs[i]);
+                    Values[i] = new MarshaledString(inputs[i].AsSpan());
                 }
             }
         }

diff --git a/sources/LLVMSharp/Interop.Extensions/LLVMBasicBlockRef.cs b/sources/LLVMSharp/Interop.Extensions/LLVMBasicBlockRef.cs
@@ -49,6 +49,30 @@ public LLVMBasicBlockRef(IntPtr handle)
 
         public static bool operator !=(LLVMBasicBlockRef left, LLVMBasicBlockRef right) => !(left == right);
 
+        public static LLVMBasicBlockRef AppendInContext(LLVMContextRef C, LLVMValueRef Fn, string Name) => AppendInContext(C, Fn, Name.AsSpan());
+
+        public static LLVMBasicBlockRef AppendInContext(LLVMContextRef C, LLVMValueRef Fn, ReadOnlySpan<char> Name)
+        {
+            using var marshaledName = new MarshaledString(Name);
+            return LLVM.AppendBasicBlockInContext(C, Fn, marshaledName);
+        }
+
+        public static LLVMBasicBlockRef CreateInContext(LLVMContextRef C, string Name) => CreateInContext(C, Name.AsSpan());
+
+        public static LLVMBasicBlockRef CreateInContext(LLVMContextRef C, ReadOnlySpan<char> Name)
+        {
+            using var marshaledName = new MarshaledString(Name);
+            return LLVM.CreateBasicBlockInContext(C, marshaledName);
+        }
+
+        public static LLVMBasicBlockRef InsertInContext(LLVMContextRef C, LLVMBasicBlockRef BB, string Name) => InsertInContext(C, BB, Name.AsSpan());
+
+        public static LLVMBasicBlockRef InsertInContext(LLVMContextRef C, LLVMBasicBlockRef BB, ReadOnlySpan<char> Name)
+        {
+            using var marshaledName = new MarshaledString(Name);
+            return LLVM.InsertBasicBlockInContext(C, BB, marshaledName);
+        }
+
         public LLVMValueRef AsValue() => LLVM.BasicBlockAsValue(this);
 
         public void Delete() => LLVM.DeleteBasicBlock(this);
@@ -61,7 +85,9 @@ public LLVMBasicBlockRef(IntPtr handle)
 
         public override int GetHashCode() => Handle.GetHashCode();
 
-        public LLVMBasicBlockRef InsertBasicBlock(string Name)
+        public LLVMBasicBlockRef InsertBasicBlock(string Name) => InsertBasicBlock(Name.AsSpan());
+
+        public LLVMBasicBlockRef InsertBasicBlock(ReadOnlySpan<char> Name)
         {
             using var marshaledName = new MarshaledString(Name);
             return LLVM.InsertBasicBlock(this, marshaledName);