Small test cleanup (#43831)

Deconflict some identifiers, make test run properly in Main module.

Author: Keno

test/compiler/codegen.jl

@@ -364,16 +364,16 @@ macro aliasscope(body)
     end)
 end
 
-struct Const{T<:Array}
+struct ConstAliasScope{T<:Array}
     a::T
 end
 
-@eval Base.getindex(A::Const, i1::Int) = Core.const_arrayref($(Expr(:boundscheck)), A.a, i1)
-@eval Base.getindex(A::Const, i1::Int, i2::Int, I::Int...) =  (@inline; Core.const_arrayref($(Expr(:boundscheck)), A.a, i1, i2, I...))
+@eval Base.getindex(A::ConstAliasScope, i1::Int) = Core.const_arrayref($(Expr(:boundscheck)), A.a, i1)
+@eval Base.getindex(A::ConstAliasScope, i1::Int, i2::Int, I::Int...) =  (@inline; Core.const_arrayref($(Expr(:boundscheck)), A.a, i1, i2, I...))
 
 function foo31018!(a, b)
     @aliasscope for i in eachindex(a, b)
-        a[i] = Const(b)[i]
+        a[i] = ConstAliasScope(b)[i]
     end
 end
 io = IOBuffer()
@@ -588,7 +588,9 @@ struct A40855
     b::Union{Nothing, Int}
 end
 g() = string(A40855(X40855, 1))
-@test g() == "$(@__MODULE__).A40855($(@__MODULE__).X40855, 1)"
+let mod_prefix = (@__MODULE__) == Core.Main ? "" : "$(@__MODULE__)."
+    @test g() == "$(mod_prefix)A40855($(mod_prefix)X40855, 1)"
+end
 
 # issue #40612
 f40612(a, b) = a|b === a|b

test/compiler/inline.jl

@@ -667,41 +667,41 @@ begin
     end
     @noinline a::Point +ₚ b::Point = Point(a.x + b.x, a.y + b.y)
 
-    function compute(n)
+    function compute_idem_n(n)
         a = Point(1.5, 2.5)
         b = Point(2.25, 4.75)
         for i in 0:(n-1)
             a = @inline (a +ₚ b) +ₚ b
         end
         return a.x, a.y
     end
-    let src = code_typed1(compute, (Int,))
+    let src = code_typed1(compute_idem_n, (Int,))
         @test count(isinvoke(:+ₚ), src.code) == 0 # successful inlining
     end
 
-    function compute(n)
+    function compute_idem_n(n)
         a = Point(1.5, 2.5)
         b = Point(2.25, 4.75)
         for i in 0:(n-1)
             a = (a +ₚ b) +ₚ b
         end
         return a.x, a.y
     end
-    let src = code_typed1(compute, (Int,))
+    let src = code_typed1(compute_idem_n, (Int,))
         @test count(isinvoke(:+ₚ), src.code) == 2 # no inlining
     end
 
-    compute(42) # this execution should discard the cache of `+ₚ` since it's declared as `@noinline`
+    compute_idem_n(42) # this execution should discard the cache of `+ₚ` since it's declared as `@noinline`
 
-    function compute(n)
+    function compute_idem_n(n)
         a = Point(1.5, 2.5)
         b = Point(2.25, 4.75)
         for i in 0:(n-1)
             @inline a = (a +ₚ b) +ₚ b
         end
         return a.x, a.y
     end
-    let src = code_typed1(compute, (Int,))
+    let src = code_typed1(compute_idem_n, (Int,))
         @test count(isinvoke(:+ₚ), src.code) == 0 # no inlining !?
     end
 end

test/compiler/irpasses.jl

@@ -284,15 +284,15 @@ struct Point
     y::Float64
 end
 #=@inline=# add(a::Point, b::Point) = Point(a.x + b.x, a.y + b.y)
-function compute()
+function compute_points()
     a = Point(1.5, 2.5)
     b = Point(2.25, 4.75)
     for i in 0:(100000000-1)
         a = add(add(a, b), b)
     end
     a.x, a.y
 end
-let src = code_typed1(compute)
+let src = code_typed1(compute_points)
     @test !any(isnew, src.code)
 end