Skip to content

Commit d71dd07

Browse files
carlossanlopcarlossanlop
committed
Merge branch 'release70' of github.com:carlossanlop/runtime into release70
2 parents cb70e92 + 694c2a0 commit d71dd07

File tree

93 files changed

+638
-218
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

93 files changed

+638
-218
lines changed

‎.github/workflows/backport.yml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,4 +80,9 @@ jobs:
8080
8181
## Risk
8282
83-
IMPORTANT: If this change touches code that ships in a NuGet package, please make certain that you have added any necessary [package authoring](https://github.com/dotnet/runtime/blob/main/docs/project/library-servicing.md) and gotten it explicitly reviewed.
83+
**IMPORTANT**: If this backport is for a servicing release, please verify that:
84+
85+
- The PR target branch is `release/X.0-staging`, not `release/X.0`.
86+
87+
- If the change touches code that ships in a NuGet package, you have added the necessary [package authoring](https://github.com/dotnet/runtime/blob/release/7.0/docs/project/library-servicing.md) and gotten it explicitly reviewed.
88+

‎docs/project/library-servicing.md‎

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,18 @@
11
# How to service a library
22

3-
This document provides the steps necessary after modifying a library in a servicing branch (where "servicing branch" refers to any branch whose name begins with `release/`).
3+
This document provides the steps necessary after modifying a library in a servicing branch.
4+
5+
Servicing branches represent shipped versions of .NET, and their name is in the format `release/X.0-staging`. Examples:
6+
7+
- `release/7.0-staging`
8+
- `release/6.0-staging`
49

510
## Check if a package is generated
611

712
If a library is packable (check for the `<IsPackable>true</IsPackable>` property) you'll need to set `<GeneratePackageOnBuild>true</GeneratePackageOnBuild>` in the source project. That is necessary as packages aren't generated by default in servicing releases.
813

14+
Additionally, if the library is listed among the project references of [Microsoft.Windows.Compatibility.csproj](https://github.com/dotnet/runtime/blob/43bb5993d4f983e9d575f52b691ecdc9b9e257ef/src/libraries/Microsoft.Windows.Compatibility/src/Microsoft.Windows.Compatibility.csproj#L15-L48), please make sure to bump the value of `ServicingVersion` for `Microsoft.Windows.Compatibility.csproj` and also set its `GeneratePackageOnBuild` property value to `true`. The version number must only be bumped once per servicing release, even if multiple dependencies get modified.
15+
916
## Determine ServiceVersion
1017

1118
When you make a change to a library & ship it during the servicing release, the `ServicingVersion` must be bumped. This property is found in the library's source project. It's also possible that the property is not in that file, in which case you'll need to add it to the library's source project and set it to 1. If the property is already present in your library's source project, just increment the servicing version by 1.
@@ -23,4 +30,16 @@ All that's left is to ensure that your changes have worked as expected. To do so
2330

2431
## Approval Process
2532

26-
All the servicing change must go through an approval process. Please create your PR using [this template](https://raw.githubusercontent.com/dotnet/runtime/main/.github/PULL_REQUEST_TEMPLATE/servicing_pull_request_template.md). You should also add `servicing-consider` label to the pull request and bring it to the attention of the engineering lead responsible for the area.
33+
All the servicing change must go through an approval process. You have two ways to submit your PR:
34+
35+
- By manually creating your PR using [this template](https://raw.githubusercontent.com/dotnet/runtime/main/.github/PULL_REQUEST_TEMPLATE/servicing_pull_request_template.md).
36+
- Or by asking the bot to automatically create the servicing PR for you using a merged `main` PR as source. This method requires typing an AzDO backport command as a comment of your merged PR using the format `/backport to release/X.0-staging`. Examples:
37+
-
38+
- `/backport to release/7.0-staging`
39+
- `/backport to release/6.0-staging`
40+
41+
For both cases, you must:
42+
43+
- Fill out the template of the PR description.
44+
- Add the `servicing-consider` label.
45+
- Bring it to the attention of the engineering lead responsible for the area, so they consider the fix for servicing.

‎eng/Version.Details.xml‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
<Uri>https://github.com/dotnet/icu</Uri>
55
<Sha>8f5f53bc4ac6f86aa1f4044a5ec0095cfb231713</Sha>
66
</Dependency>
7-
<Dependency Name="System.Net.MsQuic.Transport" Version="7.0.0-alpha.1.22406.1">
7+
<Dependency Name="System.Net.MsQuic.Transport" Version="7.0.0-alpha.1.22459.1">
88
<Uri>https://github.com/dotnet/msquic</Uri>
9-
<Sha>dc012a715ceb9b5d5258f2fda77520586af5a36a</Sha>
9+
<Sha>b1a2104c42648101a2373a1278bcf4ef897ad840</Sha>
1010
</Dependency>
1111
<Dependency Name="System.ServiceModel.Primitives" Version="4.9.0-rc2.21473.1">
1212
<Uri>https://github.com/dotnet/wcf</Uri>
@@ -130,57 +130,57 @@
130130
<Uri>https://github.com/dotnet/arcade</Uri>
131131
<Sha>099bbb071e187ba4e1603004597624e6acae6394</Sha>
132132
</Dependency>
133-
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="7.0.0-beta.23151.1">
133+
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="7.0.0-beta.23179.6">
134134
<Uri>https://github.com/dotnet/runtime-assets</Uri>
135-
<Sha>a2980bba169e946d9e1e77a3a73226ee6096998c</Sha>
135+
<Sha>ec5d27d08b78d68d96eeb8899f329a2fa732923a</Sha>
136136
</Dependency>
137-
<Dependency Name="System.Data.Common.TestData" Version="7.0.0-beta.23151.1">
137+
<Dependency Name="System.Data.Common.TestData" Version="7.0.0-beta.23179.6">
138138
<Uri>https://github.com/dotnet/runtime-assets</Uri>
139-
<Sha>a2980bba169e946d9e1e77a3a73226ee6096998c</Sha>
139+
<Sha>ec5d27d08b78d68d96eeb8899f329a2fa732923a</Sha>
140140
</Dependency>
141-
<Dependency Name="System.Drawing.Common.TestData" Version="7.0.0-beta.23151.1">
141+
<Dependency Name="System.Drawing.Common.TestData" Version="7.0.0-beta.23179.6">
142142
<Uri>https://github.com/dotnet/runtime-assets</Uri>
143-
<Sha>a2980bba169e946d9e1e77a3a73226ee6096998c</Sha>
143+
<Sha>ec5d27d08b78d68d96eeb8899f329a2fa732923a</Sha>
144144
</Dependency>
145-
<Dependency Name="System.Formats.Tar.TestData" Version="7.0.0-beta.23151.1">
145+
<Dependency Name="System.Formats.Tar.TestData" Version="7.0.0-beta.23179.6">
146146
<Uri>https://github.com/dotnet/runtime-assets</Uri>
147-
<Sha>a2980bba169e946d9e1e77a3a73226ee6096998c</Sha>
147+
<Sha>ec5d27d08b78d68d96eeb8899f329a2fa732923a</Sha>
148148
</Dependency>
149-
<Dependency Name="System.IO.Compression.TestData" Version="7.0.0-beta.23151.1">
149+
<Dependency Name="System.IO.Compression.TestData" Version="7.0.0-beta.23179.6">
150150
<Uri>https://github.com/dotnet/runtime-assets</Uri>
151-
<Sha>a2980bba169e946d9e1e77a3a73226ee6096998c</Sha>
151+
<Sha>ec5d27d08b78d68d96eeb8899f329a2fa732923a</Sha>
152152
</Dependency>
153-
<Dependency Name="System.IO.Packaging.TestData" Version="7.0.0-beta.23151.1">
153+
<Dependency Name="System.IO.Packaging.TestData" Version="7.0.0-beta.23179.6">
154154
<Uri>https://github.com/dotnet/runtime-assets</Uri>
155-
<Sha>a2980bba169e946d9e1e77a3a73226ee6096998c</Sha>
155+
<Sha>ec5d27d08b78d68d96eeb8899f329a2fa732923a</Sha>
156156
</Dependency>
157-
<Dependency Name="System.Net.TestData" Version="7.0.0-beta.23151.1">
157+
<Dependency Name="System.Net.TestData" Version="7.0.0-beta.23179.6">
158158
<Uri>https://github.com/dotnet/runtime-assets</Uri>
159-
<Sha>a2980bba169e946d9e1e77a3a73226ee6096998c</Sha>
159+
<Sha>ec5d27d08b78d68d96eeb8899f329a2fa732923a</Sha>
160160
</Dependency>
161-
<Dependency Name="System.Private.Runtime.UnicodeData" Version="7.0.0-beta.23151.1">
161+
<Dependency Name="System.Private.Runtime.UnicodeData" Version="7.0.0-beta.23179.6">
162162
<Uri>https://github.com/dotnet/runtime-assets</Uri>
163-
<Sha>a2980bba169e946d9e1e77a3a73226ee6096998c</Sha>
163+
<Sha>ec5d27d08b78d68d96eeb8899f329a2fa732923a</Sha>
164164
</Dependency>
165-
<Dependency Name="System.Runtime.TimeZoneData" Version="7.0.0-beta.23151.1">
165+
<Dependency Name="System.Runtime.TimeZoneData" Version="7.0.0-beta.23179.6">
166166
<Uri>https://github.com/dotnet/runtime-assets</Uri>
167-
<Sha>a2980bba169e946d9e1e77a3a73226ee6096998c</Sha>
167+
<Sha>ec5d27d08b78d68d96eeb8899f329a2fa732923a</Sha>
168168
</Dependency>
169-
<Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="7.0.0-beta.23151.1">
169+
<Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="7.0.0-beta.23179.6">
170170
<Uri>https://github.com/dotnet/runtime-assets</Uri>
171-
<Sha>a2980bba169e946d9e1e77a3a73226ee6096998c</Sha>
171+
<Sha>ec5d27d08b78d68d96eeb8899f329a2fa732923a</Sha>
172172
</Dependency>
173-
<Dependency Name="System.Text.RegularExpressions.TestData" Version="7.0.0-beta.23151.1">
173+
<Dependency Name="System.Text.RegularExpressions.TestData" Version="7.0.0-beta.23179.6">
174174
<Uri>https://github.com/dotnet/runtime-assets</Uri>
175-
<Sha>a2980bba169e946d9e1e77a3a73226ee6096998c</Sha>
175+
<Sha>ec5d27d08b78d68d96eeb8899f329a2fa732923a</Sha>
176176
</Dependency>
177-
<Dependency Name="System.Windows.Extensions.TestData" Version="7.0.0-beta.23151.1">
177+
<Dependency Name="System.Windows.Extensions.TestData" Version="7.0.0-beta.23179.6">
178178
<Uri>https://github.com/dotnet/runtime-assets</Uri>
179-
<Sha>a2980bba169e946d9e1e77a3a73226ee6096998c</Sha>
179+
<Sha>ec5d27d08b78d68d96eeb8899f329a2fa732923a</Sha>
180180
</Dependency>
181-
<Dependency Name="Microsoft.DotNet.CilStrip.Sources" Version="7.0.0-beta.23151.1">
181+
<Dependency Name="Microsoft.DotNet.CilStrip.Sources" Version="7.0.0-beta.23179.6">
182182
<Uri>https://github.com/dotnet/runtime-assets</Uri>
183-
<Sha>a2980bba169e946d9e1e77a3a73226ee6096998c</Sha>
183+
<Sha>ec5d27d08b78d68d96eeb8899f329a2fa732923a</Sha>
184184
</Dependency>
185185
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="11.1.0-alpha.1.23115.1">
186186
<Uri>https://github.com/dotnet/llvm-project</Uri>
@@ -242,9 +242,9 @@
242242
<Uri>https://github.com/dotnet/runtime</Uri>
243243
<Sha>e680411c22e33f45821f4ae64365a2970b2430a6</Sha>
244244
</Dependency>
245-
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.22423.4">
245+
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.23165.1">
246246
<Uri>https://github.com/dotnet/linker</Uri>
247-
<Sha>313671b195b1b36d56a8888a9a0e12edaac52c57</Sha>
247+
<Sha>d3fc41eadc9ff73ae8e20eb6f874cf5321714c0b</Sha>
248248
</Dependency>
249249
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="1.0.0-prerelease.22411.1">
250250
<Uri>https://github.com/dotnet/xharness</Uri>
@@ -282,9 +282,9 @@
282282
<Uri>https://github.com/dotnet/hotreload-utils</Uri>
283283
<Sha>14a4f4c6e6478b84cac9037935f823b40ddad01d</Sha>
284284
</Dependency>
285-
<Dependency Name="System.Runtime.Numerics.TestData" Version="7.0.0-beta.23151.1">
285+
<Dependency Name="System.Runtime.Numerics.TestData" Version="7.0.0-beta.23179.6">
286286
<Uri>https://github.com/dotnet/runtime-assets</Uri>
287-
<Sha>a2980bba169e946d9e1e77a3a73226ee6096998c</Sha>
287+
<Sha>ec5d27d08b78d68d96eeb8899f329a2fa732923a</Sha>
288288
</Dependency>
289289
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.0-preview1.22559.1">
290290
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>

‎eng/Versions.props‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -118,20 +118,20 @@
118118
<SystemValueTupleVersion>4.5.0</SystemValueTupleVersion>
119119
<runtimenativeSystemIOPortsVersion>7.0.0-rc.1.22414.6</runtimenativeSystemIOPortsVersion>
120120
<!-- Runtime-Assets dependencies -->
121-
<SystemRuntimeNumericsTestDataVersion>7.0.0-beta.23151.1</SystemRuntimeNumericsTestDataVersion>
122-
<SystemComponentModelTypeConverterTestDataVersion>7.0.0-beta.23151.1</SystemComponentModelTypeConverterTestDataVersion>
123-
<SystemDataCommonTestDataVersion>7.0.0-beta.23151.1</SystemDataCommonTestDataVersion>
124-
<SystemDrawingCommonTestDataVersion>7.0.0-beta.23151.1</SystemDrawingCommonTestDataVersion>
125-
<SystemFormatsTarTestDataVersion>7.0.0-beta.23151.1</SystemFormatsTarTestDataVersion>
126-
<SystemIOCompressionTestDataVersion>7.0.0-beta.23151.1</SystemIOCompressionTestDataVersion>
127-
<SystemIOPackagingTestDataVersion>7.0.0-beta.23151.1</SystemIOPackagingTestDataVersion>
128-
<SystemNetTestDataVersion>7.0.0-beta.23151.1</SystemNetTestDataVersion>
129-
<SystemPrivateRuntimeUnicodeDataVersion>7.0.0-beta.23151.1</SystemPrivateRuntimeUnicodeDataVersion>
130-
<SystemRuntimeTimeZoneDataVersion>7.0.0-beta.23151.1</SystemRuntimeTimeZoneDataVersion>
131-
<SystemSecurityCryptographyX509CertificatesTestDataVersion>7.0.0-beta.23151.1</SystemSecurityCryptographyX509CertificatesTestDataVersion>
132-
<SystemTextRegularExpressionsTestDataVersion>7.0.0-beta.23151.1</SystemTextRegularExpressionsTestDataVersion>
133-
<SystemWindowsExtensionsTestDataVersion>7.0.0-beta.23151.1</SystemWindowsExtensionsTestDataVersion>
134-
<MicrosoftDotNetCilStripSourcesVersion>7.0.0-beta.23151.1</MicrosoftDotNetCilStripSourcesVersion>
121+
<SystemRuntimeNumericsTestDataVersion>7.0.0-beta.23179.6</SystemRuntimeNumericsTestDataVersion>
122+
<SystemComponentModelTypeConverterTestDataVersion>7.0.0-beta.23179.6</SystemComponentModelTypeConverterTestDataVersion>
123+
<SystemDataCommonTestDataVersion>7.0.0-beta.23179.6</SystemDataCommonTestDataVersion>
124+
<SystemDrawingCommonTestDataVersion>7.0.0-beta.23179.6</SystemDrawingCommonTestDataVersion>
125+
<SystemFormatsTarTestDataVersion>7.0.0-beta.23179.6</SystemFormatsTarTestDataVersion>
126+
<SystemIOCompressionTestDataVersion>7.0.0-beta.23179.6</SystemIOCompressionTestDataVersion>
127+
<SystemIOPackagingTestDataVersion>7.0.0-beta.23179.6</SystemIOPackagingTestDataVersion>
128+
<SystemNetTestDataVersion>7.0.0-beta.23179.6</SystemNetTestDataVersion>
129+
<SystemPrivateRuntimeUnicodeDataVersion>7.0.0-beta.23179.6</SystemPrivateRuntimeUnicodeDataVersion>
130+
<SystemRuntimeTimeZoneDataVersion>7.0.0-beta.23179.6</SystemRuntimeTimeZoneDataVersion>
131+
<SystemSecurityCryptographyX509CertificatesTestDataVersion>7.0.0-beta.23179.6</SystemSecurityCryptographyX509CertificatesTestDataVersion>
132+
<SystemTextRegularExpressionsTestDataVersion>7.0.0-beta.23179.6</SystemTextRegularExpressionsTestDataVersion>
133+
<SystemWindowsExtensionsTestDataVersion>7.0.0-beta.23179.6</SystemWindowsExtensionsTestDataVersion>
134+
<MicrosoftDotNetCilStripSourcesVersion>7.0.0-beta.23179.6</MicrosoftDotNetCilStripSourcesVersion>
135135
<!-- dotnet-optimization dependencies -->
136136
<optimizationwindows_ntx64MIBCRuntimeVersion>1.0.0-prerelease.22415.6</optimizationwindows_ntx64MIBCRuntimeVersion>
137137
<optimizationwindows_ntx86MIBCRuntimeVersion>1.0.0-prerelease.22415.6</optimizationwindows_ntx86MIBCRuntimeVersion>
@@ -174,13 +174,13 @@
174174
<!-- Docs -->
175175
<MicrosoftPrivateIntellisenseVersion>7.0.0-preview-20221010.1</MicrosoftPrivateIntellisenseVersion>
176176
<!-- ILLink -->
177-
<MicrosoftNETILLinkTasksVersion>7.0.100-1.22423.4</MicrosoftNETILLinkTasksVersion>
177+
<MicrosoftNETILLinkTasksVersion>7.0.100-1.23165.1</MicrosoftNETILLinkTasksVersion>
178178
<MicrosoftNETILLinkAnalyzerPackageVersion>$(MicrosoftNETILLinkTasksVersion)</MicrosoftNETILLinkAnalyzerPackageVersion>
179179
<!-- ICU -->
180180
<MicrosoftNETCoreRuntimeICUTransportVersion>7.0.0-rtm.23115.1</MicrosoftNETCoreRuntimeICUTransportVersion>
181181
<!-- MsQuic -->
182182
<MicrosoftNativeQuicMsQuicVersion>2.1.1</MicrosoftNativeQuicMsQuicVersion>
183-
<SystemNetMsQuicTransportVersion>7.0.0-alpha.1.22406.1</SystemNetMsQuicTransportVersion>
183+
<SystemNetMsQuicTransportVersion>7.0.0-alpha.1.22459.1</SystemNetMsQuicTransportVersion>
184184
<!-- Mono LLVM -->
185185
<runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>11.1.0-alpha.1.23115.1</runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
186186
<runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>11.1.0-alpha.1.23115.1</runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>

‎eng/packaging.targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<_IsWindowsDesktopApp Condition="$(WindowsDesktopCoreAppLibrary.Contains('$(AssemblyName);'))">true</_IsWindowsDesktopApp>
4444
<_IsAspNetCoreApp Condition="$(AspNetCoreAppLibrary.Contains('$(AssemblyName);'))">true</_IsAspNetCoreApp>
4545
<_AssemblyInTargetingPack Condition="('$(IsNETCoreAppSrc)' == 'true' or '$(IsNetCoreAppRef)' == 'true' or '$(_IsAspNetCoreApp)' == 'true' or '$(_IsWindowsDesktopApp)' == 'true') and '$(TargetFrameworkIdentifier)' != '.NETFramework'">true</_AssemblyInTargetingPack>
46-
<!-- Assembly version do not get updated in non-netfx ref pack assemblies. -->
46+
<!-- The assembly version gets updated when the assembly isn't part of a targeting pack. -->
4747
<AssemblyVersion Condition="'$(_AssemblyInTargetingPack)' != 'true'">$(MajorVersion).$(MinorVersion).0.$(ServicingVersion)</AssemblyVersion>
4848
</PropertyGroup>
4949

‎eng/pipelines/libraries/helix-queues-setup.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -123,11 +123,11 @@ jobs:
123123

124124
# tvOS devices
125125
- ${{ if in(parameters.platform, 'tvOS_arm64') }}:
126-
# split traffic for runtime-extra-platforms (which mostly runs on rolling builds)
126+
# if necessary, you can split traffic between queues this way for PR's and rolling builds
127127
- ${{ if ne(parameters.jobParameters.isExtraPlatforms, true) }}:
128-
- OSX.1015.Amd64.AppleTV.Open
128+
- OSX.13.Amd64.AppleTV.Open
129129
- ${{ if eq(parameters.jobParameters.isExtraPlatforms, true) }}:
130-
- OSX.1100.Amd64.AppleTV.Open
130+
- OSX.13.Amd64.AppleTV.Open
131131

132132
# windows x64
133133
- ${{ if eq(parameters.platform, 'windows_x64') }}:
@@ -144,7 +144,7 @@ jobs:
144144
- (Windows.10.Amd64.ServerRS5.Open)[email protected]/dotnet-buildtools/prereqs:windowsservercore-ltsc2019-helix-amd64
145145
- ${{ if or(ne(parameters.jobParameters.isExtraPlatforms, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
146146
- Windows.81.Amd64.Open
147-
- Windows.10.Amd64.Server2022.ES.Open
147+
- Windows.Amd64.Server2022.Open
148148
- Windows.11.Amd64.Client.Open
149149
- ${{ if eq(parameters.jobParameters.testScope, 'outerloop') }}:
150150
- (Windows.10.Amd64.ServerRS5.Open)[email protected]/dotnet-buildtools/prereqs:windowsservercore-ltsc2019-helix-amd64
@@ -170,7 +170,7 @@ jobs:
170170
- Windows.11.Amd64.Client.Open
171171
- Windows.Amd64.Server2022.Open
172172
- ${{ if or(ne(parameters.jobParameters.isExtraPlatforms, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
173-
- Windows.10.Amd64.Server2022.ES.Open
173+
- Windows.Amd64.Server2022.Open
174174
- Windows.7.Amd64.Open
175175

176176
# .NETFramework

‎src/coreclr/gc/gc.cpp‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28792,7 +28792,8 @@ void gc_heap::process_remaining_regions (int current_plan_gen_num, generation* c
2879228792
return;
2879328793
}
2879428794

28795-
set_region_plan_gen_num_sip (current_region, current_plan_gen_num);
28795+
decide_on_demotion_pin_surv (current_region);
28796+
2879628797
if (!heap_segment_swept_in_plan (current_region))
2879728798
{
2879828799
heap_segment_plan_allocated (current_region) = generation_allocation_pointer (consing_gen);
@@ -30515,6 +30516,13 @@ void gc_heap::plan_phase (int condemned_gen_number)
3051530516
gc_time_info[time_plan] = gc_time_info[time_sweep] - gc_time_info[time_plan];
3051630517
}
3051730518
#endif //FEATURE_EVENT_TRACE
30519+
30520+
#ifdef USE_REGIONS
30521+
if (special_sweep_p)
30522+
{
30523+
should_compact = FALSE;
30524+
}
30525+
#endif //!USE_REGIONS
3051830526
#endif //MULTIPLE_HEAPS
3051930527

3052030528
#ifdef FEATURE_LOH_COMPACTION

0 commit comments

Comments
 (0)