Fix bugs compiling the occil tests

LADSoft · Sep 23, 2024 · 24ff614 · 24ff614
1 parent 05f8083
commit 24ff614
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/occparse/import.cpp b/src/occparse/import.cpp
@@ -213,8 +213,8 @@ Type* Importer::TranslateType(DotNetPELib::Type* in)
         {
             rv = Type::MakeType(BasicType::lref_, rv);
         }
+        rv->UpdateRootTypes();
     }
-    rv->UpdateRootTypes();
     return rv;
 }
 

diff --git a/src/occparse/overload.cpp b/src/occparse/overload.cpp
@@ -3568,7 +3568,7 @@ static bool getFuncConversions(SYMBOL* sym, CallSite* f, Type* atp, SYMBOL* pare
                         initializerListType = it->second->byClass.val;
                     }
                 }
-                else if (tp1->IsArray() && (ita != itae) && (!(*ita)->tp || !(*ita)->tp->IsArray()) )
+                else if (Optimizer::architecture != ARCHITECTURE_MSIL && tp1->IsArray() && (ita != itae) && (!(*ita)->tp || !(*ita)->tp->IsArray()) )
                 {
                     auto tp2 = tp1;
                     while (tp2->IsArray()) tp2 = tp2->BaseType()->btp;