Fix build

BrzVlad · BrzVlad · commit ff4ea6c61ed5 · 2025-06-06T18:42:53.000+03:00
Include classes that are part of the Java Marshal API on mono as well

Disable test on mono and nativeaot.
diff --git a/src/coreclr/gc/gc.cpp b/src/coreclr/gc/gc.cpp
@@ -30479,7 +30479,7 @@ void gc_heap::mark_phase (int condemned_gen_number)
         size_t start_index = thread * count_per_heap;
         size_t end_index = (thread == n_heaps - 1) ? num_global_bridge_objs : (thread + 1) * count_per_heap;
 
-        for (int obj_idx = start_index; obj_idx < end_index; obj_idx++)
+        for (size_t obj_idx = start_index; obj_idx < end_index; obj_idx++)
         {
             mark_object_simple (&global_bridge_list[obj_idx] THREAD_NUMBER_ARG);
         }
@@ -39247,7 +39247,7 @@ void gc_heap::background_mark_phase ()
         size_t start_index = thread * count_per_heap;
         size_t end_index = (thread == n_heaps - 1) ? num_global_bridge_objs : (thread + 1) * count_per_heap;
 
-        for (int obj_idx = start_index; obj_idx < end_index; obj_idx++)
+        for (size_t obj_idx = start_index; obj_idx < end_index; obj_idx++)
         {
             mark_object_simple (&global_bridge_list[obj_idx] THREAD_NUMBER_ARG);
         }
diff --git a/src/coreclr/gc/gcbridge.cpp b/src/coreclr/gc/gcbridge.cpp
@@ -399,7 +399,6 @@ static ColorData* alloc_color_data ()
 static void empty_color_buckets ()
 {
     ColorBucket* cur;
-    ColorBucket* tmp;
 
     color_data_count = 0;
 
@@ -627,7 +626,8 @@ static void add_other_colors (ColorData* color, DynPtrArray* other_colors, bool
         }
         dyn_ptr_array_add(&color->other_colors, points_to);
         // Inform targets
-        points_to->incoming_colors = min(points_to->incoming_colors + 1, INCOMING_COLORS_MAX);
+        if (points_to->incoming_colors < INCOMING_COLORS_MAX)
+            points_to->incoming_colors++;
     }
 }
 
@@ -1287,9 +1287,6 @@ static void build_scc_callback_data (BridgeProcessorResult *bp_res)
 
 BridgeProcessorResult ProcessBridgeObjects()
 {
-    int i;
-    uint64_t curtime;
-
     BridgeProcessorResult bp_res = { 0 };
 
     if (!tarjan_scc_algorithm())
diff --git a/src/coreclr/gc/objecthandle.cpp b/src/coreclr/gc/objecthandle.cpp
@@ -1617,7 +1617,7 @@ uint8_t** Ref_ScanBridgeObjects(uint32_t condemned, uint32_t maxgen, ScanContext
                     HHANDLETABLE hTable = walk->pBuckets[i]->pTable[uCPUindex];
                     if (hTable)
                         // or have a local var for bridgeObjectsToPromote/size (instead of NULL) that's passed in as lp2
-                        HndScanHandlesForGC(hTable, GetBridgeObjectsForProcessing, uintptr_t(sc), NULL, &type, 1, condemned, maxgen, HNDGCF_EXTRAINFO | flags);
+                        HndScanHandlesForGC(hTable, GetBridgeObjectsForProcessing, uintptr_t(sc), 0, &type, 1, condemned, maxgen, HNDGCF_EXTRAINFO | flags);
                 }
             }
         walk = walk->pNext;
diff --git a/src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems b/src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems
@@ -993,6 +993,10 @@
     <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\InteropServices\InterfaceTypeAttribute.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\InteropServices\InvalidComObjectException.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\InteropServices\InvalidOleVariantTypeException.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\InteropServices\Java\ComponentCrossReference.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\InteropServices\Java\JavaMarshal.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\InteropServices\Java\MarkCrossReferencesArgs.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\InteropServices\Java\StronglyConnectedComponent.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\InteropServices\LayoutKind.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\InteropServices\LCIDConversionAttribute.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\InteropServices\LibraryImportAttribute.cs" />
@@ -2802,12 +2806,6 @@
     <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\InteropServices\ObjectiveC\ObjectiveCMarshal.PlatformNotSupported.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\InteropServices\ObjectiveC\ObjectiveCTrackedTypeAttribute.cs" />
   </ItemGroup>
-  <ItemGroup Condition="'$(FeatureJavaMarshal)' == 'true'">
-    <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\InteropServices\Java\ComponentCrossReference.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\InteropServices\Java\JavaMarshal.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\InteropServices\Java\MarkCrossReferencesArgs.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\InteropServices\Java\StronglyConnectedComponent.cs" />
-  </ItemGroup>
   <ItemGroup Condition="'$(FeatureCoreCLR)' != 'true' and ('$(TargetsUnix)' == 'true' or '$(TargetsBrowser)' == 'true' or '$(TargetsWasi)' == 'true')">
     <Compile Include="$(MSBuildThisFileDirectory)Microsoft\Win32\SafeHandles\SafeWaitHandle.Unix.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)System\Threading\EventWaitHandle.Unix.cs" />
