From c93dedf700aaa1e817b03e91e6abe6ae4b654fc3 Mon Sep 17 00:00:00 2001
From: Shuhei Kadowaki <40514306+aviatesk@users.noreply.github.com>
Date: Fri, 25 Aug 2023 17:32:17 +0900
Subject: [PATCH] adjust tests for latest Julia master (#584)

* adjust tests for latest Julia master
* 1.9-nightly to 1.10-night
---
 .github/workflows/CI.yml |  2 +-
 test/interpret.jl        | 17 ++++++++---------
 test/limits.jl           |  2 +-
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 7c3ad11d401744..394a33f26659a5 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -15,7 +15,7 @@ jobs:
         version:
           - '1.6'     # LTS
           - '1'       # current stable
-          - '1.9-nightly'
+          - '1.10-nightly'
           - 'nightly'
         os:
           - ubuntu-latest
diff --git a/test/interpret.jl b/test/interpret.jl
index 06db61c96b9620..0b73463ae6c69b 100644
--- a/test/interpret.jl
+++ b/test/interpret.jl
@@ -770,15 +770,10 @@ end
 end
 
 @testset "#476 isdefined QuoteNode" begin
-    f() = !true
-
-    @generated function g()
-        ci = @code_lowered f()
-        ci.code[1] = Expr(:isdefined, QuoteNode(Float64))
-        return ci
+    @eval function issue476()
+        return $(Expr(:isdefined, QuoteNode(Float64)))
     end
-
-    @test @interpret(g()) === true
+    @test (true === @interpret issue476())
 end
 
 const override_world = typemax(Csize_t) - 1
@@ -883,7 +878,11 @@ end
     end
 
     ci = code_typed(foo, NTuple{2, Int}; optimize=false)[][1]
-    mi = Core.Compiler.method_instances(foo, NTuple{2, Int})[]
+    @static if VERSION ≥ v"1.10.0-DEV.873"
+        mi = Core.Compiler.method_instances(foo, NTuple{2, Int}, Base.get_world_counter())[]
+    else
+        mi = Core.Compiler.method_instances(foo, NTuple{2, Int})[]
+    end
 
     frameargs = Any[foo, 1, 2]
     framecode = JuliaInterpreter.FrameCode(mi.def, ci)
diff --git a/test/limits.jl b/test/limits.jl
index 7ac0a6ff46675e..2d4f467348d602 100644
--- a/test/limits.jl
+++ b/test/limits.jl
@@ -86,7 +86,7 @@ module EvalLimited end
     end
     modexs = collect(ExprSplitter(EvalLimited, ex))
     @static if isdefined(Core, :get_binding_type)
-        nstmts = 10*12 + 20 # 10 * 12 statements per iteration + α
+        nstmts = 10*15 + 20 # 10 * 15 statements per iteration + α
     else
         nstmts = 9*12 + 20 # 10 * 9 statements per iteration + α
     end