Weaken assert around folding constants (#103026)

MichalStrehovsky · web-flow · commit 0e107cde48aa · 2024-06-04T20:04:52.000+02:00
I ran into this assert with native AOT. It seems to be too strong - we are not allowed to fold IconHandle constants with prejit.
diff --git a/src/coreclr/jit/morph.cpp b/src/coreclr/jit/morph.cpp
@@ -9426,7 +9426,8 @@ GenTree* Compiler::fgMorphSmpOp(GenTree* tree, MorphAddrContext* mac, bool* optA
             }
 
             /* Any constant cases should have been folded earlier */
-            noway_assert(!op1->OperIsConst() || opts.OptimizationDisabled() || optValnumCSE_phase);
+            noway_assert(!op1->OperIsConst() || op1->IsIconHandle() || opts.OptimizationDisabled() ||
+                         optValnumCSE_phase);
             break;
 
         case GT_CKFINITE:

Original file line number	Diff line number	Diff line change
`@@ -9426,7 +9426,8 @@ GenTree* Compiler::fgMorphSmpOp(GenTree* tree, MorphAddrContext* mac, bool* optA`
`9426`	`9426`	`}`
`9427`	`9427`
`9428`	`9428`	`/* Any constant cases should have been folded earlier */`
`9429`		`- noway_assert(!op1->OperIsConst() \|\| opts.OptimizationDisabled() \|\| optValnumCSE_phase);`
	`9429`	`+ noway_assert(!op1->OperIsConst() \|\| op1->IsIconHandle() \|\| opts.OptimizationDisabled() \|\|`
	`9430`	`+ optValnumCSE_phase);`
`9430`	`9431`	`break;`
`9431`	`9432`
`9432`	`9433`	`case GT_CKFINITE:`