Consistently use the SpanExtensions.AsString helper

tannergooding · tannergooding · commit 9f971d77f2a9 · 2022-09-29T00:38:01.000-07:00
diff --git a/sources/LLVMSharp.Interop/Extensions/LLVMBasicBlockRef.cs b/sources/LLVMSharp.Interop/Extensions/LLVMBasicBlockRef.cs
@@ -93,9 +93,8 @@ public string PrintToString()
         {
             return string.Empty;
         }
-        var span = new ReadOnlySpan<byte>(pStr, int.MaxValue);
 
-        var result = span.Slice(0, span.IndexOf((byte)'\0')).AsString();
+        var result = SpanExtensions.AsString(pStr);
         LLVM.DisposeMessage(pStr);
         return result;
     }
diff --git a/sources/LLVMSharp.Interop/Extensions/LLVMContextRef.cs b/sources/LLVMSharp.Interop/Extensions/LLVMContextRef.cs
@@ -232,8 +232,7 @@ public bool TryGetBitcodeModule(LLVMMemoryBufferRef MemBuf, out LLVMModuleRef Ou
             }
             else
             {
-                var span = new ReadOnlySpan<byte>(pMessage, int.MaxValue);
-                OutMessage = span.Slice(0, span.IndexOf((byte)'\0')).AsString();
+                OutMessage = SpanExtensions.AsString(pMessage);
             }
 
             return result == 0;
@@ -253,8 +252,7 @@ public bool TryParseBitcode(LLVMMemoryBufferRef MemBuf, out LLVMModuleRef OutMod
             }
             else
             {
-                var span = new ReadOnlySpan<byte>(pMessage, int.MaxValue);
-                OutMessage = span.Slice(0, span.IndexOf((byte)'\0')).AsString();
+                OutMessage = SpanExtensions.AsString(pMessage);
             }
 
             return result == 0;
@@ -274,8 +272,7 @@ public bool TryParseIR(LLVMMemoryBufferRef MemBuf, out LLVMModuleRef OutM, out s
             }
             else
             {
-                var span = new ReadOnlySpan<byte>(pMessage, int.MaxValue);
-                OutMessage = span.Slice(0, span.IndexOf((byte)'\0')).AsString();
+                OutMessage = SpanExtensions.AsString(pMessage);
             }
 
             return result == 0;
diff --git a/sources/LLVMSharp.Interop/Extensions/LLVMExecutionEngineRef.cs b/sources/LLVMSharp.Interop/Extensions/LLVMExecutionEngineRef.cs
@@ -151,8 +151,7 @@ public bool TryRemoveModule(LLVMModuleRef M, out LLVMModuleRef OutMod, out strin
             }
             else
             {
-                var span = new ReadOnlySpan<byte>(pError, int.MaxValue);
-                OutError = span.Slice(0, span.IndexOf((byte)'\0')).AsString();
+                OutError = SpanExtensions.AsString(pError);
             }
 
             return result == 0;
diff --git a/sources/LLVMSharp.Interop/Extensions/LLVMModuleRef.cs b/sources/LLVMSharp.Interop/Extensions/LLVMModuleRef.cs
@@ -32,8 +32,7 @@ public string DataLayout
                 return string.Empty;
             }
 
-            var span = new ReadOnlySpan<byte>(pDataLayoutStr, int.MaxValue);
-            return span.Slice(0, span.IndexOf((byte)'\0')).AsString();
+            return SpanExtensions.AsString(pDataLayoutStr);
         }
 
         set
@@ -67,8 +66,7 @@ public string Target
                 return string.Empty;
             }
 
-            var span = new ReadOnlySpan<byte>(pTriple, int.MaxValue);
-            return span.Slice(0, span.IndexOf((byte)'\0')).AsString();
+            return SpanExtensions.AsString(pTriple);
         }
 
         set
@@ -306,9 +304,8 @@ public string PrintToString()
         {
             return string.Empty;
         }
-        var span = new ReadOnlySpan<byte>(pStr, int.MaxValue);
 
-        var result = span.Slice(0, span.IndexOf((byte)'\0')).AsString();
+        var result = SpanExtensions.AsString(pStr);
         LLVM.DisposeMessage(pStr);
         return result;
     }
