ImplementedInterfaces should store a reference to their DeclaringType.

jpobst · Jul 6, 2023 · f5c76be · f5c76be
1 parent 7962980
commit f5c76be
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/Javil/Adapters/BytecodeReader.cs b/src/Javil/Adapters/BytecodeReader.cs
@@ -87,9 +87,9 @@ private static TypeDefinition CreateType (string @namespace, string name, TypeRe
         // Implemented interfaces
         for (var i = 0; i < classFile.Interfaces.Count; i++) {
             if (signature?.SuperinterfaceSignatures.Any () == true)
-                td.ImplementedInterfaces.Add (new ImplementedInterface (TypeReference.CreateFromSignature (signature.SuperinterfaceSignatures[i], container)));
+                td.ImplementedInterfaces.Add (new ImplementedInterface (td, TypeReference.CreateFromSignature (signature.SuperinterfaceSignatures[i], container)));
             else
-                td.ImplementedInterfaces.Add (new ImplementedInterface (TypeReference.CreateFromFullName (classFile.Interfaces[i].Name.Value, container)));
+                td.ImplementedInterfaces.Add (new ImplementedInterface (td, TypeReference.CreateFromFullName (classFile.Interfaces[i].Name.Value, container)));
         }
 
         // Fields

diff --git a/src/Javil/ImplementedInterface.cs b/src/Javil/ImplementedInterface.cs
@@ -1,11 +1,16 @@
-namespace Javil;
+using System.Runtime.CompilerServices;
+using Javil.Extensions;
+
+namespace Javil;
 
 public class ImplementedInterface
 {
     public TypeReference InterfaceType { get; }
+    public TypeDefinition DeclaringType { get; }
 
-    public ImplementedInterface (TypeReference interfaceType)
+    public ImplementedInterface (TypeDefinition declaringType, TypeReference interfaceType)
     {
+        DeclaringType = declaringType;
         InterfaceType = interfaceType;
     }
 }