diff options
| author | Ian Lance Taylor <iant@golang.org> | 2019-01-18 19:04:36 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2019-01-18 19:04:36 +0000 |
| commit | 4f4a855d82a889cebcfca150a7a43909bcb6a346 (patch) | |
| tree | f12bae0781920fa34669fe30b6f4615a86d9fb80 /libgo/go/context | |
| parent | 225220d668dafb8262db7012bced688acbe63b33 (diff) | |
libgo: update to Go1.12beta2
Reviewed-on: https://go-review.googlesource.com/c/158019
gotools/:
* Makefile.am (go_cmd_vet_files): Update for Go1.12beta2 release.
(GOTOOLS_TEST_TIMEOUT): Increase to 600.
(check-runtime): Export LD_LIBRARY_PATH before computing GOARCH
and GOOS.
(check-vet): Copy golang.org/x/tools into check-vet-dir.
* Makefile.in: Regenerate.
gcc/testsuite/:
* go.go-torture/execute/names-1.go: Stop using debug/xcoff, which
is no longer externally visible.
From-SVN: r268084
Diffstat (limited to 'libgo/go/context')
| -rw-r--r-- | libgo/go/context/context.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libgo/go/context/context.go b/libgo/go/context/context.go index 1b4fa41b8cc..21a40d59477 100644 --- a/libgo/go/context/context.go +++ b/libgo/go/context/context.go @@ -210,8 +210,7 @@ func Background() Context { // TODO returns a non-nil, empty Context. Code should use context.TODO when // it's unclear which Context to use or it is not yet available (because the // surrounding function has not yet been extended to accept a Context -// parameter). TODO is recognized by static analysis tools that determine -// whether Contexts are propagated correctly in a program. +// parameter). func TODO() Context { return todo } @@ -394,7 +393,7 @@ func WithDeadline(parent Context, d time.Time) (Context, CancelFunc) { dur := time.Until(d) if dur <= 0 { c.cancel(true, DeadlineExceeded) // deadline has already passed - return c, func() { c.cancel(true, Canceled) } + return c, func() { c.cancel(false, Canceled) } } c.mu.Lock() defer c.mu.Unlock() |