@@ -336,8 +333,7 @@ public bool TryCreateExecutionEngine(out LLVMExecutionEngineRef OutEE, out strin
             }
             else
             {
-                var span = new ReadOnlySpan<byte>(pError, int.MaxValue);
-                OutError = span.Slice(0, span.IndexOf((byte)'\0')).AsString();
+                OutError = SpanExtensions.AsString(pError);
             }
 
             return result == 0;
@@ -357,8 +353,7 @@ public bool TryCreateInterpreter(out LLVMExecutionEngineRef OutInterp, out strin
             }
             else
             {
-                var span = new ReadOnlySpan<byte>(pError, int.MaxValue);
-                OutError = span.Slice(0, span.IndexOf((byte)'\0')).AsString();
+                OutError = SpanExtensions.AsString(pError);
             }
 
             return result == 0;
@@ -385,8 +380,7 @@ public bool TryCreateMCJITCompiler(out LLVMExecutionEngineRef OutJIT, ref LLVMMC
             }
             else
             {
-                var span = new ReadOnlySpan<byte>(pError, int.MaxValue);
-                OutError = span.Slice(0, span.IndexOf((byte)'\0')).AsString();
+                OutError = SpanExtensions.AsString(pError);
             }
 
             return result == 0;
@@ -401,6 +395,7 @@ public bool TryPrintToFile(ReadOnlySpan<char> Filename, out string ErrorMessage)
 
         sbyte* pErrorMessage = null;
         int result = 0;
+
         try
         {
             result = LLVM.PrintModuleToFile(this, marshaledFilename, &pErrorMessage);
@@ -415,8 +410,7 @@ public bool TryPrintToFile(ReadOnlySpan<char> Filename, out string ErrorMessage)
         }
         else
         {
-            var span = new ReadOnlySpan<byte>(pErrorMessage, int.MaxValue);
-            ErrorMessage = span.Slice(0, span.IndexOf((byte)'\0')).AsString();
+            ErrorMessage = SpanExtensions.AsString(pErrorMessage);
         }
 
         return result == 0;
@@ -433,8 +427,7 @@ public bool TryVerify(LLVMVerifierFailureAction Action, out string OutMessage)
         }
         else
         {
-            var span = new ReadOnlySpan<byte>(pMessage, int.MaxValue);
-            OutMessage = span.Slice(0, span.IndexOf((byte)'\0')).AsString();
+            OutMessage = SpanExtensions.AsString(pMessage);
         }
 
         return result == 0;
diff --git a/sources/LLVMSharp.Interop/Extensions/LLVMTargetMachineRef.cs b/sources/LLVMSharp.Interop/Extensions/LLVMTargetMachineRef.cs
@@ -57,8 +57,7 @@ public bool TryEmitToFile(LLVMModuleRef module, ReadOnlySpan<char> fileName, LLV
         }
         else
         {
-            var span = new ReadOnlySpan<byte>(errorMessage, int.MaxValue);
-            message = span.Slice(0, span.IndexOf((byte)'\0')).AsString();
+            message = SpanExtensions.AsString(errorMessage);
             LLVM.DisposeErrorMessage(errorMessage);
         }
 
diff --git a/sources/LLVMSharp.Interop/Extensions/LLVMTargetRef.cs b/sources/LLVMSharp.Interop/Extensions/LLVMTargetRef.cs
@@ -26,8 +26,7 @@ public static string DefaultTriple
                 return string.Empty;
             }
 
-            var span = new ReadOnlySpan<byte>(pDefaultTriple, int.MaxValue);
-            return span.Slice(0, span.IndexOf((byte)'\0')).AsString();
+            return SpanExtensions.AsString(pDefaultTriple);
         }
     }
 
@@ -46,8 +45,7 @@ public static bool TryGetTargetFromTriple(ReadOnlySpan<char> triple, out LLVMTar
             }
             else
             {
-                var span = new ReadOnlySpan<byte>(pError, int.MaxValue);
-                outError = span.Slice(0, span.IndexOf((byte)'\0')).AsString();
+                outError = SpanExtensions.AsString(pError);
             }
 
             return result == 0;
