Fix test failures

dotnet · Jul 1, 2021 · 0ef7bd6 · 0ef7bd6
1 parent 942dc24
commit 0ef7bd6
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ArrayMapNode.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ArrayMapNode.cs
@@ -57,12 +57,15 @@ public override ObjectData GetData(NodeFactory factory, bool relocsOnly = false)
 
                 var arrayType = (ArrayType)type;
 
+                // This optimization is not compatible with canInlineTypeCheck on JIT/EE interface returning
+                // CORINFO_INLINE_TYPECHECK_PASS unconditionally.
+                //
                 // If we're generating a template for this type, we can skip generating the hashtable entry
                 // since the type loader can just create this type at runtime if something needs it. It's
                 // okay to have multiple EETypes for the same array type.
-                var canonArrayType = arrayType.ConvertToCanonForm(CanonicalFormKind.Specific);
-                if (arrayType != canonArrayType && factory.NativeLayout.TemplateTypeLayout(canonArrayType).Marked)
-                    continue;
+                // var canonArrayType = arrayType.ConvertToCanonForm(CanonicalFormKind.Specific);
+                // if (arrayType != canonArrayType && factory.NativeLayout.TemplateTypeLayout(canonArrayType).Marked)
+                //     continue;
 
                 // Look at the constructed type symbol. If a constructed type wasn't emitted, then the array map entry isn't valid for use
                 IEETypeNode arrayTypeSymbol = factory.ConstructedTypeSymbol(arrayType);