Skip to content

Commit 9e5b136

Browse files
committed
[dev.boringcrypto.go1.12] all: merge go1.12.17 into dev.boringcrypto.go1.12
Change-Id: I2d0dd2e7e141bbcebd3a4ae72d1e149997af3d26
2 parents f74e681 + 46cb016 commit 9e5b136

File tree

3 files changed

+13
-4
lines changed

3 files changed

+13
-4
lines changed

doc/devel/release.html

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,12 @@ <h3 id="go1.12.minor">Minor revisions</h3>
146146
1.12.16 milestone</a> on our issue tracker for details.
147147
</p>
148148

149+
<p>
150+
go1.12.17 (released 2020/02/12) includes a fix to the runtime. See
151+
the <a href="https://github.com/golang/go/issues?q=milestone%3AGo1.12.17+label%3ACherryPickApproved">Go
152+
1.12.17 milestone</a> on our issue tracker for details.
153+
</p>
154+
149155
<h2 id="go1.11">go1.11 (released 2018/08/24)</h2>
150156

151157
<p>

src/cmd/go/internal/modload/query_test.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,6 @@ var queryTests = []struct {
119119
{path: queryRepoV2, query: "v0.0.1+foo", vers: "v2.0.0-20180704023347-179bc86b1be3"},
120120
{path: queryRepoV2, query: "latest", vers: "v2.5.5"},
121121

122-
{path: queryRepoV3, query: "latest", vers: "v3.0.0-20180704024501-e0cf3de987e6"},
123-
124122
{path: emptyRepo, query: "latest", vers: "v0.0.0-20180704023549-7bb914627242"},
125123
{path: emptyRepo, query: ">v0.0.0", err: `no matching versions for query ">v0.0.0"`},
126124
{path: emptyRepo, query: "<v10.0.0", err: `no matching versions for query "<v10.0.0"`},

src/runtime/os_windows.go

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -262,8 +262,9 @@ func loadOptionalSyscalls() {
262262

263263
func monitorSuspendResume() {
264264
const (
265-
_DEVICE_NOTIFY_CALLBACK = 2
266-
_ERROR_FILE_NOT_FOUND = 2
265+
_DEVICE_NOTIFY_CALLBACK = 2
266+
_ERROR_FILE_NOT_FOUND = 2
267+
_ERROR_INVALID_PARAMETERS = 87
267268
)
268269
type _DEVICE_NOTIFY_SUBSCRIBE_PARAMETERS struct {
269270
callback uintptr
@@ -301,6 +302,10 @@ func monitorSuspendResume() {
301302
// also have their clock on "program time", and therefore
302303
// don't want or need this anyway.
303304
return
305+
case _ERROR_INVALID_PARAMETERS:
306+
// This is seen when running in Windows Docker.
307+
// See issue 36557.
308+
return
304309
default:
305310
println("runtime: PowerRegisterSuspendResumeNotification failed with errno=", ret)
306311
throw("runtime: PowerRegisterSuspendResumeNotification failure")

0 commit comments

Comments
 (0)