fix incorrect error path in schedule (#31812)

(cherry picked from commit 4c30076)
JuliaLang · May 9, 2019 · c3dc4ce · c3dc4ce
1 parent 7d0baab
commit c3dc4ce
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/base/task.jl b/base/task.jl
@@ -457,12 +457,12 @@ true
 """
 function schedule(t::Task, @nospecialize(arg); error=false)
     # schedule a task to be (re)started with the given value or exception
-    t.state == :runnable || error("schedule: Task not runnable")
+    t.state == :runnable || Base.error("schedule: Task not runnable")
     if error
         t.queue === nothing || Base.list_deletefirst!(t.queue, t)
         t.exception = arg
     else
-        t.queue === nothing || error("schedule: Task not runnable")
+        t.queue === nothing || Base.error("schedule: Task not runnable")
         t.result = arg
     end
     enq_work(t)

diff --git a/test/channels.jl b/test/channels.jl
@@ -389,3 +389,9 @@ let a = Ref(0)
     GC.gc()
     @test a[] == 1
 end
+
+# trying to `schedule` a finished task
+let t = @async nothing
+    wait(t)
+    @test_throws ErrorException("schedule: Task not runnable") schedule(t, nothing)
+end