Skip to content

Commit 44d5b85

Browse files
stephentoubstephentoub
committed
Merge branch 'main' into moreequatable
2 parents 1c908f7 + e574380 commit 44d5b85

File tree

27 files changed

+1991
-184
lines changed

27 files changed

+1991
-184
lines changed

‎.github/fabricbot.json‎

Lines changed: 64 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1506,8 +1506,8 @@
15061506
{
15071507
"name": "isInProject",
15081508
"parameters": {
1509-
"projectName": "WCF Owned Areas",
1510-
"isOrgProject": false
1509+
"projectName": "Tellurium (WCF, Serialization, Etc.)",
1510+
"isOrgProject": true
15111511
}
15121512
}
15131513
]
@@ -1530,6 +1530,12 @@
15301530
"label": "area-System.Runtime.Caching"
15311531
}
15321532
},
1533+
{
1534+
"name": "labelAdded",
1535+
"parameters": {
1536+
"label": "area-System.ServiceModel"
1537+
}
1538+
},
15331539
{
15341540
"name": "labelAdded",
15351541
"parameters": {
@@ -1568,6 +1574,12 @@
15681574
"label": "area-System.Runtime.Caching"
15691575
}
15701576
},
1577+
{
1578+
"name": "hasLabel",
1579+
"parameters": {
1580+
"label": "area-System.ServiceModel"
1581+
}
1582+
},
15711583
{
15721584
"name": "hasLabel",
15731585
"parameters": {
@@ -1598,9 +1610,8 @@
15981610
{
15991611
"name": "addToProject",
16001612
"parameters": {
1601-
"projectName": "WCF Owned Areas",
1602-
"isOrgProject": false,
1603-
"columnName": "Needs Triage"
1613+
"projectName": "Tellurium (WCF, Serialization, Etc.)",
1614+
"isOrgProject": true
16041615
}
16051616
}
16061617
]
@@ -1625,7 +1636,8 @@
16251636
{
16261637
"name": "isInProject",
16271638
"parameters": {
1628-
"projectName": "WCF Owned Areas"
1639+
"projectName": "Tellurium (WCF, Serialization, Etc.)",
1640+
"isOrgProject": true
16291641
}
16301642
}
16311643
]
@@ -1648,6 +1660,12 @@
16481660
"label": "area-System.Runtime.Caching"
16491661
}
16501662
},
1663+
{
1664+
"name": "labelAdded",
1665+
"parameters": {
1666+
"label": "area-System.ServiceModel"
1667+
}
1668+
},
16511669
{
16521670
"name": "labelAdded",
16531671
"parameters": {
@@ -1680,6 +1698,12 @@
16801698
"label": "area-System.Runtime.Caching"
16811699
}
16821700
},
1701+
{
1702+
"name": "hasLabel",
1703+
"parameters": {
1704+
"label": "area-System.ServiceModel"
1705+
}
1706+
},
16831707
{
16841708
"name": "hasLabel",
16851709
"parameters": {
@@ -1717,8 +1741,8 @@
17171741
{
17181742
"name": "addToProject",
17191743
"parameters": {
1720-
"projectName": "WCF Owned Areas",
1721-
"columnName": "Open PRs"
1744+
"projectName": "Tellurium (WCF, Serialization, Etc.)",
1745+
"isOrgProject": true
17221746
}
17231747
}
17241748
]
@@ -1743,8 +1767,8 @@
17431767
{
17441768
"name": "isInProject",
17451769
"parameters": {
1746-
"projectName": "WCF Owned Areas",
1747-
"isOrgProject": false
1770+
"projectName": "Tellurium (WCF, Serialization, Etc.)",
1771+
"isOrgProject": true
17481772
}
17491773
}
17501774
]
@@ -1767,6 +1791,12 @@
17671791
"label": "area-System.Runtime.Caching"
17681792
}
17691793
},
1794+
{
1795+
"name": "labelAdded",
1796+
"parameters": {
1797+
"label": "area-System.ServiceModel"
1798+
}
1799+
},
17701800
{
17711801
"name": "labelAdded",
17721802
"parameters": {
@@ -1805,6 +1835,12 @@
18051835
"label": "area-System.Runtime.Caching"
18061836
}
18071837
},
1838+
{
1839+
"name": "hasLabel",
1840+
"parameters": {
1841+
"label": "area-System.ServiceModel"
1842+
}
1843+
},
18081844
{
18091845
"name": "hasLabel",
18101846
"parameters": {
@@ -1835,9 +1871,8 @@
18351871
{
18361872
"name": "addToProject",
18371873
"parameters": {
1838-
"projectName": "WCF Owned Areas",
1839-
"isOrgProject": false,
1840-
"columnName": "Needs Triage"
1874+
"projectName": "Tellurium (WCF, Serialization, Etc.)",
1875+
"isOrgProject": true
18411876
}
18421877
}
18431878
]
@@ -1862,7 +1897,8 @@
18621897
{
18631898
"name": "isInProject",
18641899
"parameters": {
1865-
"projectName": "WCF Owned Areas"
1900+
"projectName": "Tellurium (WCF, Serialization, Etc.)",
1901+
"isOrgProject": true
18661902
}
18671903
}
18681904
]
@@ -1885,6 +1921,12 @@
18851921
"label": "area-System.Runtime.Caching"
18861922
}
18871923
},
1924+
{
1925+
"name": "labelAdded",
1926+
"parameters": {
1927+
"label": "area-System.ServiceModel"
1928+
}
1929+
},
18881930
{
18891931
"name": "labelAdded",
18901932
"parameters": {
@@ -1917,6 +1959,12 @@
19171959
"label": "area-System.Runtime.Caching"
19181960
}
19191961
},
1962+
{
1963+
"name": "hasLabel",
1964+
"parameters": {
1965+
"label": "area-System.ServiceModel"
1966+
}
1967+
},
19201968
{
19211969
"name": "hasLabel",
19221970
"parameters": {
@@ -1954,8 +2002,8 @@
19542002
{
19552003
"name": "addToProject",
19562004
"parameters": {
1957-
"projectName": "WCF Owned Areas",
1958-
"columnName": "Open PRs"
2005+
"projectName": "Tellurium (WCF, Serialization, Etc.)",
2006+
"isOrgProject": true
19592007
}
19602008
}
19612009
]

‎eng/pipelines/common/templates/wasm-library-aot-tests.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ parameters:
88
nameSuffix: ''
99
platforms: []
1010
runAOT: false
11-
runSmokeOnlyArg: ''
11+
shouldRunSmokeOnly: false
1212
shouldContinueOnError: false
1313

1414
jobs:
@@ -28,7 +28,7 @@ jobs:
2828
extraBuildArgs: /p:EnableAggressiveTrimming=true /p:BuildAOTTestsOnHelix=${{ parameters.buildAOTOnHelix }} /p:RunAOTCompilation=${{ parameters.runAOT }} ${{ parameters.extraBuildArgs }}
2929
extraHelixArgs: /p:NeedsToBuildWasmAppsOnHelix=true ${{ parameters.extraHelixArgs }}
3030
alwaysRun: ${{ parameters.alwaysRun }}
31-
runSmokeOnlyArg: $(_runSmokeTestsOnlyArg)
31+
shouldRunSmokeOnly: ${{ parameters.shouldRunSmokeOnly }}
3232
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
3333
scenarios:
3434
- normal
@@ -45,7 +45,7 @@ jobs:
4545
extraBuildArgs: /p:EnableAggressiveTrimming=true /p:BuildAOTTestsOnHelix=${{ parameters.buildAOTOnHelix }} /p:RunAOTCompilation=${{ parameters.runAOT }} ${{ parameters.extraBuildArgs }}
4646
extraHelixArgs: /p:NeedsToBuildWasmAppsOnHelix=true ${{ parameters.extraHelixArgs }}
4747
alwaysRun: ${{ parameters.alwaysRun }}
48-
runSmokeOnlyArg: $(_runSmokeTestsOnlyArg)
48+
shouldRunSmokeOnly: ${{ parameters.shouldRunSmokeOnly }}
4949
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
5050
scenarios:
5151
- WasmTestOnBrowser

‎eng/pipelines/common/templates/wasm-library-tests.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ parameters:
77
isWasmOnlyBuild: false
88
nameSuffix: ''
99
platforms: []
10-
runSmokeOnlyArg: ''
1110
scenarios: ['normal']
1211
shouldContinueOnError: false
12+
shouldRunSmokeOnly: false
1313

1414
jobs:
1515

@@ -47,11 +47,13 @@ jobs:
4747
and(
4848
eq(dependencies.evaluate_paths.outputs.SetPathVars_wasm_wbt_or_dbg.containsChange, true),
4949
ne(dependencies.evaluate_paths.outputs.SetPathVars_any_other_than_wasm_wbt_dbg.containsChange, true))
50+
- name: _wasmRunSmokeTestsOnlyArg
51+
value: /p:RunSmokeTestsOnly=${{ eq(parameters.shouldRunSmokeOnly, true) }}
5052
jobParameters:
5153
isExtraPlatforms: ${{ parameters.isExtraPlatformsBuild }}
5254
testGroup: innerloop
5355
nameSuffix: LibraryTests${{ parameters.nameSuffix }}
54-
buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:BrowserHost=$(_hostedOs) ${{ parameters.runSmokeOnlyArg }} ${{ parameters.extraBuildArgs }}
56+
buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:BrowserHost=$(_hostedOs) $(_wasmRunSmokeTestsOnlyArg) ${{ parameters.extraBuildArgs }}
5557
timeoutInMinutes: 240
5658
# if !alwaysRun, then:
5759
# if this is runtime-wasm (isWasmOnlyBuild):
@@ -75,5 +77,5 @@ jobs:
7577
7678
creator: dotnet-bot
7779
testRunNamePrefixSuffix: Mono_$(_BuildConfig)
78-
extraHelixArguments: /p:BrowserHost=$(_hostedOs) ${{ parameters.runSmokeOnlyArg }} ${{ parameters.extraHelixArgs }}
80+
extraHelixArguments: /p:BrowserHost=$(_hostedOs) $(_wasmRunSmokeTestsOnlyArg) ${{ parameters.extraHelixArgs }}
7981
scenarios: ${{ parameters.scenarios }}

‎eng/pipelines/runtime.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -397,6 +397,7 @@ jobs:
397397
- Browser_wasm
398398
nameSuffix: _EAT
399399
runAOT: false
400+
shouldRunSmokeOnly: false
400401
alwaysRun: ${{ variables.isRollingBuild }}
401402

402403
# AOT Library tests
@@ -406,7 +407,7 @@ jobs:
406407
- Browser_wasm
407408
nameSuffix: _AOT
408409
runAOT: true
409-
runSmokeOnlyArg: $(_runSmokeTestsOnlyArg)
410+
shouldRunSmokeOnly: true
410411
alwaysRun: ${{ variables.isRollingBuild }}
411412

412413
- template: /eng/pipelines/common/templates/wasm-library-aot-tests.yml
@@ -415,7 +416,7 @@ jobs:
415416
- Browser_wasm_win
416417
nameSuffix: _AOT
417418
runAOT: true
418-
runSmokeOnlyArg: $(_runSmokeTestsOnlyArg)
419+
shouldRunSmokeOnly: true
419420
alwaysRun: ${{ variables.isRollingBuild }}
420421

421422
# Wasm.Build.Tests

‎src/coreclr/dlls/mscorrc/mscorrc.rc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -548,7 +548,7 @@ BEGIN
548548
IDS_ER_STACK_OVERFLOW "Description: The process was terminated due to stack overflow."
549549
IDS_ER_STACK "Stack:"
550550
IDS_ER_WORDAT "at"
551-
IDS_ER_UNMANAGEDFAILFASTMSG "at IP 0x%x (0x%x) with exit code 0x%x."
551+
IDS_ER_UNMANAGEDFAILFASTMSG "at IP 0x%1 (0x%2) with exit code 0x%3."
552552
IDS_ER_UNHANDLEDEXCEPTIONINFO "exception code %1, exception address %2"
553553
IDS_ER_MESSAGE_TRUNCATE "The remainder of the message was truncated."
554554
IDS_ER_CODECONTRACT_FAILED "Description: The application encountered a bug. A managed code contract (precondition, postcondition, object invariant, or assert) failed."

‎src/coreclr/nativeaot/Runtime/inc/MethodTable.h‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ class MethodTable
196196
enum ExtendedFlags
197197
{
198198
HasEagerFinalizerFlag = 0x0001,
199-
HasCriticalFinalizerFlag = 0x0002, // NYI, tracked by https://github.com/dotnet/runtime/issues/75106
199+
HasCriticalFinalizerFlag = 0x0002,
200200
};
201201

202202
public:
@@ -267,6 +267,11 @@ class MethodTable
267267
return (m_uFlags & HasEagerFinalizerFlag) && !HasComponentSize();
268268
}
269269

