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

Port CoreCLR's TypeNameBuilder to C#, and use it in Mono too #33701

Merged
merged 7 commits into from
Apr 3, 2020
Merged

Port CoreCLR's TypeNameBuilder to C#, and use it in Mono too #33701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
75662e1
Port CoreCLR's TypeNameBuilder to C#, and use it in Mono too
alexischr Mar 17, 2020
06fc308
Update src/libraries/System.Private.CoreLib/src/System/Reflection/Emi…
alexischr Mar 30, 2020
26e8ae1
Update src/libraries/System.Private.CoreLib/src/System/Reflection/Emi…
alexischr Mar 30, 2020
d7d5962
Review feedback
alexischr Mar 31, 2020
ce0cc8c
Update src/libraries/System.Private.CoreLib/src/System/Reflection/Emi…
alexischr Apr 1, 2020
b4cf76a
Update src/libraries/System.Private.CoreLib/src/System/Reflection/Emi…
alexischr Apr 2, 2020
6abeeb4
Review feedback
alexischr Apr 2, 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
1 change: 0 additions & 1 deletion 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 @@ -173,7 +173,6 @@
<Compile Include="$(BclSourcesRoot)\System\Reflection\Associates.cs" />
<Compile Include="$(BclSourcesRoot)\System\Reflection\ConstructorInfo.CoreCLR.cs" />
<Compile Include="$(BclSourcesRoot)\System\Reflection\CustomAttribute.cs" />
<Compile Include="$(BclSourcesRoot)\System\Reflection\Emit\AQNBuilder.cs" />
<Compile Include="$(BclSourcesRoot)\System\Reflection\Emit\AssemblyBuilder.cs" />
<Compile Include="$(BclSourcesRoot)\System\Reflection\Emit\AssemblyBuilderData.cs" />
<Compile Include="$(BclSourcesRoot)\System\Reflection\Emit\ConstructorBuilder.cs" />
Expand Down
158 changes: 0 additions & 158 deletions src/coreclr/src/System.Private.CoreLib/src/System/Reflection/Emit/AQNBuilder.cs
View file
Open in desktop

This file was deleted.

19 changes: 0 additions & 19 deletions src/coreclr/src/vm/ecalllist.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,24 +434,6 @@ FCFuncStart(gMdUtf8String)
QCFuncElement("HashCaseInsensitive", MdUtf8String::HashCaseInsensitive)
FCFuncEnd()

FCFuncStart(gTypeNameBuilder)
QCFuncElement("CreateTypeNameBuilder", TypeNameBuilder::_CreateTypeNameBuilder)
QCFuncElement("ReleaseTypeNameBuilder", TypeNameBuilder::_ReleaseTypeNameBuilder)
QCFuncElement("OpenGenericArguments", TypeNameBuilder::_OpenGenericArguments)
QCFuncElement("CloseGenericArguments", TypeNameBuilder::_CloseGenericArguments)
QCFuncElement("OpenGenericArgument", TypeNameBuilder::_OpenGenericArgument)
QCFuncElement("CloseGenericArgument", TypeNameBuilder::_CloseGenericArgument)
QCFuncElement("AddName", TypeNameBuilder::_AddName)
QCFuncElement("AddPointer", TypeNameBuilder::_AddPointer)
QCFuncElement("AddByRef", TypeNameBuilder::_AddByRef)
QCFuncElement("AddSzArray", TypeNameBuilder::_AddSzArray)
QCFuncElement("AddArray", TypeNameBuilder::_AddArray)
QCFuncElement("AddAssemblySpec", TypeNameBuilder::_AddAssemblySpec)
QCFuncElement("ToString", TypeNameBuilder::_ToString)
QCFuncElement("Clear", TypeNameBuilder::_Clear)
FCFuncEnd()


FCFuncStart(gSafeTypeNameParserHandle)
QCFuncElement("_ReleaseTypeNameParser", TypeName::QReleaseTypeNameParser)
FCFuncEnd()
Expand Down Expand Up @@ -1315,7 +1297,6 @@ FCClassElement("TimerQueue", "System.Threading", gTimerFuncs)
FCClassElement("Type", "System", gSystem_Type)
FCClassElement("TypeBuilder", "System.Reflection.Emit", gCOMClassWriter)
FCClassElement("TypeLoadException", "System", gTypeLoadExceptionFuncs)
FCClassElement("TypeNameBuilder", "System.Reflection.Emit", gTypeNameBuilder)
FCClassElement("TypeNameParser", "System", gTypeNameParser)
FCClassElement("TypedReference", "System", gTypedReferenceFuncs)
#ifdef FEATURE_COMINTEROP
Expand Down
132 changes: 0 additions & 132 deletions src/coreclr/src/vm/typestring.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,138 +28,6 @@
#include "ex.h"
#include "typedesc.h"

#if !defined(DACCESS_COMPILE) && !defined(CROSSGEN_COMPILE)
TypeNameBuilder * QCALLTYPE TypeNameBuilder::_CreateTypeNameBuilder()
{
QCALL_CONTRACT;

TypeNameBuilder * retVal = NULL;
BEGIN_QCALL;
retVal = new TypeNameBuilder();
END_QCALL;

return retVal;
}

void QCALLTYPE TypeNameBuilder::_ReleaseTypeNameBuilder(TypeNameBuilder * pTnb)
{
QCALL_CONTRACT;

BEGIN_QCALL;
delete pTnb;
END_QCALL;
}