@@ -98,8 +96,7 @@ public string Name
                 return string.Empty;
             }
 
-            var span = new ReadOnlySpan<byte>(pName, int.MaxValue);
-            return span.Slice(0, span.IndexOf((byte)'\0')).AsString();
+            return SpanExtensions.AsString(pName);
         }
     }
 
diff --git a/sources/LLVMSharp.Interop/Extensions/LLVMTypeRef.cs b/sources/LLVMSharp.Interop/Extensions/LLVMTypeRef.cs
@@ -133,8 +133,7 @@ public string StructName
                 return string.Empty;
             }
 
-            var span = new ReadOnlySpan<byte>(pStructName, int.MaxValue);
-            return span.Slice(0, span.IndexOf((byte)'\0')).AsString();
+            return SpanExtensions.AsString(pStructName);
         }
     }
 
@@ -224,9 +223,8 @@ public string PrintToString()
         {
             return string.Empty;
         }
-        var span = new ReadOnlySpan<byte>(pStr, int.MaxValue);
 
-        var result = span.Slice(0, span.IndexOf((byte)'\0')).AsString();
+        var result = SpanExtensions.AsString(pStr);
         LLVM.DisposeMessage(pStr);
         return result;
     }
diff --git a/sources/LLVMSharp.Interop/Extensions/LLVMValueRef.cs b/sources/LLVMSharp.Interop/Extensions/LLVMValueRef.cs
@@ -132,8 +132,7 @@ public string GC
                 return string.Empty;
             }
 
-            var span = new ReadOnlySpan<byte>(pName, int.MaxValue);
-            return span.Slice(0, span.IndexOf((byte)'\0')).AsString();
+            return SpanExtensions.AsString(pName);
         }
 
         set
@@ -520,8 +519,7 @@ public string Name
                 return string.Empty;
             }
 
-            var span = new ReadOnlySpan<byte>(pStr, int.MaxValue);
-            return span.Slice(0, span.IndexOf((byte)'\0')).AsString();
+            return SpanExtensions.AsString(pStr);
         }
 
         set
@@ -602,8 +600,7 @@ public string Section
                 return string.Empty;
             }
 
-            var span = new ReadOnlySpan<byte>(pSection, int.MaxValue);
-            return span.Slice(0, span.IndexOf((byte)'\0')).AsString();
+            return SpanExtensions.AsString(pSection);
         }
 
         set
@@ -1068,9 +1065,8 @@ public string PrintToString()
         {
             return string.Empty;
         }
-        var span = new ReadOnlySpan<byte>(pStr, int.MaxValue);
 
-        var result = span.Slice(0, span.IndexOf((byte)'\0')).AsString();
+        var result = SpanExtensions.AsString(pStr);
         LLVM.DisposeMessage(pStr);
         return result;
     }

Original file line number	Diff line number	Diff line change
`@@ -93,9 +93,8 @@ public string PrintToString()`
`93`	`93`	`{`
`94`	`94`	`return string.Empty;`
`95`	`95`	`}`
`96`		`- var span = new ReadOnlySpan<byte>(pStr, int.MaxValue);`
`97`	`96`
`98`		`- var result = span.Slice(0, span.IndexOf((byte)'\0')).AsString();`
	`97`	`+ var result = SpanExtensions.AsString(pStr);`
`99`	`98`	`LLVM.DisposeMessage(pStr);`
`100`	`99`	`return result;`
`101`	`100`	`}`
Original file line number	Diff line number	Diff line change
`@@ -232,8 +232,7 @@ public bool TryGetBitcodeModule(LLVMMemoryBufferRef MemBuf, out LLVMModuleRef Ou`
`232`	`232`	`}`
`233`	`233`	`else`
`234`	`234`	`{`
`235`		`- var span = new ReadOnlySpan<byte>(pMessage, int.MaxValue);`
`236`		`- OutMessage = span.Slice(0, span.IndexOf((byte)'\0')).AsString();`
	`235`	`+ OutMessage = SpanExtensions.AsString(pMessage);`