270+
bool HasCriticalFinalizer()
271+
{
272+
return (m_uFlags & HasCriticalFinalizerFlag) && !HasComponentSize();
273+
}
274+
270275
bool HasComponentSize()
271276
{
272277
static_assert(HasComponentSizeFlag == (1 << 31), "we assume that HasComponentSizeFlag matches the sign bit");
@@ -391,7 +396,6 @@ class MethodTable
391396
uint32_t GetBaseSize() { return get_BaseSize(); }
392397
uint32_t ContainsPointers() { return HasReferenceFields(); }
393398
uint32_t ContainsPointersOrCollectible() { return HasReferenceFields(); }
394-
bool HasCriticalFinalizer() { return false; }
395399
bool IsValueType() { return get_IsValueType(); }
396400
UInt32_BOOL SanityCheck() { return Validate(); }
397401
};

‎src/coreclr/nativeaot/System.Private.CoreLib/src/System.Private.CoreLib.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,6 @@
211211
<Compile Include="System\Runtime\InteropServices\Marshal.NativeAot.cs" />
212212
<Compile Include="System\Runtime\InteropServices\Marshal.Com.cs" Condition="'$(FeatureCominterop)' == 'true'" />
213213
<Compile Include="System\Runtime\InteropServices\MemoryMarshal.NativeAot.cs" />
214-
<Compile Include="System\Runtime\InteropServices\SafeHandle.NativeAot.cs" />
215214
<Compile Include="System\Runtime\InteropServices\UnsafeGCHandle.cs" />
216215
<Compile Include="System\Runtime\Intrinsics\X86\X86Base.NativeAot.cs" Condition="'$(SupportsX86Intrinsics)' == 'true'" />
217216
<Compile Include="System\Runtime\JitInfo.NativeAot.cs" />

‎src/coreclr/nativeaot/System.Private.CoreLib/src/System/Runtime/InteropServices/SafeHandle.NativeAot.cs‎

Lines changed: 0 additions & 58 deletions
This file was deleted.

0 commit comments

Comments
 (0)