fixes

Author: IanButterworth

stdlib/Profile/Project.toml

@@ -10,9 +10,10 @@ StyledStrings = "1.11.0"
 
 [extras]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
+InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
 Logging = "56ddb016-857b-54e1-b83d-db4d58db5568"
 Serialization = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [targets]
-test = ["Base64", "Logging", "Serialization", "Test"]
+test = ["Base64", "InteractiveUtils", "Logging", "Serialization", "Test"]

stdlib/Profile/src/Profile.jl

@@ -554,8 +554,8 @@ function short_path(spath::Symbol, filenamecache::Dict{Symbol, Tuple{String,Stri
         elseif startswith(path_norm, lib_dir)
             remainder = only(split(path_norm, lib_dir, keepempty=false))
             return (isfile(path_norm) ? path_norm : ""), "@julialib", remainder
-        elseif startswith(path, COMPILER_DIR)
-            remainder = only(split(path, COMPILER_DIR, keepempty=false))
+        elseif contains(path, COMPILER_DIR)
+            remainder = split(path, COMPILER_DIR, keepempty=false)[end]
             possible_compiler_path = normpath(joinpath(Sys.BINDIR, Base.DATAROOTDIR, "julia", "Compiler", remainder))
             return (isfile(possible_compiler_path) ? possible_compiler_path : ""), "@Compiler", remainder
         elseif isabspath(path)

stdlib/Profile/test/runtests.jl

@@ -204,19 +204,21 @@ end
     @test getline(values(fdictc)) == getline(values(fdict0)) + 2
 end
 
+import InteractiveUtils
+
 @testset "Module short names" begin
     Profile.clear()
-    @profile peakflops()
+    @profile InteractiveUtils.peakflops()
     io = IOBuffer()
-    IOContext(io, :displaysize=>(1000,1000))
+    ioc = IOContext(io, :displaysize=>(1000,1000))
     Profile.print(ioc, C=true)
     str = String(take!(io))
-    @test occursin("@Compiler/src", str)
-    @test occursin("@Base/src", str)
-    @test occursin("@InteractiveUtils/src", str)
-    @test occursin("@LinearAlgebra/src", str)
-    @test occursin("@juliasrc", str)
-    @test occursin("@julialib", str)
+    @test occursin("@Compiler/src/", str)
+    @test occursin("@Base/", str)
+    @test occursin("@InteractiveUtils/src/", str)
+    @test occursin("@LinearAlgebra/src/", str)
+    @test occursin("@juliasrc/", str)
+    @test occursin("@julialib/", str)
 end
 
 # Profile deadlocking in compilation (debuginfo registration)