[mono] Fix sorting custom attributes in ILStrip

The change in dotnet#87923 was subtly wrong, the problem is that RID on a Cecil metadata token masks out the token type. We actually have to reconstruct the custom attribute coded-index.
akoeplinger · Jul 5, 2023 · aae04d0 · aae04d0
1 parent 76a8f4f
commit aae04d0
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/tasks/MonoTargetsTasks/ILStrip/AssemblyStripper/AssemblyStripper.cs b/src/tasks/MonoTargetsTasks/ILStrip/AssemblyStripper/AssemblyStripper.cs
@@ -18,7 +18,9 @@ public int Compare(object left, object right)
         {
             CustomAttributeRow row_left = (CustomAttributeRow)left;
             CustomAttributeRow row_right = (CustomAttributeRow)right;
-            return row_left.Parent.RID.CompareTo(row_right.Parent.RID);
+            var leftParentCodedIdx = Utilities.CompressMetadataToken(CodedIndex.HasCustomAttribute, row_left.Parent);
+            var rightParentCodedIdx = Utilities.CompressMetadataToken(CodedIndex.HasCustomAttribute, row_right.Parent);
+            return leftParentCodedIdx.CompareTo(rightParentCodedIdx);
         }
     }