Skip to content

Commit 1017748

Browse files
Adding span overloads for most of the interop extensions (#136)
1 parent 0acab90 commit 1017748

13 files changed

+727
-345
lines changed
Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
// 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.
2+
3+
using System;
4+
using System.Buffers;
5+
6+
namespace LLVMSharp
7+
{
8+
internal unsafe struct MarshaledArray<T, U> : IDisposable
9+
{
10+
public MarshaledArray(ReadOnlySpan<T> inputs, Func<T, U> marshal)
11+
{
12+
if (inputs.IsEmpty)
13+
{
14+
Count = 0;
15+
Values = null;
16+
}
17+
else
18+
{
19+
Count = inputs.Length;
20+
Values = ArrayPool<U>.Shared.Rent(Count);
21+
22+
for (int i = 0; i < Count; i++)
23+
{
24+
Values[i] = marshal(inputs[i]);
25+
}
26+
}
27+
}
28+
29+
public int Count { get; private set; }
30+
31+
public U[] Values { get; private set; }
32+
33+
public static implicit operator ReadOnlySpan<U>(in MarshaledArray<T, U> value)
34+
{
35+
return value.Values;
36+
}
37+
38+
public void Dispose()
39+
{
40+
if (Values != null)
41+
{
42+
ArrayPool<U>.Shared.Return(Values);
43+
}
44+
}
45+
}
46+
}

sources/LLVMSharp/Internals/MarshaledString.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ namespace LLVMSharp
88
{
99
internal unsafe struct MarshaledString : IDisposable
1010
{
11-
public MarshaledString(string input)
11+
public MarshaledString(ReadOnlySpan<char> input)
1212
{
13-
if ((input is null) || (input.Length == 0))
13+
if (input.IsEmpty)
1414
{
1515
var value = Marshal.AllocHGlobal(1);
1616
Marshal.WriteByte(value, 0, 0);
@@ -20,7 +20,7 @@ public MarshaledString(string input)
2020
}
2121
else
2222
{
23-
var valueBytes = Encoding.UTF8.GetBytes(input);
23+
var valueBytes = Encoding.UTF8.GetBytes(input.ToString());
2424
var length = valueBytes.Length;
2525
var value = Marshal.AllocHGlobal(length + 1);
2626
Marshal.Copy(valueBytes, 0, value, length);

sources/LLVMSharp/Internals/MarshaledStringArray.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ namespace LLVMSharp
66
{
77
internal unsafe struct MarshaledStringArray : IDisposable
88
{
9-
public MarshaledStringArray(string[] inputs)
9+
public MarshaledStringArray(ReadOnlySpan<string> inputs)
1010
{
11-
if ((inputs is null) || (inputs.Length == 0))
11+
if (inputs.IsEmpty)
1212
{
1313
Count = 0;
1414
Values = null;
@@ -20,7 +20,7 @@ public MarshaledStringArray(string[] inputs)
2020

2121
for (int i = 0; i < Count; i++)
2222
{
23-
Values[i] = new MarshaledString(inputs[i]);
23+
Values[i] = new MarshaledString(inputs[i].AsSpan());
2424
}
2525
}
2626
}

sources/LLVMSharp/Interop.Extensions/LLVMBasicBlockRef.cs

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,30 @@ public static implicit operator LLVMBasicBlockRef(LLVMOpaqueBasicBlock* value)
4949

5050
public static bool operator !=(LLVMBasicBlockRef left, LLVMBasicBlockRef right) => !(left == right);
5151

52+
public static LLVMBasicBlockRef AppendInContext(LLVMContextRef C, LLVMValueRef Fn, string Name) => AppendInContext(C, Fn, Name.AsSpan());
53+
54+
public static LLVMBasicBlockRef AppendInContext(LLVMContextRef C, LLVMValueRef Fn, ReadOnlySpan<char> Name)
55+
{
56+
using var marshaledName = new MarshaledString(Name);
57+
return LLVM.AppendBasicBlockInContext(C, Fn, marshaledName);
58+
}
59+
60+
public static LLVMBasicBlockRef CreateInContext(LLVMContextRef C, string Name) => CreateInContext(C, Name.AsSpan());
61+
62+
public static LLVMBasicBlockRef CreateInContext(LLVMContextRef C, ReadOnlySpan<char> Name)
63+
{
64+
using var marshaledName = new MarshaledString(Name);
65+
return LLVM.CreateBasicBlockInContext(C, marshaledName);
66+
}
67+
68+
public static LLVMBasicBlockRef InsertInContext(LLVMContextRef C, LLVMBasicBlockRef BB, string Name) => InsertInContext(C, BB, Name.AsSpan());
69+
70+
public static LLVMBasicBlockRef InsertInContext(LLVMContextRef C, LLVMBasicBlockRef BB, ReadOnlySpan<char> Name)
71+
{
72+
using var marshaledName = new MarshaledString(Name);
73+
return LLVM.InsertBasicBlockInContext(C, BB, marshaledName);
74+
}
75+
5276
public LLVMValueRef AsValue() => LLVM.BasicBlockAsValue(this);
5377

5478
public void Delete() => LLVM.DeleteBasicBlock(this);
@@ -61,7 +85,9 @@ public static implicit operator LLVMBasicBlockRef(LLVMOpaqueBasicBlock* value)
6185

6286
public override int GetHashCode() => Handle.GetHashCode();
6387

64-
public LLVMBasicBlockRef InsertBasicBlock(string Name)
88+
public LLVMBasicBlockRef InsertBasicBlock(string Name) => InsertBasicBlock(Name.AsSpan());
89+
90+
public LLVMBasicBlockRef InsertBasicBlock(ReadOnlySpan<char> Name)
6591
{
6692
using var marshaledName = new MarshaledString(Name);
6793
return LLVM.InsertBasicBlock(this, marshaledName);

0 commit comments

Comments
 (0)