Implement ResolveVirtualFunction helper for ARM (#97755)

dotnet · Jan 31, 2024 · ba8993f · ba8993f
1 parent 32db100
commit ba8993f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 39 deletions.
diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/Target_ARM/ARMDebug.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/Target_ARM/ARMDebug.cs
diff --git a/...aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/Target_ARM/ARMReadyToRunHelperNode.cs b/...aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/Target_ARM/ARMReadyToRunHelperNode.cs
@@ -159,14 +159,12 @@ protected override void EmitCode(NodeFactory factory, ref ARMEmitter encoder, bo
 
  case ReadyToRunHelperId.ResolveVirtualFunction:
  {
- ARMDebug.EmitHelperNYIAssert(factory, ref encoder, ReadyToRunHelperId.ResolveVirtualFunction);
- /*
- ***
- NOT TESTED!!!
- ***
  MethodDesc targetMethod = (MethodDesc)Target;
  if (targetMethod.OwningType.IsInterface)
  {
+ // Not tested
+ encoder.EmitDebugBreak();
+
  encoder.EmitMOV(encoder.TargetRegister.Arg1, factory.InterfaceDispatchCell(targetMethod));
  encoder.EmitJMP(factory.ExternSymbol("RhpResolveInterfaceMethod"));
  }
@@ -185,7 +183,6 @@ NOT TESTED!!!
  ((short)(EETypeNode.GetVTableOffset(factory.Target.PointerSize) + (slot * factory.Target.PointerSize))));
  encoder.EmitRET();
  }
- */
  }
  break;
 

diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/ILCompiler.Compiler.csproj b/src/coreclr/tools/aot/ILCompiler.Compiler/ILCompiler.Compiler.csproj
@@ -587,7 +587,6 @@
  <Compile Include="Compiler\DependencyAnalysis\Target_ARM\ARMJumpStubNode.cs" />
  <Compile Include="Compiler\DependencyAnalysis\Target_ARM\ARMReadyToRunHelperNode.cs" />
  <Compile Include="Compiler\DependencyAnalysis\Target_ARM\ARMReadyToRunGenericHelperNode.cs" />
- <Compile Include="Compiler\DependencyAnalysis\Target_ARM\ARMDebug.cs" />
  <Compile Include="Compiler\DependencyAnalysis\Target_LoongArch64\LoongArch64JumpStubNode.cs" />
  <Compile Include="Compiler\DependencyAnalysis\Target_LoongArch64\LoongArch64ReadyToRunHelperNode.cs" />
  <Compile Include="Compiler\DependencyAnalysis\Target_LoongArch64\LoongArch64ReadyToRunGenericHelperNode.cs" />