Avoid passing R2RReader to R2RMethod and RuntimeFunction constructors

1 files changed, 7 insertions, 4 deletions

diff --git a/src/tools/r2rdump/R2RReader.cs b/src/tools/r2rdump/R2RReader.cs
index 5fbe10dc4c..ce0ca699a3 100644
--- a/src/tools/r2rdump/R2RReader.cs
+++ b/src/tools/r2rdump/R2RReader.cs
@@ -254,19 +254,22 @@ namespace R2RDump
             return rva - containingSection.VirtualAddress + containingSection.PointerToRawData;
         }
 
-        public string GetTypeDefFullName(TypeDefinitionHandle handle)
+        /// <summary>
+        /// Get the full name of a type, including parent classes and namespace
+        /// </summary>
+        public static string GetTypeDefFullName(MetadataReader mdReader, TypeDefinitionHandle handle)
         {
             TypeDefinition typeDef;
             string typeStr = "";
             do
             {
-                typeDef = _mdReader.GetTypeDefinition(handle);
-                typeStr = "." + _mdReader.GetString(typeDef.Name) + typeStr;
+                typeDef = mdReader.GetTypeDefinition(handle);
+                typeStr = "." + mdReader.GetString(typeDef.Name) + typeStr;
                 handle = typeDef.GetDeclaringType();
             }
             while (!handle.IsNil);
 
-            return _mdReader.GetString(typeDef.Namespace) + typeStr;
+            return mdReader.GetString(typeDef.Namespace) + typeStr;
         }
 
         /// <summary>