Skip to content

Fix in minimize processing Member refs and fields #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 11, 2020
Merged

Fix in minimize processing Member refs and fields #48

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 43 additions & 18 deletions source/MetadataProcessor.Core/nanoAssemblyBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,42 +281,47 @@ private HashSet<MetadataToken> BuildDependencyList(MetadataToken token)
var mr = _tablesContext.MethodReferencesTable.Items.FirstOrDefault(i => i.MetadataToken == token);

if (mr != null &&
mr.DeclaringType != null)
{
set.Add(mr.DeclaringType.MetadataToken);
}

if(mr != null &&
mr.ReturnType != null)
{
if (mr.ReturnType.IsArray)
if (mr.MethodReturnType.ReturnType.IsValueType &&
!mr.MethodReturnType.ReturnType.IsPrimitive)
{
set.Add(mr.MethodReturnType.ReturnType.MetadataToken);
}
else if (mr.ReturnType.IsArray)
{
if (mr.ReturnType.DeclaringType != null)
{
set.Add(mr.ReturnType.DeclaringType.MetadataToken);
}
}
else
else if (mr.ReturnType.FullName != "System.Void" &&
mr.ReturnType.FullName != "System.String" &&
!mr.MethodReturnType.ReturnType.IsPrimitive)
{
if (mr.ReturnType.FullName != "System.Void" &&
mr.ReturnType.FullName != "System.String")
{
set.Add(mr.ReturnType.MetadataToken);
}
set.Add(mr.ReturnType.MetadataToken);
}
else if(mr.DeclaringType != null)
{
set.Add(mr.DeclaringType.MetadataToken);
}
}

// parameters
foreach (var p in mr.Parameters)
{
if (p.ParameterType.IsValueType &&
!p.ParameterType.IsPrimitive)
if (p.ParameterType.DeclaringType != null)
{
set.Add(p.ParameterType.DeclaringType.MetadataToken);
}
else if (p.ParameterType.MetadataType == MetadataType.Class)
{
set.Add(p.ParameterType.MetadataToken);
}
else if (p.ParameterType.DeclaringType != null)
else if (p.ParameterType.IsValueType &&
!p.ParameterType.IsPrimitive)
{
set.Add(p.ParameterType.DeclaringType.MetadataToken);
set.Add(p.ParameterType.MetadataToken);
}
}

Expand Down Expand Up @@ -392,7 +397,13 @@ private HashSet<MetadataToken> BuildDependencyList(MetadataToken token)
{
set.Add(fd.MetadataToken);
}
else if (fd.FieldType.IsValueType)
else if (fd.FieldType.IsValueType &&
!fd.FieldType.IsPrimitive)
{
set.Add(fd.FieldType.MetadataToken);
}
else if (!fd.FieldType.IsValueType &&
!fd.FieldType.IsPrimitive)
{
set.Add(fd.FieldType.MetadataToken);
}
Expand Down Expand Up @@ -427,6 +438,15 @@ private HashSet<MetadataToken> BuildDependencyList(MetadataToken token)
{
set.Add(p.ParameterType.DeclaringType.MetadataToken);
}
else if (p.ParameterType.MetadataType == MetadataType.Class)
{
set.Add(p.ParameterType.MetadataToken);
}
else if (p.ParameterType.IsValueType &&
!p.ParameterType.IsPrimitive)
{
set.Add(p.ParameterType.MetadataToken);
}
}

if (md.HasBody)
Expand All @@ -442,6 +462,11 @@ private HashSet<MetadataToken> BuildDependencyList(MetadataToken token)
{
set.Add(v.VariableType.MetadataToken);
}
else if (v.VariableType.IsValueType &&
!v.VariableType.IsPrimitive)
{
set.Add(v.VariableType.MetadataToken);
}
}

// op codes
Expand Down