Reuse "literal" keyword in IL and get rid of "const"

dotnet · Aug 6, 2023 · 902e196 · 902e196
1 parent edab29d
commit 902e196
Show file tree

Hide file tree

Showing 8 changed files with 6,327 additions and 4,949 deletions.
diff --git a/src/coreclr/ilasm/asmparse.y b/src/coreclr/ilasm/asmparse.y
@@ -142,7 +142,6 @@
 
         /* newly added tokens go here */
 %token  CONSTRAINT_
-%token  CONST_
 
         /* nonTerminals */
 %type <string> dottedName id methodName atOpt slashedName
@@ -504,8 +503,8 @@ conTyparAttribs         : /* EMPTY */                       { $$ = 0; }
                         | conTyparAttrib conTyparAttribs    { $$ = $1 | $2; }
                         ;
 
-typars                  : CONST_ conTyparAttribs type tyBound dottedName typarsRest {$$ = new TyParList($2, $3, $4, $5, $6); }
-                        | CONST_ conTyparAttribs type dottedName typarsRest {$$ = new TyParList($2, $3, NULL, $4, $5); }
+typars                  : LITERAL_ conTyparAttribs type tyBound dottedName typarsRest {$$ = new TyParList($2, $3, $4, $5, $6); }
+                        | LITERAL_ conTyparAttribs type dottedName typarsRest {$$ = new TyParList($2, $3, NULL, $4, $5); }
                         | typarAttribs tyBound dottedName typarsRest {$$ = new TyParList($1, $2, $3, $4);}
                         | typarAttribs dottedName typarsRest   {$$ = new TyParList($1, NULL, $2, $3);}
                         ;
@@ -1727,7 +1726,7 @@ type                    : CLASS_ className                    { if($2 == PASM->m
                         | OBJECT_                             { $$ = new BinStr(); $$->appendInt8(ELEMENT_TYPE_OBJECT); }
                         | VALUE_ CLASS_ className             { $$ = parser->MakeTypeClass(ELEMENT_TYPE_VALUETYPE, $3); }
                         | VALUETYPE_ className                { $$ = parser->MakeTypeClass(ELEMENT_TYPE_VALUETYPE, $2); }
-                        | CONST_ constTypeArg                 { $$ = $2; $$->insertInt8(ELEMENT_TYPE_CTARG); }
+                        | constTypeArg                        { $$ = $1; $$->insertInt8(ELEMENT_TYPE_CTARG); }
                         | type '[' ']'                        { $$ = $1; $$->insertInt8(ELEMENT_TYPE_SZARRAY); }
                         | type '[' bounds1 ']'                { $$ = parser->MakeTypeArray(ELEMENT_TYPE_ARRAY, $1, $3); }
                         | type '&'                            { $$ = $1; $$->insertInt8(ELEMENT_TYPE_BYREF); }

diff --git a/src/coreclr/ilasm/prebuilt/asmparse.cpp b/src/coreclr/ilasm/prebuilt/asmparse.cpp
diff --git a/src/coreclr/ildasm/dasm.cpp b/src/coreclr/ildasm/dasm.cpp
@@ -3123,7 +3123,7 @@ char *DumpGenericPars(_Inout_updates_(SZSTRING_SIZE) char* szString, mdToken tok
         if (RidFromToken(tkType))
         {
             CQuickBytes out;
-            szptr += sprintf_s(szptr,SZSTRING_REMAINING_SIZE(szptr),"const %s ",PrettyPrintClass(&out, tkType, g_pImport));
+            szptr += sprintf_s(szptr,SZSTRING_REMAINING_SIZE(szptr),"literal %s ",PrettyPrintClass(&out, tkType, g_pImport));
         }
         if (chName)
         {

diff --git a/src/coreclr/inc/formattype.cpp b/src/coreclr/inc/formattype.cpp
@@ -608,7 +608,6 @@ PCCOR_SIGNATURE PrettyPrintType(
                 str = "class ";
                 goto DO_CLASS;
             case ELEMENT_TYPE_CTARG        :
-                appendStr(out, KEYWORD("const "));
                 Reiterate = TRUE;
                 HasData = TRUE;
                 break;

diff --git a/src/coreclr/inc/il_kywd.h b/src/coreclr/inc/il_kywd.h
@@ -268,7 +268,6 @@
                 /* Null reference keyword for InitOpt */
     KYWD( "nullref",        NULLREF_,           NO_VALUE )
     KYWD( "type",           TYPE_,              NO_VALUE )
-    KYWD( "const",          CONST_,             NO_VALUE )
     KYWD( ".interfaceimpl", _INTERFACEIMPL,     NO_VALUE )
                 /* Header flags keywords */
     KYWD( ".subsystem",     _SUBSYSTEM,         NO_VALUE )

diff --git a/src/coreclr/jit/eeinterface.cpp b/src/coreclr/jit/eeinterface.cpp
@@ -104,7 +104,6 @@ void Compiler::eePrintJitType(StringPrinter* printer, var_types jitType)
 //
 void Compiler::eePrintConstValue(StringPrinter* printer, CorInfoType valueType, uint64_t value)
 {
-    printer->Append("const ");
     printer->Append(varTypeName(JitType2PreciseVarType(valueType)));
     printer->Append("(");
     char buffer[64];

diff --git a/src/coreclr/vm/sigformat.cpp b/src/coreclr/vm/sigformat.cpp
@@ -357,7 +357,6 @@ void SigFormat::AddTypeString(Module* pModule, SigPointer sig, const SigTypeCont
 
 void SigFormat::AddConstValueTypeString(CorElementType constValueType, uint64_t constValue)
 {
-    AddString("const ");
     char buffer[42];
     switch (constValueType)
     {

diff --git a/src/coreclr/vm/typestring.cpp b/src/coreclr/vm/typestring.cpp
@@ -779,7 +779,7 @@ void TypeString::AppendType(TypeNameBuilder& tnb, TypeHandle ty, Instantiation t
             PCCOR_SIGNATURE pSig;
             ULONG cSig;
             IfFailThrow(ty.GetModule()->GetMDImport()->GetTypeSpecFromToken(mdType, &pSig, &cSig));
-            SmallStackSString typeName(SString::Utf8, "const ");
+            SmallStackSString typeName(SString::Utf8, "literal ");
             LPCSTR str;
             switch (*pSig++)
             {
@@ -890,7 +890,6 @@ void TypeString::AppendType(TypeNameBuilder& tnb, TypeHandle ty, Instantiation t
     // or a const value
     else if (ty.IsConstValue())
     {
-        tnb.Append(W("const "));
         AppendType(tnb, ty.AsConstValue()->GetConstValueType(), Instantiation(), format & ~FormatAssembly);
         tnb.Append(W("("));
         AppendConstValue(tnb, ty.AsConstValue()->GetConstValueType().GetInternalCorElementType(), ty.AsConstValue()->GetConstValue());
@@ -1231,7 +1230,6 @@ void TypeString::AppendTypeKey(TypeNameBuilder& tnb, TypeKey *pTypeKey, DWORD fo
     }
     else if (kind == ELEMENT_TYPE_CTARG)
     {
-        tnb.Append(W("const "));
         TypeHandle valueType = pTypeKey->GetConstValueType();
         AppendType(tnb, valueType, Instantiation(), format & ~FormatAssembly);
         tnb.Append(W("("));