call gtFoldExpr after fgMorphExpandInstanceField (#103648)

EgorBo · web-flow · commit 9c51d32db656 · 2024-06-19T14:39:20.000+02:00
diff --git a/src/coreclr/jit/morph.cpp b/src/coreclr/jit/morph.cpp
@@ -5110,6 +5110,12 @@ GenTree* Compiler::fgMorphExpandInstanceField(GenTree* tree, MorphAddrContext* m
         {
             addr->SetHasOrderingSideEffect();
         }
+
+        if (addr->gtGetOp1()->OperIsConst() && addr->gtGetOp2()->OperIsConst())
+        {
+            // Fold it if we have const-handle + const-offset
+            addr = gtFoldExprConst(addr);
+        }
     }
 
     if (addExplicitNullCheck)

Original file line number	Diff line number	Diff line change
`@@ -5110,6 +5110,12 @@ GenTree* Compiler::fgMorphExpandInstanceField(GenTree* tree, MorphAddrContext* m`
`5110`	`5110`	`{`
`5111`	`5111`	`addr->SetHasOrderingSideEffect();`
`5112`	`5112`	`}`
	`5113`	`+`
	`5114`	`+ if (addr->gtGetOp1()->OperIsConst() && addr->gtGetOp2()->OperIsConst())`
	`5115`	`+ {`
	`5116`	`+ // Fold it if we have const-handle + const-offset`
	`5117`	`+ addr = gtFoldExprConst(addr);`
	`5118`	`+ }`
`5113`	`5119`	`}`
`5114`	`5120`
`5115`	`5121`	`if (addExplicitNullCheck)`