Fix additional low hanging bugs (#257)

* Refactoring how the calling convention is looked up for a given cursor or type * Ensure that non-char based string literals don't assert with debug clang * Ensure that managled names are correctly represented in DllImport * Ensure creating a span over a pointer works on netstandard * Don't include the underscore prefix on the entry point name for simple C exports
dotnet · Aug 4, 2021 · 69bf841 · 69bf841
1 parent d0ca6a6
commit 69bf841
Show file tree

Hide file tree

Showing 33 changed files with 808 additions and 218 deletions.
diff --git a/sources/ClangSharp.Interop/Extensions/CXModuleMapDescriptor.cs b/sources/ClangSharp.Interop/Extensions/CXModuleMapDescriptor.cs
@@ -54,7 +54,19 @@ public Span<byte> WriteToBuffer(uint options, out CXErrorCode errorCode)
         {
             sbyte* pBuffer; uint size;
             errorCode = clang.ModuleMapDescriptor_writeToBuffer(this, options, &pBuffer, &size);
+
+#if NETSTANDARD
+            var result = new byte[checked((int)size)];
+
+            fixed (byte* pResult = result)
+            {
+                Buffer.MemoryCopy(pBuffer, pResult, size, size);
+            }
+
+            return result;
+#else
             return new Span<byte>(pBuffer, (int)size);
+#endif
         }
     }
 }
diff --git a/sources/ClangSharp.Interop/Extensions/CXTranslationUnit.cs b/sources/ClangSharp.Interop/Extensions/CXTranslationUnit.cs
@@ -222,7 +222,20 @@ public Span<CXToken> Tokenize(CXSourceRange sourceRange)
         {
             CXToken* pTokens; uint numTokens;
             clang.tokenize(this, sourceRange, &pTokens, &numTokens);
+
+#if NETSTANDARD
+            var result = new CXToken[checked((int)numTokens)];
+
+            fixed (CXToken* pResult = result)
+            {
+                var size = sizeof(CXToken) * numTokens;
+                Buffer.MemoryCopy(pTokens, pResult, size, size);
+            }
+
+            return result;
+#else
             return new Span<CXToken>(pTokens, (int)numTokens);
+#endif
         }
 
         public override string ToString() => Spelling.ToString();

diff --git a/sources/ClangSharp.Interop/Extensions/CXVirtualFileOverlay.cs b/sources/ClangSharp.Interop/Extensions/CXVirtualFileOverlay.cs
@@ -51,7 +51,19 @@ public Span<byte> WriteToBuffer(uint options, out CXErrorCode errorCode)
         {
             sbyte* pBuffer; uint size;
             errorCode = clang.VirtualFileOverlay_writeToBuffer(this, options, &pBuffer, &size);
+
+#if NETSTANDARD
+            var result = new byte[checked((int)size)];
+
+            fixed (byte* pResult = result)
+            {
+                Buffer.MemoryCopy(pBuffer, pResult, size, size);
+            }
+
+            return result;
+#else
             return new Span<byte>(pBuffer, (int)size);
+#endif
         }
     }
 }
diff --git a/sources/ClangSharp.PInvokeGenerator/PInvokeGenerator.VisitDecl.cs b/sources/ClangSharp.PInvokeGenerator/PInvokeGenerator.VisitDecl.cs
@@ -452,28 +452,16 @@ private void VisitFunctionDecl(FunctionDecl functionDecl)
             }
 
             var type = functionDecl.Type;
-            var callConv = CXCallingConv.CXCallingConv_Invalid;
+            var callingConventionName = GetCallingConvention(functionDecl, cxxRecordDecl, type);
 
-            if (type is AttributedType attributedType)
-            {
-                type = attributedType.ModifiedType;
-                callConv = attributedType.Handle.FunctionTypeCallingConv;
-            }
+            var isDllImport = body is null && !isVirtual;
+            var entryPoint = isDllImport ? functionDecl.Handle.Mangling.CString : null;
 
-            if (type is FunctionType functionType)
+            if (entryPoint == $"_{functionDecl.Name}")
             {
-                if (callConv == CXCallingConv.CXCallingConv_Invalid)
-                {
-                    callConv = functionType.CallConv;
-                }
+                entryPoint = functionDecl.Name;
             }
 
-            var callingConventionName = GetCallingConvention(functionDecl, callConv, name);
-            var entryPoint = !isVirtual && body is null
-                ? (cxxMethodDecl is null) ? GetCursorName(functionDecl) : cxxMethodDecl.Handle.Mangling.CString
-                : null;
-            var isDllImport = body is null && !isVirtual;
-
             var needsReturnFixup = isVirtual && NeedsReturnFixup(cxxMethodDecl);
 
             var desc = new FunctionOrDelegateDesc<(string Name, PInvokeGenerator This)>
@@ -2435,14 +2423,10 @@ void ForFunctionProtoType(TypedefDecl typedefDecl, FunctionProtoType functionPro
                 var name = GetRemappedCursorName(typedefDecl);
                 var escapedName = EscapeName(name);
 
-                    var callingConventionName = GetCallingConvention(typedefDecl,
-                        (parentType is AttributedType)
-                            ? parentType.Handle.FunctionTypeCallingConv
-                            : functionProtoType.CallConv, name);
+                var callingConventionName = GetCallingConvention(typedefDecl, context: null, typedefDecl.TypeForDecl);
 
-                    var returnType = functionProtoType.ReturnType;
-                    var returnTypeName =
-                        GetRemappedTypeName(typedefDecl, context: null, returnType, out var nativeTypeName);
+                var returnType = functionProtoType.ReturnType;
+                var returnTypeName = GetRemappedTypeName(typedefDecl, context: null, returnType, out var nativeTypeName);
 
                 StartUsingOutputBuilder(name);
                 {