`237`	`236`	`}`
`238`	`237`
`239`	`238`	`return result == 0;`
`@@ -253,8 +252,7 @@ public bool TryParseBitcode(LLVMMemoryBufferRef MemBuf, out LLVMModuleRef OutMod`
`253`	`252`	`}`
`254`	`253`	`else`
`255`	`254`	`{`
`256`		`- var span = new ReadOnlySpan<byte>(pMessage, int.MaxValue);`
`257`		`- OutMessage = span.Slice(0, span.IndexOf((byte)'\0')).AsString();`
	`255`	`+ OutMessage = SpanExtensions.AsString(pMessage);`
`258`	`256`	`}`
`259`	`257`
`260`	`258`	`return result == 0;`
`@@ -274,8 +272,7 @@ public bool TryParseIR(LLVMMemoryBufferRef MemBuf, out LLVMModuleRef OutM, out s`
`274`	`272`	`}`
`275`	`273`	`else`
`276`	`274`	`{`
`277`		`- var span = new ReadOnlySpan<byte>(pMessage, int.MaxValue);`
`278`		`- OutMessage = span.Slice(0, span.IndexOf((byte)'\0')).AsString();`
	`275`	`+ OutMessage = SpanExtensions.AsString(pMessage);`
`279`	`276`	`}`
`280`	`277`
`281`	`278`	`return result == 0;`
Original file line number	Diff line number	Diff line change
`@@ -151,8 +151,7 @@ public bool TryRemoveModule(LLVMModuleRef M, out LLVMModuleRef OutMod, out strin`
`151`	`151`	`}`
`152`	`152`	`else`
`153`	`153`	`{`
`154`		`- var span = new ReadOnlySpan<byte>(pError, int.MaxValue);`
`155`		`- OutError = span.Slice(0, span.IndexOf((byte)'\0')).AsString();`
	`154`	`+ OutError = SpanExtensions.AsString(pError);`
`156`	`155`	`}`
`157`	`156`
`158`	`157`	`return result == 0;`
Original file line number	Diff line number	Diff line change
`@@ -32,8 +32,7 @@ public string DataLayout`
`32`	`32`	`return string.Empty;`
`33`	`33`	`}`
`34`	`34`
`35`		`- var span = new ReadOnlySpan<byte>(pDataLayoutStr, int.MaxValue);`
`36`		`- return span.Slice(0, span.IndexOf((byte)'\0')).AsString();`
	`35`	`+ return SpanExtensions.AsString(pDataLayoutStr);`
`37`	`36`	`}`
`38`	`37`
`39`	`38`	`set`
`@@ -67,8 +66,7 @@ public string Target`
`67`	`66`	`return string.Empty;`
`68`	`67`	`}`
`69`	`68`
`70`		`- var span = new ReadOnlySpan<byte>(pTriple, int.MaxValue);`
`71`		`- return span.Slice(0, span.IndexOf((byte)'\0')).AsString();`
	`69`	`+ return SpanExtensions.AsString(pTriple);`
`72`	`70`	`}`
`73`	`71`
`74`	`72`	`set`
`@@ -306,9 +304,8 @@ public string PrintToString()`
`306`	`304`	`{`
`307`	`305`	`return string.Empty;`
`308`	`306`	`}`
`309`		`- var span = new ReadOnlySpan<byte>(pStr, int.MaxValue);`
`310`	`307`
`311`		`- var result = span.Slice(0, span.IndexOf((byte)'\0')).AsString();`
	`308`	`+ var result = SpanExtensions.AsString(pStr);`
`312`	`309`	`LLVM.DisposeMessage(pStr);`
`313`	`310`	`return result;`
`314`	`311`	`}`
`@@ -336,8 +333,7 @@ public bool TryCreateExecutionEngine(out LLVMExecutionEngineRef OutEE, out strin`
`336`	`333`	`}`
`337`	`334`	`else`
`338`	`335`	`{`
`339`		`- var span = new ReadOnlySpan<byte>(pError, int.MaxValue);`
`340`		`- OutError = span.Slice(0, span.IndexOf((byte)'\0')).AsString();`
	`336`	`+ OutError = SpanExtensions.AsString(pError);`
