[revert] Revert "[new] support preserve UnityEngine core types when GenerateLinkXml"

This reverts commit 82163d2.

Author: pirunxi

Editor/Commands/LinkGeneratorCommand.cs

@@ -28,7 +28,7 @@ public static void GenerateLinkXml(BuildTarget target)
             List<string> hotfixAssemblies = SettingsUtil.HotUpdateAssemblyNamesExcludePreserved;
 
             var analyzer = new Analyzer(MetaUtil.CreateHotUpdateAndAOTAssemblyResolver(target, hotfixAssemblies));
-            var refTypes = analyzer.CollectRefs(hotfixAssemblies, !ls.dontPreserveUnityEngineCoreTypesInLinkXml);
+            var refTypes = analyzer.CollectRefs(hotfixAssemblies);
 
             Debug.Log($"[LinkGeneratorCommand] hotfix assembly count:{hotfixAssemblies.Count}, ref type count:{refTypes.Count} output:{Application.dataPath}/{ls.outputLinkFile}");
             var linkXmlWriter = new LinkXmlWriter();

Editor/Link/Analyzer.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Text;
@@ -22,48 +21,12 @@ public Analyzer(IAssemblyResolver resolver)
             _resolver = resolver;
         }
 
-
-        public HashSet<ITypeDefOrRef> CollectRefs(List<string> rootAssemblies, bool includeUnityEngineCoreTypes)
-        {
-            var typeRefs = new HashSet<ITypeDefOrRef>(TypeEqualityComparer.Instance);
-            CollectHotUpdateRefs(rootAssemblies, typeRefs);
-
-            if (includeUnityEngineCoreTypes)
-            {
-                CollectUnityEngineCoreTypes(typeRefs);
-            }
-            return typeRefs;
-        }
-
-        private void CollectUnityEngineCoreTypes(HashSet<ITypeDefOrRef> preservedTypes)
-        {
-            Debug.Log("CollectUnityEngineCoreTypes");
-            string unityEngineDllPath = $"{EditorApplication.applicationContentsPath}/Managed/UnityEngine";
-
-            var assCollector = new AssemblyCache(_resolver);
-            foreach (string unityEngineDll in Directory.GetFiles(unityEngineDllPath, "UnityEngine.*.dll", SearchOption.AllDirectories))
-            {
-                // because of bug of unity 2019.4.x, preserving types in this dll will cause crash in android build
-                if (unityEngineDll.EndsWith("UnityEngine.PerformanceReportingModule.dll", StringComparison.InvariantCulture))
-                {
-                    continue;
-                }
-                ModuleDefMD mod = assCollector.LoadModuleFromFileWithoutCache(unityEngineDll);
-                foreach (TypeDef type in mod.GetTypes())
-                {
-                    if (type.Methods.Any(m => m.IsInternalCall || m.IsPinvokeImpl))
-                    {
-                        preservedTypes.Add(type);
-                    }
-                }
-            }
-        }
-
-        public void CollectHotUpdateRefs(List<string> rootAssemblies, HashSet<ITypeDefOrRef> preservedTypes)
+        public HashSet<TypeRef> CollectRefs(List<string> rootAssemblies)
         {
             var assCollector = new AssemblyCache(_resolver);
             var rootAssemblyNames = new HashSet<string>(rootAssemblies);
 
+            var typeRefs = new HashSet<TypeRef>(TypeEqualityComparer.Instance);
             foreach (var rootAss in rootAssemblies)
             {
                 var dnAss = assCollector.LoadModule(rootAss, false);
@@ -76,10 +39,11 @@ public void CollectHotUpdateRefs(List<string> rootAssemblies, HashSet<ITypeDefOr
                     }
                     if (!rootAssemblyNames.Contains(type.DefinitionAssembly.Name.ToString()))
                     {
-                        preservedTypes.Add(type);
+                        typeRefs.Add(type);
                     }
                 }
             }
+            return typeRefs;
         }
     }
 }

