[SwiftBindings] Added post processing step to compute struct frozenness #2912
Conversation
jkurdek
changed the title
| ProcessStructFields(structDecl); | ||
|
|
||
| // TODO: Remove loading dylib | ||
| IntPtr metadataPtr = DynamicLibraryLoader.invoke(_dylibPath, $"{structDecl.MangledName}Ma"); |
There was a problem hiding this comment.
As we discussed, we shouldn't do this.
There was a problem hiding this comment.
I agree. This will be the next step. Here is a tracking issue #2914. Should also cover the comments about blittability and size, stride, alignment.
| /// <returns>True if blittable, false otherwise.</returns> | ||
| private unsafe bool EvaluateBlittability(SwiftTypeInfo swiftTypeInfo) | ||
| { | ||
| // TODO: Replace with a manual approach. |
| { | ||
| _typeDatabase.Registrar.RegisterType(namedTypeSpec.Module, | ||
| namedTypeSpec.NameWithoutModule, | ||
| new TypeRecord |
There was a problem hiding this comment.
This is a separate issue, but we will need the size, stride, and alignment as well.
| /// <param name="structDecl">The struct declaration.</param> | ||
| private void ProcessStruct(NamedTypeSpec namedTypeSpec, StructDecl structDecl) | ||
| { | ||
| // Ensure all fields are processed or known in the database. |
There was a problem hiding this comment.
All nominal types can have inner types. Because fields in the structure may depend on them, we should process any inner types before we process fields.
There was a problem hiding this comment.
They are processed during ABI parsing so we have full information. Added test for that and patched some logic.
| namedTypeSpec.NameWithoutModule, | ||
| new TypeRecord | ||
| { | ||
| Namespace = namedTypeSpec.Module, |
There was a problem hiding this comment.
I'd like to see a separate type for holding a type name. Something like:
public class /* or record or struct */ TypeName {
public string Namespace { get; init; }
public string Name { get; init; }
public string FullName { get; } => Namespace + "." + Name;
// if not a record, make ToString, Equals, etc
}
This will make it easier to set up import statements in Swift and using statements in C#.
There was a problem hiding this comment.
I have a change ready, however it will affect multiple areas so Ill bring it in another PR
| @@ -146,7 +146,7 @@ public ModuleDecl GetModuleDecl() | |||
|
|
|||
| moduleDecl.Fields = decls.OfType<FieldDecl>().ToList(); | |||
| moduleDecl.Methods = decls.OfType<MethodDecl>().ToList(); | |||
| moduleDecl.Declarations = decls.Where(d => !(d is MethodDecl) && !(d is FieldDecl)).ToList(); | |||
| moduleDecl.Types = decls.OfType<TypeDecl>().ToDictionary(d => new NamedTypeSpec(d.FullyQualifiedName), d => d); | |||
There was a problem hiding this comment.
One thing that we will run into right here is that the *Decl types are already C# and that type may not be the same as the Swift from which it came. For example, if we get a Swift type that is unpronounceable in C# (eg, contains emoji) then we've just created an incorrect NamedTypesSpec.
| typeRecord.IsProcessed = true; | ||
|
|
||
| if (node.Children != null && decl != null) | ||
| if (decl != null) |
There was a problem hiding this comment.
favor is not null over != null to avoid possible issues that arise from operator implementations.
Implements #2886
Initialises a post ABI parsing step which calculates information about types and populates type database.
Follow-ups: