修复异步上传导致线程卡死的bug的规则支持Unity2020

Author: AlanLiu90

README.md

@@ -71,10 +71,11 @@ req.SetEnableCompatibilityChecks(false); // Non-public, needs to be called by re
 工程中包含了Android、iOS的发布版本的配置。已测试版本：
 * 2022.3.60
 * 2022.3.20
+* 2020.3.48
 
 #### 在设备上测试配置的正确性
 1. 使用[工程](https://discussions.unity.com/t/android-build-project-freezes-after-5-minutes-with-playerloop-in-profiler-at-60-000-ms/784527/337)在设备上复现问题
 2. 集成工具，确定问题不再出现
 
 ## Todo
-* 支持更多的Unity版本（2023、6+）
+* 支持更多的Unity版本（6+）

src/UnityBinaryFileRewriter/Assets/Editor/Tests/FixFreezingInAsyncResourceUploadBlocking.cs

@@ -53,7 +53,11 @@ private static (int, int)[] GetDiffs(string feature, BuildTarget target, Archite
         var rule = Utility.GetCodeRewriteRule(feature, target, architecture, development);
         Assert.IsNotNull(rule);
 
+#if UNITY_2022_1_OR_NEWER
         int repeat = target == BuildTarget.iOS ? 5 : 1;
+#else
+        int repeat = target == BuildTarget.iOS ? 7 : 1;
+#endif
 
         int expectedCount;
         var diffs = new List<(int, int)>();

src/UnityBinaryFileRewriter/Packages/com.modx.enginebinaryfilerewriter/Editor/CodeRewriter/iOS/StaticLibrary.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
+using UnityEngine;
 
 namespace EngineBinaryFileRewriter
 {
@@ -73,7 +74,7 @@ public static StaticLibrary Parse(string file)
         public Item GetItem(string name)
         {
             if (mDuplicateFile.Contains(name))
-                throw new NotImplementedException($"Duplicate object files: {name}");
+                Debug.LogWarning($"Duplicate object files: {name}");
 
             return mItems[name];
         }

src/UnityBinaryFileRewriter/ProjectSettings/EngineBinaryFileRewriterSettings.asset

@@ -313,6 +313,119 @@ MonoBehaviour:
   - Name: Fix Freezing in AsyncResourceUploadBlocking
     Enable: 0
     RuleSets:
+    - UnityVersion: ^2020\.
+      Rules:
+      - BuildTarget: 9
+        Development: 0
+        Architecture: 1
+        Symbols:
+        - DemangledName: CappedSemaphore::Signal(int)
+          Pattern: ^.*\.a:(.*\.o):.*CappedSemaphore.*Signal.*$
+          Instructions:
+          - OriginalInstructionDescription: cmp w10, w9
+            OriginalMachineCode: 5F01096B
+            Index: -1
+            NewInstructionDescription: nop
+            NewMachineCode: 1F2003D5
+          - OriginalInstructionDescription: b.eq
+            OriginalMachineCode: 40020054
+            Index: -1
+            NewInstructionDescription: nop
+            NewMachineCode: 1F2003D5
+          - OriginalInstructionDescription: cmp w10, w11
+            OriginalMachineCode: 5F010B6B
+            Index: -1
+            NewInstructionDescription: nop
+            NewMachineCode: 1F2003D5
+          - OriginalInstructionDescription: b.ne
+            OriginalMachineCode: 21FEFF54
+            Index: -1
+            NewInstructionDescription: nop
+            NewMachineCode: 1F2003D5
+          - OriginalInstructionDescription: mov w0, #0
+            OriginalMachineCode: 00008052
+            Index: -1
+            NewInstructionDescription: nop
+            NewMachineCode: 1F2003D5
+          - OriginalInstructionDescription: ret
+            OriginalMachineCode: C0035FD6
+            Index: 0
+            NewInstructionDescription: b
+            NewMachineCode: EAFFFF17
+      - BuildTarget: 13
+        Development: 0
+        Architecture: 1
+        Symbols:
+        - DemangledName: CappedSemaphore::Signal(int)
+          Pattern: ^.*CappedSemaphore.*Signal.*$
+          Instructions:
+          - OriginalInstructionDescription: cmp w11, w9
+            OriginalMachineCode: 7F01096B
+            Index: -1
+            NewInstructionDescription: nop
+            NewMachineCode: 1F2003D5
+          - OriginalInstructionDescription: b.eq
+            OriginalMachineCode: 60020054
+            Index: -1
+            NewInstructionDescription: nop
+            NewMachineCode: 1F2003D5
+          - OriginalInstructionDescription: cmp w11, w12
+            OriginalMachineCode: 7F010C6B
+            Index: -1
+            NewInstructionDescription: nop
+            NewMachineCode: 1F2003D5
+          - OriginalInstructionDescription: b.ne
+            OriginalMachineCode: 21FEFF54
+            Index: -1
+            NewInstructionDescription: nop
+            NewMachineCode: 1F2003D5
+          - OriginalInstructionDescription: mov w0, wzr
+            OriginalMachineCode: E0031F2A
+            Index: -1
+            NewInstructionDescription: nop
+            NewMachineCode: 1F2003D5
+          - OriginalInstructionDescription: ret
+            OriginalMachineCode: C0035FD6
+            Index: 0
+            NewInstructionDescription: b
+            NewMachineCode: E9FFFF17
+      - BuildTarget: 13
+        Development: 0
+        Architecture: 0
+        Symbols:
+        - DemangledName: CappedSemaphore::Signal(int)
+          Pattern: ^.*CappedSemaphore.*Signal.*$
+          Instructions:
+          - OriginalInstructionDescription: cmp r3, r2
+            OriginalMachineCode: 9342
+            Index: -1
+            NewInstructionDescription: nop
+            NewMachineCode: 00BF
+          - OriginalInstructionDescription: beq.n
+            OriginalMachineCode: 18D0
+            Index: -1
+            NewInstructionDescription: nop
+            NewMachineCode: 00BF
+          - OriginalInstructionDescription: cmp r3, r1
+            OriginalMachineCode: 8B42
+            Index: -1
+            NewInstructionDescription: nop
+            NewMachineCode: 00BF
+          - OriginalInstructionDescription: bne.n
+            OriginalMachineCode: E9D1
+            Index: -1
+            NewInstructionDescription: nop
+            NewMachineCode: 00BF
+          - OriginalInstructionDescription: movs r0, #0
+            OriginalMachineCode: 0020
+            Index: -1
+            NewInstructionDescription: nop
+            NewMachineCode: 00BF
+          - OriginalInstructionDescription: pop {r4, pc}
+            OriginalMachineCode: 10BD
+            Index: 0
+            NewInstructionDescription: b
+            NewMachineCode: E0E7
     - UnityVersion: ^2022\.
       Rules:
       - BuildTarget: 9