From 94f411c6ce7354a49525d0cd2cadefffcbc66f37 Mon Sep 17 00:00:00 2001 From: Filip Navara Date: Tue, 26 Dec 2023 23:50:35 +0100 Subject: [PATCH] [ILCompiler] Fix formatting error in EHClause.WriteTo (#96317) * [ILCompiler] Fix formatting error in EHClause.WriteTo Contributes to #96310 * Apply suggestions from code review Co-authored-by: Jan Kotas * Fix more interpolations * $@ -> $ --------- Co-authored-by: Jan Kotas --- .../EHInfo.cs | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/coreclr/tools/aot/ILCompiler.Reflection.ReadyToRun/EHInfo.cs b/src/coreclr/tools/aot/ILCompiler.Reflection.ReadyToRun/EHInfo.cs index 0c8b7965f7239f..0fc90302cc4cac 100644 --- a/src/coreclr/tools/aot/ILCompiler.Reflection.ReadyToRun/EHInfo.cs +++ b/src/coreclr/tools/aot/ILCompiler.Reflection.ReadyToRun/EHInfo.cs @@ -114,29 +114,29 @@ public EHClause(ReadyToRunReader reader, int offset) /// Starting RVA of the runtime function is used to display the try / handler info as RVA intervals public void WriteTo(TextWriter writer, int methodRva, bool dumpRva) { - writer.Write($@"Flags {(uint)Flags:X2} "); - writer.Write($@"TryOff {TryOffset:X4} "); + writer.Write($"Flags {(uint)Flags:X2} "); + writer.Write($"TryOff {TryOffset:X4} "); if (dumpRva) - writer.Write(@"(RVA {(TryOffset + methodRva):X4}) "); - writer.Write($@"TryEnd {TryEnd:X4} "); + writer.Write($"(RVA {(TryOffset + methodRva):X4}) "); + writer.Write($"TryEnd {TryEnd:X4} "); if (dumpRva) - writer.Write(@"(RVA {(TryEnd + methodRva):X4}) "); - writer.Write($@"HndOff {HandlerOffset:X4} "); + writer.Write($"(RVA {(TryEnd + methodRva):X4}) "); + writer.Write($"HndOff {HandlerOffset:X4} "); if (dumpRva) - writer.Write(@"(RVA {(HandlerOffset + methodRva):X4}) "); - writer.Write($@"HndEnd {HandlerEnd:X4} "); + writer.Write($"(RVA {(HandlerOffset + methodRva):X4}) "); + writer.Write($"HndEnd {HandlerEnd:X4} "); if (dumpRva) - writer.Write(@"(RVA {(HandlerEnd + methodRva):X4}) "); - writer.Write($@"ClsFlt {ClassTokenOrFilterOffset:X4}"); + writer.Write($"(RVA {(HandlerEnd + methodRva):X4}) "); + writer.Write($"ClsFlt {ClassTokenOrFilterOffset:X4}"); switch (Flags & CorExceptionFlag.COR_ILEXCEPTION_CLAUSE_KIND_MASK) { case CorExceptionFlag.COR_ILEXCEPTION_CLAUSE_NONE: - writer.Write($" CATCH: {0}", ClassName ?? "null"); + writer.Write($" CATCH: {ClassName ?? "null"}"); break; case CorExceptionFlag.COR_ILEXCEPTION_CLAUSE_FILTER: - writer.Write($" FILTER (RVA {0:X4})", ClassTokenOrFilterOffset + methodRva); + writer.Write($" FILTER (RVA {(ClassTokenOrFilterOffset + methodRva):X4})"); break; case CorExceptionFlag.COR_ILEXCEPTION_CLAUSE_FINALLY: