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 deleted file mode 100644 index e87f2dc6d353b..0000000000000 --- a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/Target_ARM/ARMDebug.cs +++ /dev/null @@ -1,32 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. - -using ILCompiler.DependencyAnalysis.ARM; - -namespace ILCompiler.DependencyAnalysis -{ - public static class ARMDebug - { - [System.Diagnostics.Conditional("DEBUG")] - public static void EmitNYIAssert(NodeFactory factory, ref ARMEmitter encoder, string message, - [System.Runtime.CompilerServices.CallerFilePath] string sourceFilePath = null, - [System.Runtime.CompilerServices.CallerMemberName] string memberName = null, - [System.Runtime.CompilerServices.CallerLineNumber] int sourceLineNumber = 0) - { - ISymbolNode NYI_Assert = factory.ExternSymbol("NYI_Assert"); - string CallInfoPrefix = " " + sourceFilePath + "(" + sourceLineNumber.ToString() + "): method " + memberName + ": "; - ISymbolNode messageSymbol = factory.ConstantUtf8String(CallInfoPrefix + message); - encoder.EmitMOV(encoder.TargetRegister.Arg0, messageSymbol); - encoder.EmitJMP(NYI_Assert); - } - - [System.Diagnostics.Conditional("DEBUG")] - public static void EmitHelperNYIAssert(NodeFactory factory, ref ARMEmitter encoder, ReadyToRunHelperId hId, - [System.Runtime.CompilerServices.CallerFilePath] string sourceFilePath = null, - [System.Runtime.CompilerServices.CallerMemberName] string memberName = null, - [System.Runtime.CompilerServices.CallerLineNumber] int sourceLineNumber = 0) - { - EmitNYIAssert(factory, ref encoder, hId.ToString() + " is not implemented", sourceFilePath, memberName, sourceLineNumber); - } - } -} diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/Target_ARM/ARMReadyToRunHelperNode.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/Target_ARM/ARMReadyToRunHelperNode.cs index b07ebf96fac95..8323c6057803d 100644 --- a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/Target_ARM/ARMReadyToRunHelperNode.cs +++ b/src/coreclr/tools/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 index 52a6e15a01317..54640d825bc03 100644 --- a/src/coreclr/tools/aot/ILCompiler.Compiler/ILCompiler.Compiler.csproj +++ b/src/coreclr/tools/aot/ILCompiler.Compiler/ILCompiler.Compiler.csproj @@ -587,7 +587,6 @@ -