[wasm][coreclr] 2nd part of call helpers generator, reverse calls

src/coreclr/vm/wasm/callhelpers-interp-to-managed.cpp

@@ -638,7 +638,6 @@ const StringToWasmSigThunk g_wasmThunks[] = {
     { "viiinni", (void*)&CallFunc_I32_I32_I32_IND_IND_I32_RetVoid },
     { "viin", (void*)&CallFunc_I32_I32_IND_RetVoid },
     { "viinni", (void*)&CallFunc_I32_I32_IND_IND_I32_RetVoid },
-    { "viin", (void*)&CallFunc_I32_I32_IND_RetVoid },
     { "viinnii", (void*)&CallFunc_I32_I32_IND_IND_I32_I32_RetVoid },
     { "vin", (void*)&CallFunc_I32_IND_RetVoid },
     { "vini", (void*)&CallFunc_I32_IND_I32_RetVoid },

src/coreclr/vm/wasm/callhelpers.hpp

@@ -23,6 +23,7 @@ struct ReverseThunkMapValue
 struct ReverseThunkMapEntry
 {
     ULONG key;
+    ULONG fallbackKey;
     ReverseThunkMapValue value;
 };
 

src/coreclr/vm/wasm/helpers.cpp

@@ -623,10 +623,33 @@ namespace
         if (!GetSignatureKey(sig, keyBuffer, keyBufferLen))
             return NULL;
 
-        return LookupThunk(keyBuffer);
+        void* thunk = LookupThunk(keyBuffer);
+#ifdef _DEBUG
+        if (thunk == NULL)
+            printf("WASM calli missing for key: %s\n", keyBuffer);
+#endif
+        return thunk;
+    }
+
+    ULONG CreateFallbackKey(MethodDesc* pMD)
+    {
+        _ASSERTE(pMD != nullptr);
+
+        // the fallback key is in the form $"{MethodName}#{Method.GetParameters().Length}:{AssemblyName}:{Namespace}:{TypeName}";
+        LPCUTF8 pszNamespace = nullptr;
+        LPCUTF8 pszName = pMD->GetMethodTable()->GetFullyQualifiedNameInfo(&pszNamespace);
+        MetaSig sig(pMD);
+        SString strFullName;
+        strFullName.Printf("%s#%d:%s:%s:%s",
+            pMD->GetName(),
+            sig.NumFixedArgs(),
+            pMD->GetAssembly()->GetSimpleName(),
+            pszNamespace != nullptr ? pszNamespace : "",
+            pszName);
+
+        return strFullName.Hash();
     }
 
-    // TODO: This hashing function should be replaced.
     ULONG CreateKey(MethodDesc* pMD)
     {
         _ASSERTE(pMD != nullptr);
@@ -645,30 +668,54 @@ namespace
 
     typedef MapSHash<ULONG, const ReverseThunkMapValue*> HashToReverseThunkHash;
     HashToReverseThunkHash* reverseThunkCache = nullptr;
+    HashToReverseThunkHash* reverseThunkFallbackCache = nullptr;
+
+    HashToReverseThunkHash* CreateReverseThunkHashTable(bool fallback)
+    {
+        HashToReverseThunkHash* newTable = new HashToReverseThunkHash();
+        newTable->Reallocate(g_ReverseThunksCount * HashToReverseThunkHash::s_density_factor_denominator / HashToReverseThunkHash::s_density_factor_numerator + 1);
+        for (size_t i = 0; i < g_ReverseThunksCount; i++)
+        {
+            newTable->Add(fallback ? g_ReverseThunks[i].fallbackKey : g_ReverseThunks[i].key, &g_ReverseThunks[i].value);
+        }
+
+        HashToReverseThunkHash **ppCache = fallback ? &reverseThunkFallbackCache : &reverseThunkCache;
+        if (InterlockedCompareExchangeT(ppCache, newTable, nullptr) != nullptr)
+        {
+            // Another thread won the race, discard ours
+            delete newTable;
+        }
+        return *ppCache;
+    }
 
     const ReverseThunkMapValue* LookupThunk(MethodDesc* pMD)
     {
         HashToReverseThunkHash* table = VolatileLoad(&reverseThunkCache);
         if (table == nullptr)
         {
-            HashToReverseThunkHash* newTable = new HashToReverseThunkHash();
-            newTable->Reallocate(g_ReverseThunksCount * HashToReverseThunkHash::s_density_factor_denominator / HashToReverseThunkHash::s_density_factor_numerator + 1);
-            for (size_t i = 0; i < g_ReverseThunksCount; i++)
-            {
-                newTable->Add(g_ReverseThunks[i].key, &g_ReverseThunks[i].value);
-            }
-
-            if (InterlockedCompareExchangeT(&reverseThunkCache, newTable, nullptr) != nullptr)
-            {
-                // Another thread won the race, discard ours
-                delete newTable;
-            }
-            table = reverseThunkCache;
+            table = CreateReverseThunkHashTable(false /* fallback */);
         }
 
         ULONG key = CreateKey(pMD);
 
+        // Try primary key, it is based on Assembly fully qualified name and method token
         const ReverseThunkMapValue* thunk;
+        if (table->Lookup(key, &thunk))
+        {
+            return thunk;
+        }
+
+        // Try fallback key, that is based on method properties and assembly name
+        // The fallback is used when the assembly is trimmed and the token and assembly fully qualified name
+        // may change.
+        table = VolatileLoad(&reverseThunkFallbackCache);
+        if (table == nullptr)
+        {
+            table = CreateReverseThunkHashTable(true /* fallback */);
+        }
+
+        key = CreateFallbackKey(pMD);
+
         bool success = table->Lookup(key, &thunk);
         return success ? thunk : nullptr;
     }

src/tasks/WasmAppBuilder/WasmAppBuilder.csproj

@@ -1,11 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppToolCurrent);$(NetFrameworkToolCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppToolCurrent)</TargetFramework>
     <Nullable>enable</Nullable>
     <NoWarn>$(NoWarn),CA1050</NoWarn>
     <!-- Ignore nullable warnings on net4* -->