@@ -2865,4 +2863,4 @@
     <Compile Include="$(MSBuildThisFileDirectory)System\Threading\Wasi\WasiPollWorld.wit.imports.wasi.io.v0_2_0.IPoll.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)System\Threading\Wasi\WasiPollWorld.wit.imports.wasi.io.v0_2_0.PollInterop.cs" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/src/tests/Interop/GCBridge/BridgeTest.csproj b/src/tests/Interop/GCBridge/BridgeTest.csproj
@@ -2,8 +2,9 @@
   <PropertyGroup>
     <!-- Needed for CLRTestTargetUnsupported, CMakeProjectReference, GC.WaitForPendingFinalizers -->
     <RequiresProcessIsolation>true</RequiresProcessIsolation>
-    <!-- Test unsupported outside of OSX -->
-    <CLRTestTargetUnsupported Condition="'$(TargetsUnix)' != 'true'">true</CLRTestTargetUnsupported>
+    <DisableProjectBuild Condition="'$(RuntimeFlavor)' == 'Mono'">true</DisableProjectBuild>
+    <!-- Support for native aot not yet implemented -->
+    <NativeAotIncompatible>true</NativeAotIncompatible>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -30479,7 +30479,7 @@ void gc_heap::mark_phase (int condemned_gen_number)`
`30479`	`30479`	`size_t start_index = thread * count_per_heap;`
`30480`	`30480`	`size_t end_index = (thread == n_heaps - 1) ? num_global_bridge_objs : (thread + 1) * count_per_heap;`
`30481`	`30481`
`30482`		`- for (int obj_idx = start_index; obj_idx < end_index; obj_idx++)`
	`30482`	`+ for (size_t obj_idx = start_index; obj_idx < end_index; obj_idx++)`
`30483`	`30483`	`{`
`30484`	`30484`	`mark_object_simple (&global_bridge_list[obj_idx] THREAD_NUMBER_ARG);`
`30485`	`30485`	`}`
`@@ -39247,7 +39247,7 @@ void gc_heap::background_mark_phase ()`
`39247`	`39247`	`size_t start_index = thread * count_per_heap;`
`39248`	`39248`	`size_t end_index = (thread == n_heaps - 1) ? num_global_bridge_objs : (thread + 1) * count_per_heap;`
`39249`	`39249`
`39250`		`- for (int obj_idx = start_index; obj_idx < end_index; obj_idx++)`
	`39250`	`+ for (size_t obj_idx = start_index; obj_idx < end_index; obj_idx++)`
`39251`	`39251`	`{`
`39252`	`39252`	`mark_object_simple (&global_bridge_list[obj_idx] THREAD_NUMBER_ARG);`
`39253`	`39253`	`}`
Original file line number	Diff line number	Diff line change
`@@ -399,7 +399,6 @@ static ColorData* alloc_color_data ()`
`399`	`399`	`static void empty_color_buckets ()`
`400`	`400`	`{`
`401`	`401`	`ColorBucket* cur;`
`402`		`- ColorBucket* tmp;`
`403`	`402`
`404`	`403`	`color_data_count = 0;`
`405`	`404`
`@@ -627,7 +626,8 @@ static void add_other_colors (ColorData* color, DynPtrArray* other_colors, bool`
`627`	`626`	`}`
`628`	`627`	`dyn_ptr_array_add(&color->other_colors, points_to);`
`629`	`628`	`// Inform targets`
`630`		`- points_to->incoming_colors = min(points_to->incoming_colors + 1, INCOMING_COLORS_MAX);`
	`629`	`+ if (points_to->incoming_colors < INCOMING_COLORS_MAX)`
	`630`	`+ points_to->incoming_colors++;`
`631`	`631`	`}`
`632`	`632`	`}`
`633`	`633`
`@@ -1287,9 +1287,6 @@ static void build_scc_callback_data (BridgeProcessorResult *bp_res)`
`1287`	`1287`
`1288`	`1288`	`BridgeProcessorResult ProcessBridgeObjects()`
`1289`	`1289`	`{`
`1290`		`- int i;`
`1291`		`- uint64_t curtime;`
`1292`		`-`
`1293`	`1290`	`BridgeProcessorResult bp_res = { 0 };`
`1294`	`1291`
`1295`	`1292`	`if (!tarjan_scc_algorithm())`
Original file line number	Diff line number	Diff line change
`@@ -1617,7 +1617,7 @@ uint8_t** Ref_ScanBridgeObjects(uint32_t condemned, uint32_t maxgen, ScanContext`
`1617`	`1617`	`HHANDLETABLE hTable = walk->pBuckets[i]->pTable[uCPUindex];`
`1618`	`1618`	`if (hTable)`
`1619`	`1619`	`// or have a local var for bridgeObjectsToPromote/size (instead of NULL) that's passed in as lp2`
`1620`		`- HndScanHandlesForGC(hTable, GetBridgeObjectsForProcessing, uintptr_t(sc), NULL, &type, 1, condemned, maxgen, HNDGCF_EXTRAINFO \| flags);`
	`1620`	`+ HndScanHandlesForGC(hTable, GetBridgeObjectsForProcessing, uintptr_t(sc), 0, &type, 1, condemned, maxgen, HNDGCF_EXTRAINFO \| flags);`
`1621`	`1621`	`}`
`1622`	`1622`	`}`
`1623`	`1623`	`walk = walk->pNext;`