Merge branch 'jit-static-readonly-field-invariant' of github.com:Egor…

…Bo/runtime-1 into jit-static-readonly-field-invariant
dotnet · Feb 25, 2021 · 43360d3 · 43360d3
2 parents a89448e + 61f7ea3
commit 43360d3
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/coreclr/jit/morph.cpp b/src/coreclr/jit/morph.cpp
@@ -6492,8 +6492,9 @@ GenTree* Compiler::fgMorphField(GenTree* tree, MorphAddrContext* mac)
                 if ((info.compCompHnd->getStaticFieldCurrentClass(symHnd, &plsSpeculative) != NO_CLASS_HANDLE) &&
                     !plsSpeculative)
                 {
-                    JITDUMP("Marking static read-only field '%s' as invariant.\n", eeGetFieldName(symHnd));
+                    JITDUMP("Marking initialized static read-only field '%s' as invariant.\n", eeGetFieldName(symHnd));
                     tree->gtFlags |= GTF_IND_INVARIANT;
+                    tree->gtFlags &= ~GTF_ICON_INITCLASS;
                     addr->gtFlags = GTF_ICON_CONST_PTR;
                 }