Skip to content

Remove AttributeAttribute::Name #455

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
SamboyCoding merged 1 commit into from
May 15, 2025
Merged

Remove AttributeAttribute::Name #455

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
9 changes: 2 additions & 7 deletions Cpp2IL.Core/ProcessingLayers/AttributeInjectorProcessingLayer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,18 +155,14 @@ private static void InjectAttributeAttribute(ApplicationAnalysisContext appConte
var attributeAttributes = appContext.InjectTypeIntoAllAssemblies("Cpp2ILInjected", "AttributeAttribute", appContext.SystemTypes.SystemAttributeType);

var attributeTypeFields = attributeAttributes.InjectFieldToAllAssemblies("Type", appContext.SystemTypes.SystemTypeType, FieldAttributes.Public);
var attributeNameFields = attributeAttributes.InjectFieldToAllAssemblies("Name", appContext.SystemTypes.SystemStringType, FieldAttributes.Public);
var attributeRvaFields = attributeAttributes.InjectFieldToAllAssemblies("RVA", appContext.SystemTypes.SystemStringType, FieldAttributes.Public);
var attributeOffsetFields = attributeAttributes.InjectFieldToAllAssemblies("Offset", appContext.SystemTypes.SystemStringType, FieldAttributes.Public);

var attributeConstructors = attributeAttributes.InjectConstructor(false);

foreach (var assemblyAnalysisContext in appContext.Assemblies)
{
// Todo: Remove nameField because typeField makes it redundant. It only remains for backwards compatibility with Il2CppInterop.
// https://github.com/BepInEx/Il2CppInterop/blob/9d4599dc78d69ede49a2ee96a1ccf41eec02db5b/Il2CppInterop.Generator/Passes/Pass70GenerateProperties.cs#L46
var typeField = attributeTypeFields[assemblyAnalysisContext];
var nameField = attributeNameFields[assemblyAnalysisContext];
var rvaField = attributeRvaFields[assemblyAnalysisContext];
var offsetField = attributeOffsetFields[assemblyAnalysisContext];

Expand All @@ -180,11 +176,11 @@ private static void InjectAttributeAttribute(ApplicationAnalysisContext appConte
.Append(ctx))
.Append(assemblyAnalysisContext);

MiscUtils.ExecuteParallel(toProcess, c => ProcessCustomAttributesForContext(c, typeField, nameField, rvaField, offsetField, attributeConstructor));
MiscUtils.ExecuteParallel(toProcess, c => ProcessCustomAttributesForContext(c, typeField, rvaField, offsetField, attributeConstructor));
}
}

private static void ProcessCustomAttributesForContext(HasCustomAttributes context, FieldAnalysisContext typeField, FieldAnalysisContext nameField, FieldAnalysisContext rvaField, FieldAnalysisContext offsetField, MethodAnalysisContext ctor)
private static void ProcessCustomAttributesForContext(HasCustomAttributes context, FieldAnalysisContext typeField, FieldAnalysisContext rvaField, FieldAnalysisContext offsetField, MethodAnalysisContext ctor)
{
if (_useEzDiffMode)
context.CustomAttributes = [];
Expand Down Expand Up @@ -217,7 +213,6 @@ private static void ProcessCustomAttributesForContext(HasCustomAttributes contex
replacementAttribute.Fields.Add(new(typeField, new CustomAttributeTypeParameter(attribute.Constructor.DeclaringType, replacementAttribute, CustomAttributeParameterKind.Field, 0)));
replacementAttribute.Fields.Add(new(rvaField, new CustomAttributePrimitiveParameter($"0x{generatorRva:X}", replacementAttribute, CustomAttributeParameterKind.Field, 1)));
replacementAttribute.Fields.Add(new(offsetField, new CustomAttributePrimitiveParameter($"0x{offsetInBinary:X}", replacementAttribute, CustomAttributeParameterKind.Field, 2)));
replacementAttribute.Fields.Add(new(nameField, new CustomAttributePrimitiveParameter(attribute.Constructor.DeclaringType!.Name, replacementAttribute, CustomAttributeParameterKind.Field, 3)));

//Replace the original attribute with the replacement attribute
context.CustomAttributes[index] = replacementAttribute;
Expand Down
Loading