pimhwang
/
CppSharp
mirror of https://github.com/mono/CppSharp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Ensured all fields in class layouts are checked for specialisations. 

Signed-off-by: Dimitar Dobrev <dpldobrev@protonmail.com>
pull/890/head
Dimitar Dobrev 8 years ago
parent
8bb567c49e
commit
ff1abf360f
4 changed files with 79 additions and 71 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 21
      src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/Std.cs
  2. 21
      src/CppParser/Bindings/CSharp/x86_64-pc-win32-msvc/Std.cs
  3. 89
      src/Generator/AST/Utils.cs
  4. 19
      src/Generator/Passes/TrimSpecializationsPass.cs

21
src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/Std.cs
Unescape View File

@ -162,27 +162,6 @@ namespace Std @@ -162,27 +162,6 @@ namespace Std
internal global::Std.StringVal.__Internal _Myval2;
}
[StructLayout(LayoutKind.Explicit, Size = 24)]
public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S__Wrap_alloc____N_std_S_allocator__W___N_std_S__String_val____N_std_S__Simple_types__W_Vb1
{
[FieldOffset(0)]
internal global::Std.StringVal.__Internal _Myval2;
}
[StructLayout(LayoutKind.Explicit, Size = 24)]
public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S__Wrap_alloc____N_std_S_allocator__q___N_std_S__String_val____N_std_S__Simple_types__q_Vb1
{
[FieldOffset(0)]
internal global::Std.StringVal.__Internal _Myval2;
}
[StructLayout(LayoutKind.Explicit, Size = 24)]
public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S__Wrap_alloc____N_std_S_allocator__w___N_std_S__String_val____N_std_S__Simple_types__w_Vb1
{
[FieldOffset(0)]
internal global::Std.StringVal.__Internal _Myval2;
}
[StructLayout(LayoutKind.Explicit, Size = 12)]
public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S__Wrap_alloc____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_PreprocessedEntity___N_std_S__Vector_val____N_std_S__Simple_types__S2__Vb1
{

21
src/CppParser/Bindings/CSharp/x86_64-pc-win32-msvc/Std.cs
Unescape View File

@ -162,27 +162,6 @@ namespace Std @@ -162,27 +162,6 @@ namespace Std
internal global::Std.StringVal.__Internal _Myval2;
}
[StructLayout(LayoutKind.Explicit, Size = 32)]
public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S__Wrap_alloc____N_std_S_allocator__W___N_std_S__String_val____N_std_S__Simple_types__W_Vb1
{
[FieldOffset(0)]
internal global::Std.StringVal.__Internal _Myval2;
}
[StructLayout(LayoutKind.Explicit, Size = 32)]
public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S__Wrap_alloc____N_std_S_allocator__q___N_std_S__String_val____N_std_S__Simple_types__q_Vb1
{
[FieldOffset(0)]
internal global::Std.StringVal.__Internal _Myval2;
}
[StructLayout(LayoutKind.Explicit, Size = 32)]
public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S__Wrap_alloc____N_std_S_allocator__w___N_std_S__String_val____N_std_S__Simple_types__w_Vb1
{
[FieldOffset(0)]
internal global::Std.StringVal.__Internal _Myval2;
}
[StructLayout(LayoutKind.Explicit, Size = 24)]
public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S__Wrap_alloc____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_PreprocessedEntity___N_std_S__Vector_val____N_std_S__Simple_types__S2__Vb1
{

89
src/Generator/AST/Utils.cs
Unescape View File

@ -90,38 +90,19 @@ namespace CppSharp.AST @@ -90,38 +90,19 @@ namespace CppSharp.AST
{
type = type.Desugar();
type = (type.GetFinalPointee() ?? type).Desugar();
ClassTemplateSpecialization specialization;
type.TryGetDeclaration(out specialization);
ClassTemplateSpecialization specialization = GetParentSpecialization(type);
if (specialization == null)
return;
TypeMap typeMap;
typeMaps.FindTypeMap(specialization, out typeMap);
if ((!internalOnly && (((specialization.Ignore ||
specialization.TemplatedDecl.TemplatedClass.Ignore) && typeMap == null) ||
specialization.Arguments.Any(a => UnsupportedTemplateArgument(
specialization, a, typeMaps)))) ||
specialization.IsIncomplete ||
(!internalOnly && specialization.TemplatedDecl.TemplatedClass.IsIncomplete) ||
specialization is ClassTemplatePartialSpecialization ||
container.Namespace == specialization)
if (IsSpecializationNeeded(container, typeMaps, internalOnly, specialization))
return;
while (container.Namespace != null)
if (!internalOnly)
{
if (container.Namespace == specialization)
if (IsSpecializationSelfContained(specialization, container))
return;
container = container.Namespace;
}
if (!internalOnly && typeMaps.FindTypeMap(specialization, out typeMap))
{
var typePrinterContext = new TypePrinterContext { Type = type };
var mappedTo = typeMap.CSharpSignatureType(typePrinterContext);
mappedTo = mappedTo.Desugar();
mappedTo = (mappedTo.GetFinalPointee() ?? mappedTo);
if (mappedTo.IsPrimitiveType() || mappedTo.IsPointerToPrimitiveType() || mappedTo.IsEnum())
if (IsMappedToPrimitive(typeMaps, type, specialization))
return;
}
@ -169,6 +150,66 @@ namespace CppSharp.AST @@ -169,6 +150,66 @@ namespace CppSharp.AST
a.Type.Type.Visit(typeIgnoreChecker);
return typeIgnoreChecker.IsIgnored;
}
private static bool IsSpecializationNeeded(Declaration container,
ITypeMapDatabase typeMaps, bool internalOnly,
ClassTemplateSpecialization specialization)
{
TypeMap typeMap;
typeMaps.FindTypeMap(specialization, out typeMap);
return (!internalOnly && (((specialization.Ignore ||
specialization.TemplatedDecl.TemplatedClass.Ignore) && typeMap == null) ||
specialization.Arguments.Any(a => UnsupportedTemplateArgument(
specialization, a, typeMaps)) ||
container.Namespace == specialization)) ||
specialization.IsIncomplete ||
(!internalOnly && specialization.TemplatedDecl.TemplatedClass.IsIncomplete) ||
specialization is ClassTemplatePartialSpecialization;
}
private static ClassTemplateSpecialization GetParentSpecialization(Type type)
{
Declaration declaration;
if (type.TryGetDeclaration(out declaration))
{
ClassTemplateSpecialization specialization = null;
do
{
specialization = declaration as ClassTemplateSpecialization;
declaration = declaration.Namespace;
} while (declaration != null && specialization == null);
return specialization;
}
return null;
}
private static bool IsSpecializationSelfContained(
ClassTemplateSpecialization specialization, Declaration container)
{
while (container.Namespace != null)
{
if (container.Namespace == specialization)
return true;
container = container.Namespace;
}
return false;
}
private static bool IsMappedToPrimitive(ITypeMapDatabase typeMaps,
Type type, ClassTemplateSpecialization specialization)
{
TypeMap typeMap;
if (!typeMaps.FindTypeMap(specialization, out typeMap))
return false;
var typePrinterContext = new TypePrinterContext { Type = type };
var mappedTo = typeMap.CSharpSignatureType(typePrinterContext);
mappedTo = mappedTo.Desugar();
mappedTo = (mappedTo.GetFinalPointee() ?? mappedTo).Desugar();
return (mappedTo.IsPrimitiveType() ||
mappedTo.IsPointerToPrimitiveType() || mappedTo.IsEnum());
}
}
public static class Operators

19
src/Generator/Passes/TrimSpecializationsPass.cs
Unescape View File

@ -168,17 +168,26 @@ namespace CppSharp.Passes @@ -168,17 +168,26 @@ namespace CppSharp.Passes
private void CheckForInternalSpecialization(Declaration container, AST.Type type)
{
ASTUtils.CheckTypeForSpecialization(type, container,
s =>
specialization =>
{
if (!specializations.Contains(s))
if (!specializations.Contains(specialization))
{
internalSpecializations.Add(s);
foreach (var f in s.Fields)
f.Visit(this);
internalSpecializations.Add(specialization);
CheckLayoutFields(specialization);
}
}, Context.TypeMaps, true);
}
private void CheckLayoutFields(Class @class)
{
foreach (var field in @class.Fields)
field.Visit(this);
foreach (var @base in from @base in @class.Bases
where @base.IsClass
select @base.Class)
CheckLayoutFields(@base);
}
private HashSet<ClassTemplateSpecialization> specializations = new HashSet<ClassTemplateSpecialization>();
private HashSet<ClassTemplateSpecialization> internalSpecializations = new HashSet<ClassTemplateSpecialization>();
private HashSet<Class> templates = new HashSet<Class>();

Write Preview
Loading…
Cancel
Save