`341`	`337`	`}`
`342`	`338`
`343`	`339`	`return result == 0;`
`@@ -357,8 +353,7 @@ public bool TryCreateInterpreter(out LLVMExecutionEngineRef OutInterp, out strin`
`357`	`353`	`}`
`358`	`354`	`else`
`359`	`355`	`{`
`360`		`- var span = new ReadOnlySpan<byte>(pError, int.MaxValue);`
`361`		`- OutError = span.Slice(0, span.IndexOf((byte)'\0')).AsString();`
	`356`	`+ OutError = SpanExtensions.AsString(pError);`
`362`	`357`	`}`
`363`	`358`
`364`	`359`	`return result == 0;`
`@@ -385,8 +380,7 @@ public bool TryCreateMCJITCompiler(out LLVMExecutionEngineRef OutJIT, ref LLVMMC`
`385`	`380`	`}`
`386`	`381`	`else`
`387`	`382`	`{`
`388`		`- var span = new ReadOnlySpan<byte>(pError, int.MaxValue);`
`389`		`- OutError = span.Slice(0, span.IndexOf((byte)'\0')).AsString();`
	`383`	`+ OutError = SpanExtensions.AsString(pError);`
`390`	`384`	`}`
`391`	`385`
`392`	`386`	`return result == 0;`
`@@ -401,6 +395,7 @@ public bool TryPrintToFile(ReadOnlySpan<char> Filename, out string ErrorMessage)`
`401`	`395`
`402`	`396`	`sbyte* pErrorMessage = null;`
`403`	`397`	`int result = 0;`
	`398`	`+`
`404`	`399`	`try`
`405`	`400`	`{`
`406`	`401`	`result = LLVM.PrintModuleToFile(this, marshaledFilename, &pErrorMessage);`
`@@ -415,8 +410,7 @@ public bool TryPrintToFile(ReadOnlySpan<char> Filename, out string ErrorMessage)`
`415`	`410`	`}`
`416`	`411`	`else`
`417`	`412`	`{`
`418`		`- var span = new ReadOnlySpan<byte>(pErrorMessage, int.MaxValue);`
`419`		`- ErrorMessage = span.Slice(0, span.IndexOf((byte)'\0')).AsString();`
	`413`	`+ ErrorMessage = SpanExtensions.AsString(pErrorMessage);`
`420`	`414`	`}`
`421`	`415`
`422`	`416`	`return result == 0;`
`@@ -433,8 +427,7 @@ public bool TryVerify(LLVMVerifierFailureAction Action, out string OutMessage)`
`433`	`427`	`}`
`434`	`428`	`else`
`435`	`429`	`{`
`436`		`- var span = new ReadOnlySpan<byte>(pMessage, int.MaxValue);`
`437`		`- OutMessage = span.Slice(0, span.IndexOf((byte)'\0')).AsString();`
	`430`	`+ OutMessage = SpanExtensions.AsString(pMessage);`
`438`	`431`	`}`
`439`	`432`
`440`	`433`	`return result == 0;`
Original file line number	Diff line number	Diff line change
`@@ -57,8 +57,7 @@ public bool TryEmitToFile(LLVMModuleRef module, ReadOnlySpan<char> fileName, LLV`
`57`	`57`	`}`
`58`	`58`	`else`
`59`	`59`	`{`
`60`		`- var span = new ReadOnlySpan<byte>(errorMessage, int.MaxValue);`
`61`		`- message = span.Slice(0, span.IndexOf((byte)'\0')).AsString();`
	`60`	`+ message = SpanExtensions.AsString(errorMessage);`
