Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove the experimental Utf8String type and tests from the runtime repo #44574

Merged
merged 4 commits into from
Nov 12, 2020
Merged

Remove the experimental Utf8String type and tests from the runtime repo #44574

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
06aa295
Mechanical deletion of Utf8String, Utf8Span and S.U8S.Experimental
trylek Nov 12, 2020
da695c5
Remove FEATURE_UTF8STRING sections from CoreCLR runtime code
trylek Nov 12, 2020
e4740d9
Remove previously overlooked reference to Utf8String from Mono SPC
trylek Nov 12, 2020
1523b22
Additional removals per JanK's and Levi's PR feedback
trylek Nov 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions src/coreclr/clr.featuredefines.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@

<!-- Features we're currently flighting, but don't intend to ship in officially supported releases -->
jkotas marked this conversation as resolved.
Show resolved Hide resolved
<PropertyGroup Condition="'$(IsPrerelease)' == 'true'">
<FeatureUtf8String>true</FeatureUtf8String>
<!-- FeatureXXX>true</FeatureXXX -->
</PropertyGroup>

Expand All @@ -60,7 +59,6 @@
<DefineConstants Condition="'$(FeatureTypeEquivalence)' == 'true'">$(DefineConstants);FEATURE_TYPEEQUIVALENCE</DefineConstants>
<DefineConstants Condition="'$(FeatureBasicFreeze)' == 'true'">$(DefineConstants);FEATURE_BASICFREEZE</DefineConstants>
<DefineConstants Condition="'$(FeaturePortableShuffleThunks)' == 'true'">$(DefineConstants);FEATURE_PORTABLE_SHUFFLE_THUNKS</DefineConstants>
<DefineConstants Condition="'$(FeatureUtf8String)' == 'true'">$(DefineConstants);FEATURE_UTF8STRING</DefineConstants>

<DefineConstants Condition="'$(ProfilingSupportedBuild)' == 'true'">$(DefineConstants);PROFILING_SUPPORTED</DefineConstants>
<DefineConstants Condition="'$(FeatureProfAttach)' == 'true'">$(DefineConstants);FEATURE_PROFAPI_ATTACH_DETACH</DefineConstants>
Expand Down
1 change: 0 additions & 1 deletion src/coreclr/clrdefinitions.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ include(clrfeatures.cmake)

# Features we're currently flighting, but don't intend to ship in officially supported releases
jkotas marked this conversation as resolved.
Show resolved Hide resolved
if (PRERELEASE)
add_definitions(-DFEATURE_UTF8STRING)
# add_definitions(-DFEATURE_XXX)
endif (PRERELEASE)

Expand Down
3 changes: 0 additions & 3 deletions src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,9 +253,6 @@
<Compile Include="$(BclSourcesRoot)\Internal\Runtime\InteropServices\ComActivator.cs" />
<Compile Include="$(BclSourcesRoot)\Internal\Runtime\InteropServices\InMemoryAssemblyLoader.cs" />
</ItemGroup>
<ItemGroup Condition="'$(FeatureUtf8String)' == 'true'">
jkotas marked this conversation as resolved.
Show resolved Hide resolved
<Compile Include="$(BclSourcesRoot)\System\Utf8String.CoreCLR.cs" />
</ItemGroup>
<ItemGroup Condition="'$(FeatureComWrappers)' == 'true'">
<Compile Include="$(BclSourcesRoot)\System\Runtime\InteropServices\ComWrappers.cs" />
</ItemGroup>
Expand Down
333 changes: 0 additions & 333 deletions src/coreclr/src/System.Private.CoreLib/src/System/Utf8String.CoreCLR.cs
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions src/coreclr/src/classlibnative/bcltype/objectnative.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,9 +236,6 @@ FCIMPL1(Object*, ObjectNative::AllocateUninitializedClone, Object* pObjUNSAFE)

// assert that String has overloaded the Clone() method
_ASSERTE(pMT != g_pStringClass);
#ifdef FEATURE_UTF8STRING
_ASSERTE(pMT != g_pUtf8StringClass);
#endif // FEATURE_UTF8STRING

if (pMT->IsArray()) {
refClone = DupArrayForCloning((BASEARRAYREF)refClone);
Expand Down
3 changes: 0 additions & 3 deletions src/coreclr/src/inc/dacvars.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,9 +162,6 @@ DEFINE_DACVAR(ULONG, UNKNOWN_POINTER_TYPE, dac__g_pObjectClass, ::g_pObjectClass
DEFINE_DACVAR(ULONG, UNKNOWN_POINTER_TYPE, dac__g_pRuntimeTypeClass, ::g_pRuntimeTypeClass)
DEFINE_DACVAR(ULONG, UNKNOWN_POINTER_TYPE, dac__g_pCanonMethodTableClass, ::g_pCanonMethodTableClass)
DEFINE_DACVAR(ULONG, UNKNOWN_POINTER_TYPE, dac__g_pStringClass, ::g_pStringClass)
#ifdef FEATURE_UTF8STRING
DEFINE_DACVAR(ULONG, UNKNOWN_POINTER_TYPE, dac__g_pUtf8StringClass, ::g_pUtf8StringClass)
#endif // FEATURE_UTF8STRING
DEFINE_DACVAR(ULONG, UNKNOWN_POINTER_TYPE, dac__g_pArrayClass, ::g_pArrayClass)
DEFINE_DACVAR(ULONG, UNKNOWN_POINTER_TYPE, dac__g_pSZArrayHelperClass, ::g_pSZArrayHelperClass)
DEFINE_DACVAR(ULONG, UNKNOWN_POINTER_TYPE, dac__g_pNullableClass, ::g_pNullableClass)
Expand Down
5 changes: 0 additions & 5 deletions src/coreclr/src/vm/appdomain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1517,11 +1517,6 @@ void SystemDomain::LoadBaseSystemClasses()
// Load String
g_pStringClass = CoreLibBinder::LoadPrimitiveType(ELEMENT_TYPE_STRING);

#ifdef FEATURE_UTF8STRING
// Load Utf8String
g_pUtf8StringClass = CoreLibBinder::GetClass(CLASS__UTF8_STRING);
#endif // FEATURE_UTF8STRING

#ifndef CROSSGEN_COMPILE
ECall::PopulateManagedStringConstructors();
#endif // CROSSGEN_COMPILE
Expand Down
Loading