diff --git a/eng/testing/tests.targets b/eng/testing/tests.targets index 9336d5bdc24913..f648ba56d5837b 100644 --- a/eng/testing/tests.targets +++ b/eng/testing/tests.targets @@ -1,15 +1,17 @@ + + + true + + - true $(Features);runtime-async=on diff --git a/src/coreclr/inc/clrconfigvalues.h b/src/coreclr/inc/clrconfigvalues.h index fd64be3df1b59f..78d11c697a1e88 100644 --- a/src/coreclr/inc/clrconfigvalues.h +++ b/src/coreclr/inc/clrconfigvalues.h @@ -715,9 +715,6 @@ RETAIL_CONFIG_DWORD_INFO(EXTERNAL_EnableRiscV64Zbb, W("EnableRiscV64 RETAIL_CONFIG_DWORD_INFO(EXTERNAL_EnableRiscV64Zbs, W("EnableRiscV64Zbs"), 1, "Allows RiscV64 Zbs hardware intrinsics to be disabled") #endif -// Runtime-async -RETAIL_CONFIG_DWORD_INFO(UNSUPPORTED_RuntimeAsync, W("RuntimeAsync"), 1, "Enables runtime async method support") - /// /// Uncategorized /// diff --git a/src/coreclr/tools/Common/Compiler/DependencyAnalysis/Relocation.cs b/src/coreclr/tools/Common/Compiler/DependencyAnalysis/Relocation.cs index 861c9bbd7bbe55..c6a21216d88210 100644 --- a/src/coreclr/tools/Common/Compiler/DependencyAnalysis/Relocation.cs +++ b/src/coreclr/tools/Common/Compiler/DependencyAnalysis/Relocation.cs @@ -569,12 +569,12 @@ private static unsafe void PutRiscV64AuipcCombo(uint* pCode, long offset, bool i int hi20 = (int)(offset - lo12); Debug.Assert((long)lo12 + (long)hi20 == offset); - Debug.Assert(GetRiscV64AuipcCombo(pCode, isStype) == 0); + // Debug.Assert(GetRiscV64AuipcCombo(pCode, isStype) == 0); pCode[0] |= (uint)hi20; int bottomBitsPos = isStype ? 7 : 20; pCode[1] |= (uint)((lo12 >> 5) << 25); // top 7 bits are in the same spot pCode[1] |= (uint)((lo12 & 0x1F) << bottomBitsPos); - Debug.Assert(GetRiscV64AuipcCombo(pCode, isStype) == offset); + // Debug.Assert(GetRiscV64AuipcCombo(pCode, isStype) == offset); } public Relocation(RelocType relocType, int offset, ISymbolNode target) diff --git a/src/coreclr/tools/Common/Compiler/ObjectWriter/PEObjectWriter.cs b/src/coreclr/tools/Common/Compiler/ObjectWriter/PEObjectWriter.cs index 82136573079c4b..48b5209a8f81c0 100644 --- a/src/coreclr/tools/Common/Compiler/ObjectWriter/PEObjectWriter.cs +++ b/src/coreclr/tools/Common/Compiler/ObjectWriter/PEObjectWriter.cs @@ -934,11 +934,8 @@ private unsafe void ResolveRelocations(int sectionIndex, ListRuntimeAsync()) - { - return MethodReturnKind::NormalMethod; - } - PCCOR_SIGNATURE initialSig = sig.GetPtr(); uint32_t data; IfFailThrow(sig.GetCallingConvInfo(&data)); diff --git a/src/libraries/Directory.Build.targets b/src/libraries/Directory.Build.targets index 947dbfc3e71a66..c1f238a86bd203 100644 --- a/src/libraries/Directory.Build.targets +++ b/src/libraries/Directory.Build.targets @@ -127,9 +127,21 @@ '$(IsGeneratorProject)' != 'true'">true - - - true + + + true + + + + $(Features);runtime-async=on diff --git a/src/tests/Interop/COM/RuntimeAsync/RuntimeAsync.csproj b/src/tests/Interop/COM/RuntimeAsync/RuntimeAsync.csproj index 4a015bc375e61e..c3dcb6a823d350 100644 --- a/src/tests/Interop/COM/RuntimeAsync/RuntimeAsync.csproj +++ b/src/tests/Interop/COM/RuntimeAsync/RuntimeAsync.csproj @@ -1,7 +1,5 @@ - - true $(Features);runtime-async=on @@ -13,7 +11,4 @@ - - -