From 08cd5ead0b8456e6d1bb616cb820ab8951684e01 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 24 Jul 2026 22:58:42 +0000 Subject: [PATCH] Remove PEAssembly::UrlToPath and PEAssembly::FindLastPathSeparator Co-authored-by: elinor-fung <47805090+elinor-fung@users.noreply.github.com> --- src/coreclr/vm/nativeimage.cpp | 2 +- src/coreclr/vm/nativelibrary.cpp | 2 +- src/coreclr/vm/peassembly.cpp | 34 -------------------------------- src/coreclr/vm/peassembly.h | 2 -- 4 files changed, 2 insertions(+), 38 deletions(-) diff --git a/src/coreclr/vm/nativeimage.cpp b/src/coreclr/vm/nativeimage.cpp index fb4fe4a91072d3..f79812ce9acc2e 100644 --- a/src/coreclr/vm/nativeimage.cpp +++ b/src/coreclr/vm/nativeimage.cpp @@ -117,7 +117,7 @@ namespace SString path{ componentModulePath }; SString::Iterator lastPathSeparatorIter = path.End(); size_t pathDirLength = 0; - if (PEAssembly::FindLastPathSeparator(path, lastPathSeparatorIter)) + if (path.FindBack(lastPathSeparatorIter, DIRECTORY_SEPARATOR_CHAR_A)) { pathDirLength = (lastPathSeparatorIter - path.Begin()) + 1; } diff --git a/src/coreclr/vm/nativelibrary.cpp b/src/coreclr/vm/nativelibrary.cpp index 3f4f7ddacf77f2..041662c802ce0f 100644 --- a/src/coreclr/vm/nativelibrary.cpp +++ b/src/coreclr/vm/nativelibrary.cpp @@ -389,7 +389,7 @@ namespace _ASSERTE(!Path::IsRelative(path)); SString::Iterator lastPathSeparatorIter = path.End(); - if (PEAssembly::FindLastPathSeparator(path, lastPathSeparatorIter)) + if (path.FindBack(lastPathSeparatorIter, DIRECTORY_SEPARATOR_CHAR_A)) { lastPathSeparatorIter++; path.Truncate(lastPathSeparatorIter); diff --git a/src/coreclr/vm/peassembly.cpp b/src/coreclr/vm/peassembly.cpp index 10c8f409f17d20..ead8898e69d3cf 100644 --- a/src/coreclr/vm/peassembly.cpp +++ b/src/coreclr/vm/peassembly.cpp @@ -931,40 +931,6 @@ void PEAssembly::PathToUrl(SString &string) } } -void PEAssembly::UrlToPath(SString &string) -{ - CONTRACTL - { - THROWS; - GC_NOTRIGGER; - } - CONTRACTL_END; - - SString::Iterator i = string.Begin(); - - SString sss2(SString::Literal, W("file://")); -#if !defined(TARGET_UNIX) - SString sss3(SString::Literal, W("file:///")); - if (string.MatchCaseInsensitive(i, sss3)) - string.Delete(i, 8); - else -#endif - if (string.MatchCaseInsensitive(i, sss2)) - string.Delete(i, 7); - -#if !defined(TARGET_UNIX) - while (string.Find(i, W('/'))) - { - string.Replace(i, W('\\')); - } -#endif -} - -BOOL PEAssembly::FindLastPathSeparator(const SString &path, SString::Iterator &i) -{ - return path.FindBack(i, DIRECTORY_SEPARATOR_CHAR_A); -} - // ------------------------------------------------------------ // Metadata access // ------------------------------------------------------------ diff --git a/src/coreclr/vm/peassembly.h b/src/coreclr/vm/peassembly.h index f8d4244e75778f..50f762dc27f786 100644 --- a/src/coreclr/vm/peassembly.h +++ b/src/coreclr/vm/peassembly.h @@ -346,8 +346,6 @@ class PEAssembly final // ------------------------------------------------------------ static void PathToUrl(SString& string); - static void UrlToPath(SString& string); - static BOOL FindLastPathSeparator(const SString& path, SString::Iterator& i); private: // ------------------------------------------------------------