Skip to content

Commit 33b3d1c

Browse files
author
Rachel Jarvi
committed
test
1 parent 4384c4a commit 33b3d1c

File tree

29 files changed

+440
-659
lines changed

29 files changed

+440
-659
lines changed

‎.config/dotnet-tools.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
]
1616
},
1717
"microsoft.dotnet.xharness.cli": {
18-
"version": "10.0.0-prerelease.25255.1",
18+
"version": "10.0.0-prerelease.25330.2",
1919
"commands": [
2020
"xharness"
2121
]

‎docs/design/coreclr/botr/clr-abi.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,12 +116,12 @@ To return `Continuation` we use a volatile/calee-trash register that cannot be u
116116
| risc-v | a2 |
117117

118118
### Passing `Continuation` argument
119-
The `Continuation` parameter is passed at the same position as generic instantiation parameter or immediately after, if both present.
119+
The `Continuation` parameter is passed at the same position as generic instantiation parameter or immediately after, if both present. For x86 the argument order is reversed.
120120

121121
```
122122
call(["this" pointer] [return buffer pointer] [generics context] [continuation] [userargs]) // not x86
123123
124-
call(["this" pointer] [return buffer pointer] [userargs] [generics context] [continuation]) // x86
124+
call(["this" pointer] [return buffer pointer] [userargs] [continuation] [generics context]) // x86
125125
```
126126

127127
## AMD64-only: by-value value types

‎docs/design/datacontracts/CodeVersions.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ IEnumerable<ILCodeVersionHandle> ICodeVersions.GetILCodeVersions(TargetPointer m
132132
// CodeVersionManager::GetILCodeVersions
133133
GetModuleAndMethodDesc(methodDesc, out TargetPointer module, out uint methodDefToken);
134134

135-
ModuleHandle moduleHandle = _target.Contracts.Loader.GetModuleHandle(module);
135+
ModuleHandle moduleHandle = _target.Contracts.Loader.GetModuleHandleFromModulePtr(module);
136136
TargetPointer ilCodeVersionTable = _target.Contracts.Loader.GetLookupTables(moduleHandle).MethodDefToILCodeVersioningState;
137137
TargetPointer ilVersionStateAddress = _target.Contracts.Loader.GetModuleLookupMapElement(ilCodeVersionTable, methodDefToken, out var _);
138138

@@ -247,7 +247,7 @@ bool ICodeVersions.CodeVersionManagerSupportsMethod(TargetPointer methodDescAddr
247247
TypeHandle mt = rts.GetTypeHandle(mtAddr);
248248
TargetPointer modAddr = rts.GetModule(mt);
249249
ILoader loader = _target.Contracts.Loader;
250-
ModuleHandle mod = loader.GetModuleHandle(modAddr);
250+
ModuleHandle mod = loader.GetModuleHandleFromModulePtr(modAddr);
251251
ModuleFlags modFlags = loader.GetFlags(mod);
252252
if (modFlags.HasFlag(ModuleFlags.EditAndContinue))
253253
return false;

‎docs/design/datacontracts/Loader.md‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,9 @@ record struct ModuleLookupTables(
5252
```
5353

5454
``` csharp
55-
ModuleHandle GetModuleHandle(TargetPointer module);
55+
ModuleHandle GetModuleHandleFromModulePtr(TargetPointer module);
56+
ModuleHandle GetModuleHandleFromAssemblyPtr(TargetPointer assemblyPointer);
57+
TargetPointer GetModuleAddress(ModuleHandle handle);
5658
IEnumerable<ModuleHandle> GetModules(TargetPointer appDomain, AssemblyIterationFlags iterationFlags);
5759
TargetPointer GetRootAssembly();
5860
TargetPointer GetAssembly(ModuleHandle handle);
@@ -146,11 +148,23 @@ private enum ModuleFlags_1 : uint
146148

147149
### Method Implementations
148150
``` csharp
149-
ModuleHandle GetModuleHandle(TargetPointer modulePointer)
151+
ModuleHandle GetModuleHandleFromModulePtr(TargetPointer modulePointer)
150152
{
151153
return new ModuleHandle(modulePointer);
152154
}
153155

156+
ModuleHandle ILoader.GetModuleHandleFromAssemblyPtr(TargetPointer assemblyPointer)
157+
{
158+
Data.Assembly assembly = _target.ProcessedData.GetOrAdd<Data.Assembly>(assemblyPointer);
159+
return new ModuleHandle(assembly.Module);
160+
}
161+
162+
TargetPointer ILoader.GetModuleAddress(ModuleHandle handle)
163+
{
164+
Data.Module module = _target.ProcessedData.GetOrAdd<Data.Module>(handle.Address);
165+
return module.Address;
166+
}
167+
154168
IEnumerable<ModuleHandle> GetModules(TargetPointer appDomain, AssemblyIterationFlags iterationFlags)
155169
{
156170
if (appDomain == TargetPointer.Null) throw new ArgumentException("appDomain must not be null");

‎docs/design/datacontracts/RuntimeTypeSystem.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1004,7 +1004,7 @@ Determining if a method is in a collectible module:
10041004
{
10051005
MethodDesc md = _methodDescs[methodDesc.Address];
10061006
TargetPointer loaderModuleAddr = GetLoaderModule(md);
1007-
ModuleHandle mod = _target.Contracts.Loader.GetModuleHandle(loaderModuleAddr);
1007+
ModuleHandle mod = _target.Contracts.Loader.GetModuleHandleFromModulePtr(loaderModuleAddr);
10081008
return _target.Contracts.Loader.IsCollectible(mod);
10091009

10101010
}

‎eng/Subsets.props‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -640,8 +640,7 @@
640640
<_BuildCoreCLRRuntimePack Condition="'$(RuntimeFlavor)' == 'CoreCLR' and '$(CoreCLRSupported)' == 'true'">true</_BuildCoreCLRRuntimePack>
641641
<_BuildMonoRuntimePack Condition="'$(RuntimeFlavor)' == 'Mono' and '$(MonoSupported)' == 'true'">true</_BuildMonoRuntimePack>
642642
<_BuildHostPack Condition="'$(RuntimeFlavor)' == '$(PrimaryRuntimeFlavor)' and '$(TargetsMobile)' != 'true'">true</_BuildHostPack>
643-
<_BuildCdacPack Condition="'$(_CDacToolsBuilt)' == 'true' and '$(RuntimeFlavor)' == 'CoreCLR' and '$(TargetsMobile)' != 'true' and '$(TargetsLinuxMusl)' != 'true' and ('$(TargetOS)' == 'windows' or '$(TargetOS)' == 'osx' or '$(TargetOS)' == 'linux')">true</_BuildCdacPack>
644-
<_BuildCdacPack Condition="'$(DotNetBuildSourceOnly)' == 'true' or '$(TargetArchitecture)' == 'arm' or '$(TargetArchitecture)' == 'armel' or '$(TargetArchitecture)' == 'x86' or '$(TargetArchitecture)' == 'riscv64'">false</_BuildCdacPack>
643+
<_BuildCdacPack Condition="'$(_CDacToolsBuilt)' == 'true' and '$(RuntimeFlavor)' == 'CoreCLR' and '$(TargetsMobile)' != 'true' and ('$(TargetOS)' == 'windows' or '$(TargetOS)' == 'osx' or '$(TargetOS)' == 'linux')">true</_BuildCdacPack>
645644
<_BuildBundle Condition="'$(RuntimeFlavor)' == '$(PrimaryRuntimeFlavor)' and '$(TargetsMobile)' != 'true'">true</_BuildBundle>
646645
</PropertyGroup>
647646

‎eng/Version.Details.xml‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -291,37 +291,37 @@
291291
<Uri>https://github.com/dotnet/dotnet</Uri>
292292
<Sha>eaa19c281d34580a8168cff9ce1e7337da8bfe4f</Sha>
293293
</Dependency>
294-
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="10.0.0-prerelease.25255.1">
294+
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="10.0.0-prerelease.25330.2">
295295
<Uri>https://github.com/dotnet/xharness</Uri>
296-
<Sha>e85bb14e85357ab678c2bcb0b6f2bac634fdd49b</Sha>
296+
<Sha>feac80219b22c403d32df9b6bd61cbf78e1b9986</Sha>
297297
</Dependency>
298-
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="10.0.0-prerelease.25255.1">
298+
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="10.0.0-prerelease.25330.2">
299299
<Uri>https://github.com/dotnet/xharness</Uri>
300-
<Sha>e85bb14e85357ab678c2bcb0b6f2bac634fdd49b</Sha>
300+
<Sha>feac80219b22c403d32df9b6bd61cbf78e1b9986</Sha>
301301
</Dependency>
302-
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="10.0.0-prerelease.25255.1">
302+
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="10.0.0-prerelease.25330.2">
303303
<Uri>https://github.com/dotnet/xharness</Uri>
304-
<Sha>e85bb14e85357ab678c2bcb0b6f2bac634fdd49b</Sha>
304+
<Sha>feac80219b22c403d32df9b6bd61cbf78e1b9986</Sha>
305305
</Dependency>
306306
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="10.0.0-beta.25351.106">
307307
<Uri>https://github.com/dotnet/dotnet</Uri>
308308
<Sha>eaa19c281d34580a8168cff9ce1e7337da8bfe4f</Sha>
309309
</Dependency>
310-
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.25256.1">
310+
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.25324.1">
311311
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
312-
<Sha>a68196f69e40740fce716778138acaa26488b333</Sha>
312+
<Sha>86968b14b5c2ba5104d205665c76c22544c067f6</Sha>
313313
</Dependency>
314-
<Dependency Name="optimization.windows_nt-x86.MIBC.Runtime" Version="1.0.0-prerelease.25256.1">
314+
<Dependency Name="optimization.windows_nt-x86.MIBC.Runtime" Version="1.0.0-prerelease.25324.1">
315315
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
316-
<Sha>a68196f69e40740fce716778138acaa26488b333</Sha>
316+
<Sha>86968b14b5c2ba5104d205665c76c22544c067f6</Sha>
317317
</Dependency>
318-
<Dependency Name="optimization.linux-x64.MIBC.Runtime" Version="1.0.0-prerelease.25256.1">
318+
<Dependency Name="optimization.linux-x64.MIBC.Runtime" Version="1.0.0-prerelease.25324.1">
319319
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
320-
<Sha>a68196f69e40740fce716778138acaa26488b333</Sha>
320+
<Sha>86968b14b5c2ba5104d205665c76c22544c067f6</Sha>
321321
</Dependency>
322-
<Dependency Name="optimization.PGO.CoreCLR" Version="1.0.0-prerelease.25256.1">
322+
<Dependency Name="optimization.PGO.CoreCLR" Version="1.0.0-prerelease.25324.1">
323323
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
324-
<Sha>a68196f69e40740fce716778138acaa26488b333</Sha>
324+
<Sha>86968b14b5c2ba5104d205665c76c22544c067f6</Sha>
325325
</Dependency>
326326
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="10.0.0-alpha.0.25302.2">
327327
<Uri>https://github.com/dotnet/hotreload-utils</Uri>
@@ -355,13 +355,13 @@
355355
<Uri>https://github.com/dotnet/dotnet</Uri>
356356
<Sha>eaa19c281d34580a8168cff9ce1e7337da8bfe4f</Sha>
357357
</Dependency>
358-
<Dependency Name="optimization.windows_nt-arm64.MIBC.Runtime" Version="1.0.0-prerelease.25256.1">
358+
<Dependency Name="optimization.windows_nt-arm64.MIBC.Runtime" Version="1.0.0-prerelease.25324.1">
359359
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
360-
<Sha>a68196f69e40740fce716778138acaa26488b333</Sha>
360+
<Sha>86968b14b5c2ba5104d205665c76c22544c067f6</Sha>
361361
</Dependency>
362-
<Dependency Name="optimization.linux-arm64.MIBC.Runtime" Version="1.0.0-prerelease.25256.1">
362+
<Dependency Name="optimization.linux-arm64.MIBC.Runtime" Version="1.0.0-prerelease.25324.1">
363363
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
364-
<Sha>a68196f69e40740fce716778138acaa26488b333</Sha>
364+
<Sha>86968b14b5c2ba5104d205665c76c22544c067f6</Sha>
365365
</Dependency>
366366
<!-- Necessary for source-build. This allows the package to be retrieved from previously-source-built artifacts
367367
and flow in as dependencies of the packages produced by runtime. -->

‎eng/Versions.props‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -165,18 +165,18 @@
165165
<MicrosoftDotNetCilStripSourcesVersion>10.0.0-beta.25310.1</MicrosoftDotNetCilStripSourcesVersion>
166166
<MicrosoftNETHostModelTestDataVersion>10.0.0-beta.25310.1</MicrosoftNETHostModelTestDataVersion>
167167
<!-- xharness dependencies -->
168-
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>10.0.0-prerelease.25255.1</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
169-
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>10.0.0-prerelease.25255.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
170-
<MicrosoftDotNetXHarnessCLIVersion>10.0.0-prerelease.25255.1</MicrosoftDotNetXHarnessCLIVersion>
168+
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>10.0.0-prerelease.25330.2</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
169+
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>10.0.0-prerelease.25330.2</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
170+
<MicrosoftDotNetXHarnessCLIVersion>10.0.0-prerelease.25330.2</MicrosoftDotNetXHarnessCLIVersion>
171171
<!-- hotreload-utils dependencies -->
172172
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>10.0.0-alpha.0.25302.2</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
173173
<!-- dotnet-optimization dependencies -->
174-
<optimizationwindows_ntx64MIBCRuntimeVersion>1.0.0-prerelease.25256.1</optimizationwindows_ntx64MIBCRuntimeVersion>
175-
<optimizationwindows_ntx86MIBCRuntimeVersion>1.0.0-prerelease.25256.1</optimizationwindows_ntx86MIBCRuntimeVersion>
176-
<optimizationwindows_ntarm64MIBCRuntimeVersion>1.0.0-prerelease.25256.1</optimizationwindows_ntarm64MIBCRuntimeVersion>
177-
<optimizationlinuxx64MIBCRuntimeVersion>1.0.0-prerelease.25256.1</optimizationlinuxx64MIBCRuntimeVersion>
178-
<optimizationlinuxarm64MIBCRuntimeVersion>1.0.0-prerelease.25256.1</optimizationlinuxarm64MIBCRuntimeVersion>
179-
<optimizationPGOCoreCLRVersion>1.0.0-prerelease.25256.1</optimizationPGOCoreCLRVersion>
174+
<optimizationwindows_ntx64MIBCRuntimeVersion>1.0.0-prerelease.25324.1</optimizationwindows_ntx64MIBCRuntimeVersion>
175+
<optimizationwindows_ntx86MIBCRuntimeVersion>1.0.0-prerelease.25324.1</optimizationwindows_ntx86MIBCRuntimeVersion>
176+
<optimizationwindows_ntarm64MIBCRuntimeVersion>1.0.0-prerelease.25324.1</optimizationwindows_ntarm64MIBCRuntimeVersion>
177+
<optimizationlinuxx64MIBCRuntimeVersion>1.0.0-prerelease.25324.1</optimizationlinuxx64MIBCRuntimeVersion>
178+
<optimizationlinuxarm64MIBCRuntimeVersion>1.0.0-prerelease.25324.1</optimizationlinuxarm64MIBCRuntimeVersion>
179+
<optimizationPGOCoreCLRVersion>1.0.0-prerelease.25324.1</optimizationPGOCoreCLRVersion>
180180
<!-- Not auto-updated. -->
181181
<MicrosoftDiaSymReaderVersion>2.0.0</MicrosoftDiaSymReaderVersion>
182182
<MicrosoftDiaSymReaderNativeVersion>17.10.0-beta1.24272.1</MicrosoftDiaSymReaderNativeVersion>

‎eng/build.ps1‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,8 @@ if ($vs) {
176176
}
177177

178178
# Auto-generated solution file that still uses the sln format
179-
if ($vs -ieq "coreclr.sln") {
180-
# If someone passes in coreclr.sln (case-insensitive),
179+
if ($vs -ieq "coreclr.sln" -or $vs -ieq "coreclr") {
180+
# If someone passes in coreclr.sln or just coreclr (case-insensitive),
181181
# launch the generated CMake solution.
182182
$vs = Split-Path $PSScriptRoot -Parent | Join-Path -ChildPath "artifacts\obj\coreclr" | Join-Path -ChildPath "windows.$archToOpen.$((Get-Culture).TextInfo.ToTitleCase($configToOpen))" | Join-Path -ChildPath "ide" | Join-Path -ChildPath "CoreCLR.sln"
183183
if (-Not (Test-Path $vs)) {
@@ -192,7 +192,7 @@ if ($vs) {
192192
}
193193
}
194194
# Auto-generated solution file that still uses the sln format
195-
elseif ($vs -ieq "corehost.sln") {
195+
elseif ($vs -ieq "corehost.sln" -or $vs -ieq "corehost") {
196196
$vs = Split-Path $PSScriptRoot -Parent | Join-Path -ChildPath "artifacts\obj\" | Join-Path -ChildPath "win-$archToOpen.$((Get-Culture).TextInfo.ToTitleCase($configToOpen))" | Join-Path -ChildPath "corehost" | Join-Path -ChildPath "ide" | Join-Path -ChildPath "corehost.sln"
197197
if (-Not (Test-Path $vs)) {
198198
Invoke-Expression "& `"$repoRoot/eng/common/msbuild.ps1`" $repoRoot/src/native/corehost/corehost.proj /clp:nosummary /restore /p:Ninja=false /p:Configuration=$configToOpen /p:TargetArchitecture=$archToOpen /p:ConfigureOnly=true"
@@ -214,6 +214,11 @@ if ($vs) {
214214
} else {
215215
# Search for the solution in coreclr
216216
$vs = Split-Path $PSScriptRoot -Parent | Join-Path -ChildPath "src\coreclr" | Join-Path -ChildPath $vs | Join-Path -ChildPath "$vs.slnx"
217+
218+
# Also, search for the solution in coreclr\tools\aot
219+
if (-Not (Test-Path $vs)) {
220+
$vs = Split-Path $PSScriptRoot -Parent | Join-Path -ChildPath "src\coreclr\tools\aot\$solution.slnx"
221+
}
217222
}
218223

219224
if (-Not (Test-Path $vs)) {

‎eng/pipelines/coreclr/interpreter.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
trigger: none
22

3+
schedules:
4+
- cron: "0 13 * * 1,3,5"
5+
displayName: Every Monday, Wednesday and Friday at 5:00 AM (UTC-8:00)
6+
branches:
7+
include:
8+
- main
9+
always: true
10+
311
variables:
412
- template: /eng/pipelines/common/variables.yml
513

0 commit comments

Comments
 (0)