optimize the cctor call

dotnet · kunalspathak · Jan 17, 2024 · Jul 7, 2023 · Jul 10, 2023 · Jul 11, 2023
commit daca626a189860d523f35563d715c3a04f46d91a
diff --git a/src/coreclr/jit/compiler.cpp b/src/coreclr/jit/compiler.cpp
@@ -2396,6 +2396,7 @@ unsigned ReinterpretHexAsDecimal(unsigned in)
 
 void Compiler::compInitOptions(JitFlags* jitFlags)
 {
+    useNewFeature = false;
     opts = {};
 
     if (compIsForInlining())

diff --git a/src/coreclr/jit/compiler.h b/src/coreclr/jit/compiler.h
@@ -2531,6 +2531,7 @@ class Compiler
 
 #ifdef DEBUG
     bool verbose;
+    bool useNewFeature;
     bool verboseTrees;
     bool shouldUseVerboseTrees();
     bool asciiTrees; // If true, dump trees using only ASCII characters

diff --git a/src/coreclr/jit/importer.cpp b/src/coreclr/jit/importer.cpp
@@ -3860,24 +3860,31 @@ GenTree* Compiler::impImportStaticFieldAddress(CORINFO_RESOLVED_TOKEN* pResolved
                 }
                 else if (pFieldInfo->fieldAccessor == CORINFO_FIELD_STATIC_TLS_MANAGED_LAZY)
                 {
-                    op1->AsCall()->SetExpTLSFieldAccessLazyCtor();
-                    // TODO: Add GT_COMMA here.
-                    // op1 = GT_COMMA(gtUnusedValue(CORINFO_HELP_READYTORUN_GCSTATIC_BASE), op1);
-                    GenTreeCall* lazyCtorCall       = gtNewHelperCallNode(CORINFO_HELP_READYTORUN_GCSTATIC_BASE, TYP_BYREF);
-                    if (pResolvedToken->hClass == info.compClassHnd && m_preferredInitCctor == CORINFO_HELP_UNDEF)
-                    {
-                        m_preferredInitCctor = pFieldInfo->helper;
-                    }
-                    lazyCtorCall->setEntryPoint(pFieldInfo->fieldLookup);
-                    lazyCtorCall->gtInitClsHnd = pResolvedToken->hClass;
-                    lazyCtorCall->gtFlags |= callFlags;
 
                     op1->AsCall()->gtInitClsHnd = pResolvedToken->hClass;
                     op1->gtFlags |= callFlags;
-
                     op1->AsCall()->setEntryPoint(pFieldInfo->fieldLookup);
 
-                    op1 = gtNewOperNode(GT_COMMA, op1->TypeGet(), gtUnusedValNode(lazyCtorCall), op1);
+                    if (useNewFeature)
+                    {
+                        GenTreeCall* lazyCtorCall =
+                            gtNewHelperCallNode(CORINFO_HELP_READYTORUN_GCSTATIC_BASE, TYP_BYREF);
+                        if (pResolvedToken->hClass == info.compClassHnd && m_preferredInitCctor == CORINFO_HELP_UNDEF)
+                        {
+                            m_preferredInitCctor = pFieldInfo->helper;
+                        }
+                        lazyCtorCall->setEntryPoint(pFieldInfo->fieldLookup);
+                        lazyCtorCall->gtInitClsHnd = pResolvedToken->hClass;
+                        lazyCtorCall->gtFlags |= callFlags;
+                        lazyCtorCall->SetArgNeedsEnclosingType();
+
+                        op1 = gtNewOperNode(GT_COMMA, op1->TypeGet(), gtUnusedValNode(lazyCtorCall), op1);
+                    }
+                    else
+                    {
+                        op1->AsCall()->SetExpTLSFieldAccessLazyCtor();
+                    }
+
                     op1 = gtNewOperNode(GT_ADD, op1->TypeGet(), op1, gtNewIconNode(pFieldInfo->offset, innerFldSeq));
                     break;
                 }

diff --git a/src/coreclr/jit/valuenum.cpp b/src/coreclr/jit/valuenum.cpp
@@ -12366,8 +12366,7 @@ void Compiler::fgValueNumberHelperCallFunc(GenTreeCall* call, VNFunc vnf, ValueN
         {
             if (IsTargetAbi(CORINFO_NATIVEAOT_ABI))
             {
-                // TODO: Do this for R2R as well
-                if (call->IsArgNeedsEnclosingType())
+                if (call->IsArgNeedsEnclosingType() && useNewFeature)
                 {
                     useEnclosingTypeAsArg0 = true;
                     assert((call->gtInitClsHnd != NO_CLASS_HANDLE) && ((ssize_t)call->gtInitClsHnd != 0xcccccccc));