Editor/Link/LinkXmlWriter.cs

@@ -11,7 +11,7 @@ namespace HybridCLR.Editor.Link
 {
     internal class LinkXmlWriter
     {
-        public void Write(string outputLinkXmlFile, HashSet<ITypeDefOrRef> refTypes)
+        public void Write(string outputLinkXmlFile, HashSet<TypeRef> refTypes)
         {
             string parentDir = Directory.GetParent(outputLinkXmlFile).FullName;
             Directory.CreateDirectory(parentDir);

Editor/Meta/AssemblyCacheBase.cs

@@ -71,13 +71,6 @@ public ModuleDefMD LoadModule(string moduleName, bool loadReferenceAssemblies =
             return mod;
         }
 
-        public ModuleDefMD LoadModuleFromFileWithoutCache(string dllPath)
-        {
-            ModuleDefMD mod = ModuleDefMD.Load(File.ReadAllBytes(dllPath), _modCtx);
-            mod.EnableTypeDefFindCache = true;
-            return mod;
-        }
-
         private void LoadNetStandard()
         {
             string netstandardDllPath = _assemblyPathResolver.ResolveAssembly("netstandard", false);

Editor/Settings/HybridCLRSettingProvider.cs

@@ -21,7 +21,6 @@ public class HybridCLRSettingsProvider : SettingsProvider
         private SerializedProperty _externalHotUpdateAssembliyDirs;
         private SerializedProperty _strippedAOTDllOutputRootDir;
         private SerializedProperty _patchAOTAssemblies;
-        private SerializedProperty _dontPreserveUnityEngineCoreTypesInLinkXml;
         private SerializedProperty _outputLinkFile;
         private SerializedProperty _outputAOTGenericReferenceFile;
         private SerializedProperty _maxGenericReferenceIteration;
@@ -52,7 +51,6 @@ private void InitGUI()
             _externalHotUpdateAssembliyDirs = _serializedObject.FindProperty("externalHotUpdateAssembliyDirs");
             _strippedAOTDllOutputRootDir = _serializedObject.FindProperty("strippedAOTDllOutputRootDir");
             _patchAOTAssemblies = _serializedObject.FindProperty("patchAOTAssemblies");
-            _dontPreserveUnityEngineCoreTypesInLinkXml = _serializedObject.FindProperty("dontPreserveUnityEngineCoreTypesInLinkXml");
             _outputLinkFile = _serializedObject.FindProperty("outputLinkFile");
             _outputAOTGenericReferenceFile = _serializedObject.FindProperty("outputAOTGenericReferenceFile");
             _maxGenericReferenceIteration = _serializedObject.FindProperty("maxGenericReferenceIteration");
@@ -142,7 +140,6 @@ public override void OnGUI(string searchContext)
                 EditorGUILayout.PropertyField(_externalHotUpdateAssembliyDirs);
                 EditorGUILayout.PropertyField(_strippedAOTDllOutputRootDir);
                 EditorGUILayout.PropertyField(_patchAOTAssemblies);
-                EditorGUILayout.PropertyField(_dontPreserveUnityEngineCoreTypesInLinkXml);
                 EditorGUILayout.PropertyField(_outputLinkFile);
                 EditorGUILayout.PropertyField(_outputAOTGenericReferenceFile);
                 EditorGUILayout.PropertyField(_maxGenericReferenceIteration);

Editor/Settings/HybridCLRSettings.cs

@@ -39,9 +39,6 @@ public class HybridCLRSettings : ScriptableSingleton<HybridCLRSettings>
         [Tooltip("supplementary metadata assembly names(without .dll suffix)")]
         public string[] patchAOTAssemblies;
 
-        [Tooltip("don't preserve UnityEngine core types in link.xml")]
-        public bool dontPreserveUnityEngineCoreTypesInLinkXml;
-
         [Tooltip("output file of automatic generated link.xml by scanning hot update assemblies")]
         public string outputLinkFile = "HybridCLRGenerate/link.xml";