`62`	`61`	`LLVM.DisposeErrorMessage(errorMessage);`
`63`	`62`	`}`
`64`	`63`
Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,7 @@ public static string DefaultTriple`
`26`	`26`	`return string.Empty;`
`27`	`27`	`}`
`28`	`28`
`29`		`- var span = new ReadOnlySpan<byte>(pDefaultTriple, int.MaxValue);`
`30`		`- return span.Slice(0, span.IndexOf((byte)'\0')).AsString();`
	`29`	`+ return SpanExtensions.AsString(pDefaultTriple);`
`31`	`30`	`}`
`32`	`31`	`}`
`33`	`32`
`@@ -46,8 +45,7 @@ public static bool TryGetTargetFromTriple(ReadOnlySpan<char> triple, out LLVMTar`
`46`	`45`	`}`
`47`	`46`	`else`
`48`	`47`	`{`
`49`		`- var span = new ReadOnlySpan<byte>(pError, int.MaxValue);`
`50`		`- outError = span.Slice(0, span.IndexOf((byte)'\0')).AsString();`
	`48`	`+ outError = SpanExtensions.AsString(pError);`
`51`	`49`	`}`
`52`	`50`
`53`	`51`	`return result == 0;`
`@@ -98,8 +96,7 @@ public string Name`
`98`	`96`	`return string.Empty;`
`99`	`97`	`}`
`100`	`98`
`101`		`- var span = new ReadOnlySpan<byte>(pName, int.MaxValue);`
`102`		`- return span.Slice(0, span.IndexOf((byte)'\0')).AsString();`
	`99`	`+ return SpanExtensions.AsString(pName);`
`103`	`100`	`}`
`104`	`101`	`}`
`105`	`102`
Original file line number	Diff line number	Diff line change
`@@ -133,8 +133,7 @@ public string StructName`
`133`	`133`	`return string.Empty;`
`134`	`134`	`}`
`135`	`135`
`136`		`- var span = new ReadOnlySpan<byte>(pStructName, int.MaxValue);`
`137`		`- return span.Slice(0, span.IndexOf((byte)'\0')).AsString();`
	`136`	`+ return SpanExtensions.AsString(pStructName);`
`138`	`137`	`}`
`139`	`138`	`}`
`140`	`139`
`@@ -224,9 +223,8 @@ public string PrintToString()`
`224`	`223`	`{`
`225`	`224`	`return string.Empty;`
`226`	`225`	`}`
`227`		`- var span = new ReadOnlySpan<byte>(pStr, int.MaxValue);`
`228`	`226`
`229`		`- var result = span.Slice(0, span.IndexOf((byte)'\0')).AsString();`
	`227`	`+ var result = SpanExtensions.AsString(pStr);`
`230`	`228`	`LLVM.DisposeMessage(pStr);`
`231`	`229`	`return result;`
`232`	`230`	`}`
Original file line number	Diff line number	Diff line change
`@@ -132,8 +132,7 @@ public string GC`
`132`	`132`	`return string.Empty;`
`133`	`133`	`}`
`134`	`134`
`135`		`- var span = new ReadOnlySpan<byte>(pName, int.MaxValue);`
`136`		`- return span.Slice(0, span.IndexOf((byte)'\0')).AsString();`
	`135`	`+ return SpanExtensions.AsString(pName);`
`137`	`136`	`}`
`138`	`137`
`139`	`138`	`set`
`@@ -520,8 +519,7 @@ public string Name`
`520`	`519`	`return string.Empty;`
`521`	`520`	`}`
`522`	`521`
`523`		`- var span = new ReadOnlySpan<byte>(pStr, int.MaxValue);`
`524`		`- return span.Slice(0, span.IndexOf((byte)'\0')).AsString();`
	`522`	`+ return SpanExtensions.AsString(pStr);`
`525`	`523`	`}`
`526`	`524`
`527`	`525`	`set`
`@@ -602,8 +600,7 @@ public string Section`
`602`	`600`	`return string.Empty;`
`603`	`601`	`}`
`604`	`602`
`605`		`- var span = new ReadOnlySpan<byte>(pSection, int.MaxValue);`
`606`		`- return span.Slice(0, span.IndexOf((byte)'\0')).AsString();`
	`603`	`+ return SpanExtensions.AsString(pSection);`
`607`	`604`	`}`
`608`	`605`
`609`	`606`	`set`
`@@ -1068,9 +1065,8 @@ public string PrintToString()`
`1068`	`1065`	`{`
`1069`	`1066`	`return string.Empty;`
`1070`	`1067`	`}`
`1071`		`- var span = new ReadOnlySpan<byte>(pStr, int.MaxValue);`
`1072`	`1068`
`1073`		`- var result = span.Slice(0, span.IndexOf((byte)'\0')).AsString();`
	`1069`	`+ var result = SpanExtensions.AsString(pStr);`
`1074`	`1070`	`LLVM.DisposeMessage(pStr);`
`1075`	`1071`	`return result;`
`1076`	`1072`	`}`