-    <NoWarn Condition="$([MSBuild]::GetTargetFrameworkIdentifier('$(TargetFramework)')) == '.NETFramework'">$(NoWarn),CS8604,CS8602</NoWarn>
-    <NoWarn Condition="$([MSBuild]::GetTargetFrameworkIdentifier('$(TargetFramework)')) != '.NETFramework'">$(NoWarn),CA1850</NoWarn>
+    <NoWarn>$(NoWarn),CA1850</NoWarn>
     <EnableSingleFileAnalyzer>false</EnableSingleFileAnalyzer>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -46,19 +45,14 @@
   <Target Name="GetFilesToPackage" Returns="@(FilesToPackage)">
     <ItemGroup>
       <!-- .NETCoreApp -->
-      <FilesToPackage Include="$(OutputPath)$(NetCoreAppToolCurrent)\$(MSBuildProjectName)*"
+      <FilesToPackage Include="$(OutputPath)$(MSBuildProjectName)*"
                       TargetPath="tasks\$(NetCoreAppToolCurrent)" />
-      <FilesToPackage Include="$(OutputPath)$(NetCoreAppToolCurrent)\Microsoft.NET.WebAssembly.Webcil.dll"
+      <FilesToPackage Include="$(OutputPath)Microsoft.NET.WebAssembly.Webcil.dll"
                       TargetPath="tasks\$(NetCoreAppToolCurrent)" />
-
-
-      <!-- For .NETFramework we need all the dependent assemblies too, so copy from the publish folder -->
-      <FilesToPackage Include="$(OutputPath)$(NetFrameworkToolCurrent)\*"
-                      TargetPath="tasks\$(NetFrameworkToolCurrent)" />
     </ItemGroup>
   </Target>
 
-  <UsingTask TaskName="ManagedToNativeGenerator" Runtime="NET" TaskFactory="TaskHostFactory" AssemblyFile="$(OutputPath)$(NetCoreAppToolCurrent)\WasmAppBuilder.dll" />
+  <UsingTask TaskName="ManagedToNativeGenerator" Runtime="NET" TaskFactory="TaskHostFactory" AssemblyFile="$(OutputPath)\WasmAppBuilder.dll" />
 
   <Target Name="RunGenerator" DependsOnTargets="Build" Condition="'$(AssembliesScanPath)' != ''">
       <ItemGroup>
@@ -73,7 +67,7 @@
       <ManagedToNativeGenerator
           Assemblies="@(WasmPInvokeAssembly)"
           PInvokeModules="@(WasmPInvokeModule)"
-          PInvokeOutputPath="$(GeneratorOutputPath)todo-pinvoke-helpers.cpp"
+          PInvokeOutputPath="$(GeneratorOutputPath)callhelpers-reverse.cpp"
           InterpToNativeOutputPath="$(GeneratorOutputPath)callhelpers-interp-to-managed.cpp">
           <Output TaskParameter="FileWrites" ItemName="FileWrites" />
       </ManagedToNativeGenerator>