void QCALLTYPE TypeNameBuilder::_ToString(TypeNameBuilder * pTnb, QCall::StringHandleOnStack retString)
{
QCALL_CONTRACT;

BEGIN_QCALL;
retString.Set(*pTnb->GetString());
END_QCALL;
}

void QCALLTYPE TypeNameBuilder::_AddName(TypeNameBuilder * pTnb, LPCWSTR wszName)
{
QCALL_CONTRACT;

BEGIN_QCALL;
pTnb->AddName(wszName);
END_QCALL;
}

void QCALLTYPE TypeNameBuilder::_AddAssemblySpec(TypeNameBuilder * pTnb, LPCWSTR wszAssemblySpec)
{
QCALL_CONTRACT;

BEGIN_QCALL;
pTnb->AddAssemblySpec(wszAssemblySpec);
END_QCALL;
}

void QCALLTYPE TypeNameBuilder::_OpenGenericArguments(TypeNameBuilder * pTnb)
{
QCALL_CONTRACT;

BEGIN_QCALL;
pTnb->OpenGenericArguments();
END_QCALL;
}

void QCALLTYPE TypeNameBuilder::_CloseGenericArguments(TypeNameBuilder * pTnb)
{
QCALL_CONTRACT;

BEGIN_QCALL;
pTnb->CloseGenericArguments();
END_QCALL;
}

void QCALLTYPE TypeNameBuilder::_OpenGenericArgument(TypeNameBuilder * pTnb)
{
QCALL_CONTRACT;

BEGIN_QCALL;
pTnb->OpenGenericArgument();
END_QCALL;
}

void QCALLTYPE TypeNameBuilder::_CloseGenericArgument(TypeNameBuilder * pTnb)
{
QCALL_CONTRACT;

BEGIN_QCALL;
pTnb->CloseGenericArgument();
END_QCALL;
}

void QCALLTYPE TypeNameBuilder::_AddPointer(TypeNameBuilder * pTnb)
{
QCALL_CONTRACT;

BEGIN_QCALL;
pTnb->AddPointer();
END_QCALL;
}

void QCALLTYPE TypeNameBuilder::_AddByRef(TypeNameBuilder * pTnb)
{
QCALL_CONTRACT;

BEGIN_QCALL;
pTnb->AddByRef();
END_QCALL;
}

void QCALLTYPE TypeNameBuilder::_AddSzArray(TypeNameBuilder * pTnb)
{
QCALL_CONTRACT;

BEGIN_QCALL;
pTnb->AddSzArray();
END_QCALL;
}

void QCALLTYPE TypeNameBuilder::_AddArray(TypeNameBuilder * pTnb, DWORD dwRank)
{
QCALL_CONTRACT;

BEGIN_QCALL;
pTnb->AddArray(dwRank);
END_QCALL;
}

void QCALLTYPE TypeNameBuilder::_Clear(TypeNameBuilder * pTnb)
{
QCALL_CONTRACT;

BEGIN_QCALL;
pTnb->Clear();
END_QCALL;
}

#endif

//
// TypeNameBuilder
//
Expand Down
16 changes: 0 additions & 16 deletions src/coreclr/src/vm/typestring.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,22 +32,6 @@ class TypeString;

class TypeNameBuilder
{
public:
static void QCALLTYPE _ReleaseTypeNameBuilder(TypeNameBuilder * pTnb);
static TypeNameBuilder * QCALLTYPE _CreateTypeNameBuilder();
static void QCALLTYPE _OpenGenericArguments(TypeNameBuilder * pTnb);
static void QCALLTYPE _CloseGenericArguments(TypeNameBuilder *pTnb);
static void QCALLTYPE _OpenGenericArgument(TypeNameBuilder * pTnb);
static void QCALLTYPE _CloseGenericArgument(TypeNameBuilder * pTnb);
static void QCALLTYPE _AddName(TypeNameBuilder * pTnb, LPCWSTR wszName);
static void QCALLTYPE _AddPointer(TypeNameBuilder * pTnb);
static void QCALLTYPE _AddByRef(TypeNameBuilder * pTnb);
static void QCALLTYPE _AddSzArray(TypeNameBuilder * pTnb);
static void QCALLTYPE _AddArray(TypeNameBuilder * pTnb, DWORD dwRank);
static void QCALLTYPE _AddAssemblySpec(TypeNameBuilder * pTnb, LPCWSTR wszAssemblySpec);
static void QCALLTYPE _ToString(TypeNameBuilder * pTnb, QCall::StringHandleOnStack retString);
static void QCALLTYPE _Clear(TypeNameBuilder * pTnb);

private:
friend class TypeString;
friend SString* TypeName::ToString(SString*, BOOL, BOOL, BOOL);
Expand Down
1 change: 1 addition & 0 deletions src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,6 +478,7 @@
<Compile Include="$(MSBuildThisFileDirectory)System\Reflection\Emit\SignatureToken.cs" />
<Compile Include="$(MSBuildThisFileDirectory)System\Reflection\Emit\StackBehaviour.cs" />
<Compile Include="$(MSBuildThisFileDirectory)System\Reflection\Emit\StringToken.cs" />
<Compile Include="$(MSBuildThisFileDirectory)System\Reflection\Emit\TypeNameBuilder.cs" />
<Compile Include="$(MSBuildThisFileDirectory)System\Reflection\Emit\TypeToken.cs" />
<Compile Include="$(MSBuildThisFileDirectory)System\Reflection\EventAttributes.cs" />
<Compile Include="$(MSBuildThisFileDirectory)System\Reflection\EventInfo.cs" />
Expand Down
Loading