Skip to content

Commit f4e5ebd

Browse files
committed
all: merge go1.9.3 into dev.boringcrypto.go1.9
Change-Id: I184dd79b7398a8989e0b8284c7c81bb59343c1cb
2 parents c36033a + a563954 commit f4e5ebd

38 files changed

+829
-207
lines changed

doc/contrib.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,6 @@ <h3><a href="/doc/contribute.html">Contributing code</a></h3>
117117
<p>
118118
Check <a href="//golang.org/issue">the tracker</a> for
119119
open issues that interest you. Those labeled
120-
<a href="https://github.com/golang/go/issues?q=is%3Aopen+is%3Aissue+label%3Ahelpwanted">helpwanted</a>
120+
<a href="https://github.com/golang/go/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22">help wanted</a>
121121
are particularly in need of outside help.
122122
</p>

doc/devel/release.html

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,14 @@ <h3 id="go1.9.minor">Minor revisions</h3>
4949
1.9.2 milestone</a> on our issue tracker for details.
5050
</p>
5151

52+
<p>
53+
go1.9.3 (released 2018/01/22) includes fixes to the compiler, runtime,
54+
and the <code>database/sql</code>, <code>math/big</code>, <code>net/http</code>,
55+
and <code>net/url</code> packages.
56+
See the <a href="https://github.com/golang/go/issues?q=milestone%3AGo1.9.3">Go
57+
1.9.3 milestone</a> on our issue tracker for details.
58+
</p>
59+
5260
<h2 id="go1.8">go1.8 (released 2017/02/16)</h2>
5361

5462
<p>
@@ -89,6 +97,16 @@ <h3 id="go1.8.minor">Minor revisions</h3>
8997
1.8.4 milestone</a> on our issue tracker for details.
9098
</p>
9199

100+
<p>
101+
go1.8.5 (released 2017/10/25) includes fixes to the compiler, linker, runtime,
102+
documentation, <code>go</code> command,
103+
and the <code>crypto/x509</code> and <code>net/smtp</code> packages.
104+
It includes a fix to a bug introduced in Go 1.8.4 that broke <code>go</code> <code>get</code>
105+
of non-Git repositories under certain conditions.
106+
See the <a href="https://github.com/golang/go/issues?q=milestone%3AGo1.8.5">Go
107+
1.8.5 milestone</a> on our issue tracker for details.
108+
</p>
109+
92110
<h2 id="go1.7">go1.7 (released 2016/08/15)</h2>
93111

94112
<p>
@@ -262,7 +280,7 @@ <h3 id="go1.3.minor">Minor revisions</h3>
262280
</p>
263281

264282
<p>
265-
go1.3.3 (released 2014/09/30) includes further bug fixes to cgo, the runtime package, and the nacl port.
283+
go1.3.3 (released 2014/09/30) includes further bug fixes to cgo, the runtime package, and the nacl port.
266284
See the <a href="https://github.com/golang/go/commits/go1.3.3">change history</a> for details.
267285
</p>
268286

@@ -326,7 +344,7 @@ <h2 id="go1">go1 (released 2012/03/28)</h2>
326344
</p>
327345

328346
<p>
329-
The go1 release corresponds to
347+
The go1 release corresponds to
330348
<code><a href="weekly.html#2012-03-27">weekly.2012-03-27</a></code>.
331349
</p>
332350

@@ -342,7 +360,7 @@ <h3 id="go1.minor">Minor revisions</h3>
342360

343361
<p>
344362
go1.0.2 (released 2012/06/13) was issued to fix two bugs in the implementation
345-
of maps using struct or array keys:
363+
of maps using struct or array keys:
346364
<a href="//golang.org/issue/3695">issue 3695</a> and
347365
<a href="//golang.org/issue/3573">issue 3573</a>.
348366
It also includes many minor code and documentation fixes.

doc/docs.html

Lines changed: 29 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<!--{
22
"Title": "Documentation",
3-
"Path": "/doc/"
3+
"Path": "/doc/",
4+
"Template": true
45
}-->
56

67
<p>
@@ -33,14 +34,20 @@ <h2 id="learning">Learning Go</h2>
3334

3435
<img class="gopher" src="/doc/gopher/doc.png"/>
3536

36-
<h3 id="go_tour"><a href="//tour.golang.org/">A Tour of Go</a></h3>
37+
<h3 id="go_tour">
38+
{{if $.GoogleCN}}
39+
A Tour of Go
40+
{{else}}
41+
<a href="//tour.golang.org/">A Tour of Go</a>
42+
{{end}}
43+
</h3>
3744
<p>
3845
An interactive introduction to Go in three sections.
3946
The first section covers basic syntax and data structures; the second discusses
4047
methods and interfaces; and the third introduces Go's concurrency primitives.
4148
Each section concludes with a few exercises so you can practice what you've
42-
learned. You can <a href="//tour.golang.org/">take the tour online</a> or
43-
install it locally with:
49+
learned. You can {{if not $.GoogleCN}}<a href="//tour.golang.org/">take the tour
50+
online</a> or{{end}} install it locally with:
4451
</p>
4552
<p>
4653
<pre>
@@ -51,10 +58,13 @@ <h3 id="go_tour"><a href="//tour.golang.org/">A Tour of Go</a></h3>
5158

5259
<h3 id="code"><a href="code.html">How to write Go code</a></h3>
5360
<p>
54-
Also available as a
55-
<a href="//www.youtube.com/watch?v=XCsL89YtqCs">screencast</a>, this doc
56-
explains how to use the <a href="/cmd/go/">go command</a> to fetch, build, and
57-
install packages, commands, and run tests.
61+
{{if not $.GoogleCN}}
62+
Also available as a <a href="//www.youtube.com/watch?v=XCsL89YtqCs">screencast</a>, this
63+
{{else}}
64+
This
65+
{{end}}
66+
doc explains how to use the <a href="/cmd/go/">go command</a>
67+
to fetch, build, and install packages, commands, and run tests.
5868
</p>
5969

6070
<h3 id="editors"><a href="editors.html">Editor plugins and IDEs</a></h3>
@@ -115,9 +125,11 @@ <h3 id="release"><a href="/doc/devel/release.html">Release History</a></h3>
115125

116126
<h2 id="articles">Articles</h2>
117127

128+
{{if not $.GoogleCN}}
118129
<h3 id="blog"><a href="//blog.golang.org/">The Go Blog</a></h3>
119130
<p>The official blog of the Go project, featuring news and in-depth articles by
120131
the Go team and guests.</p>
132+
{{end}}
121133

122134
<h4>Codewalks</h4>
123135
<p>
@@ -130,6 +142,7 @@ <h4>Codewalks</h4>
130142
<li><a href="/doc/articles/wiki/">Writing Web Applications</a> - building a simple web application.</li>
131143
</ul>
132144

145+
{{if not $.GoogleCN}}
133146
<h4>Language</h4>
134147
<ul>
135148
<li><a href="/blog/json-rpc-tale-of-interfaces">JSON-RPC: a tale of interfaces</a></li>
@@ -150,17 +163,20 @@ <h4>Packages</h4>
150163
<li><a href="/blog/go-image-package">The Go image package</a> - the fundamentals of the <a href="/pkg/image/">image</a> package.</li>
151164
<li><a href="/blog/go-imagedraw-package">The Go image/draw package</a> - the fundamentals of the <a href="/pkg/image/draw/">image/draw</a> package.</li>
152165
</ul>
166+
{{end}}
153167

154168
<h4>Tools</h4>
155169
<ul>
156170
<li><a href="/doc/articles/go_command.html">About the Go command</a> - why we wrote it, what it is, what it's not, and how to use it.</li>
157-
<li><a href="/blog/c-go-cgo">C? Go? Cgo!</a> - linking against C code with <a href="/cmd/cgo/">cgo</a>.</li>
158171
<li><a href="/doc/gdb">Debugging Go Code with GDB</a></li>
172+
<li><a href="/doc/articles/race_detector.html">Data Race Detector</a> - a manual for the data race detector.</li>
173+
<li><a href="/doc/asm">A Quick Guide to Go's Assembler</a> - an introduction to the assembler used by Go.</li>
174+
{{if not $.GoogleCN}}
175+
<li><a href="/blog/c-go-cgo">C? Go? Cgo!</a> - linking against C code with <a href="/cmd/cgo/">cgo</a>.</li>
159176
<li><a href="/blog/godoc-documenting-go-code">Godoc: documenting Go code</a> - writing good documentation for <a href="/cmd/godoc/">godoc</a>.</li>
160177
<li><a href="/blog/profiling-go-programs">Profiling Go Programs</a></li>
161-
<li><a href="/doc/articles/race_detector.html">Data Race Detector</a> - a manual for the data race detector.</li>
162178
<li><a href="/blog/race-detector">Introducing the Go Race Detector</a> - an introduction to the race detector.</li>
163-
<li><a href="/doc/asm">A Quick Guide to Go's Assembler</a> - an introduction to the assembler used by Go.</li>
179+
{{end}}
164180
</ul>
165181

166182
<h4 id="articles_more">More</h4>
@@ -169,7 +185,7 @@ <h4 id="articles_more">More</h4>
169185
<a href="/wiki">Wiki</a> for more Go articles.
170186
</p>
171187

172-
188+
{{if not $.GoogleCN}}
173189
<h2 id="talks">Talks</h2>
174190

175191
<img class="gopher" src="/doc/gopher/talks.png"/>
@@ -200,7 +216,7 @@ <h4 id="talks_more">More</h4>
200216
<p>
201217
See the <a href="/talks">Go Talks site</a> and <a href="/wiki/GoTalks">wiki page</a> for more Go talks.
202218
</p>
203-
219+
{{end}}
204220

205221
<h2 id="nonenglish">Non-English Documentation</h2>
206222

doc/go1.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -775,7 +775,7 @@ <h3 id="errors">The error type and errors package</h3>
775775
</p>
776776

777777
{{code "/doc/progs/go1.go" `/ErrSyntax/`}}
778-
778+
779779
<p>
780780
<em>Updating</em>:
781781
Running <code>go</code> <code>fix</code> will update almost all code affected by the change.
@@ -1827,7 +1827,7 @@ <h3 id="strconv">The strconv package</h3>
18271827
<tr><td>Uitob(x, b)</td> <td>FormatUint(uint64(x), b)</td></tr>
18281828
<tr><td>Uitob64(x, b)</td> <td>FormatUint(x, b)</td></tr>
18291829
</table>
1830-
1830+
18311831
<p>
18321832
<em>Updating</em>:
18331833
Running <code>go</code> <code>fix</code> will update almost all code affected by the change.
@@ -1841,7 +1841,7 @@ <h3 id="strconv">The strconv package</h3>
18411841
<h3 id="templates">The template packages</h3>
18421842

18431843
<p>
1844-
The <code>template</code> and <code>exp/template/html</code> packages have moved to
1844+
The <code>template</code> and <code>exp/template/html</code> packages have moved to
18451845
<a href="/pkg/text/template/"><code>text/template</code></a> and
18461846
<a href="/pkg/html/template/"><code>html/template</code></a>.
18471847
More significant, the interface to these packages has been simplified.
@@ -2035,4 +2035,4 @@ <h2 id="releases">Packaged releases</h2>
20352035
Installation details are described on the
20362036
<a href="/doc/install">Getting Started</a> page, while
20372037
the distributions themselves are listed on the
2038-
<a href="https://golang.org/dl/">downloads page</a>.
2038+
<a href="/dl/">downloads page</a>.

doc/help.html

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<!--{
22
"Title": "Help",
3-
"Path": "/help/"
3+
"Path": "/help/",
4+
"Template": true
45
}-->
56

67
<div id="manual-nav"></div>
@@ -9,6 +10,7 @@ <h2 id="help">Get help</h2>
910

1011
<img class="gopher" src="/doc/gopher/help.png"/>
1112

13+
{{if not $.GoogleCN}}
1214
<h3 id="mailinglist"><a href="https://groups.google.com/group/golang-nuts">Go Nuts Mailing List</a></h3>
1315
<p>
1416
Get help from Go users, and share your work on the official mailing list.
@@ -31,10 +33,12 @@ <h3 id="slack"><a href="https://blog.gopheracademy.com/gophers-slack-community/"
3133
<h3 id="irc"><a href="irc:irc.freenode.net/go-nuts">Go IRC Channel</a></h3>
3234
<p>Get live support at <b>#go-nuts</b> on <b>irc.freenode.net</b>, the official
3335
Go IRC channel.</p>
36+
{{end}}
3437

3538
<h3 id="faq"><a href="/doc/faq">Frequently Asked Questions (FAQ)</a></h3>
3639
<p>Answers to common questions about Go.</p>
3740

41+
{{if not $.GoogleCN}}
3842
<h2 id="inform">Stay informed</h2>
3943

4044
<h3 id="announce"><a href="https://groups.google.com/group/golang-announce">Go Announcements Mailing List</a></h3>
@@ -64,6 +68,7 @@ <h3 id="gotime"><a href="https://changelog.com/gotime">Go Time Podcast</a></h3>
6468
The <a href="https://changelog.com/gotime">Go Time podcast</a> is a panel of Go experts and special guests
6569
discussing the Go programming language, the community, and everything in between.
6670
</p>
71+
{{end}}
6772

6873
<h2 id="community">Community resources</h2>
6974

@@ -73,11 +78,13 @@ <h3 id="go_user_groups"><a href="/wiki/GoUserGroups">Go User Groups</a></h3>
7378
meet to talk about Go. Find a chapter near you.
7479
</p>
7580

81+
{{if not $.GoogleCN}}
7682
<h3 id="playground"><a href="/play">Go Playground</a></h3>
7783
<p>A place to write, run, and share Go code.</p>
7884

7985
<h3 id="wiki"><a href="/wiki">Go Wiki</a></h3>
8086
<p>A wiki maintained by the Go community.</p>
87+
{{end}}
8188

8289
<h3 id="conduct"><a href="/conduct">Code of Conduct</a></h3>
8390
<p>

doc/install.html

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
<h2 id="download">Download the Go distribution</h2>
99

1010
<p>
11-
<a href="https://golang.org/dl/" id="start" class="download">
11+
<a href="/dl/" id="start" class="download">
1212
<span class="big">Download Go</span>
1313
<span class="desc">Click here to visit the downloads page</span>
1414
</a>
1515
</p>
1616

1717
<p>
18-
<a href="https://golang.org/dl/" target="_blank">Official binary
18+
<a href="/dl/" target="_blank">Official binary
1919
distributions</a> are available for the FreeBSD (release 8-STABLE and above),
2020
Linux, Mac OS X (10.8 and above), and Windows operating systems and
2121
the 32-bit (<code>386</code>) and 64-bit (<code>amd64</code>) x86 processor
@@ -33,7 +33,7 @@ <h2 id="download">Download the Go distribution</h2>
3333
<h2 id="requirements">System requirements</h2>
3434

3535
<p>
36-
Go <a href="https://golang.org/dl/">binary distributions</a> are available for these supported operating systems and architectures.
36+
Go <a href="/dl/">binary distributions</a> are available for these supported operating systems and architectures.
3737
Please ensure your system meets these requirements before proceeding.
3838
If your OS or architecture is not on the list, you may be able to
3939
<a href="/doc/install/source">install from source</a> or
@@ -77,7 +77,7 @@ <h2 id="install">Install the Go tools</h2>
7777
<h3 id="tarball">Linux, Mac OS X, and FreeBSD tarballs</h3>
7878

7979
<p>
80-
<a href="https://golang.org/dl/">Download the archive</a>
80+
<a href="/dl/">Download the archive</a>
8181
and extract it into <code>/usr/local</code>, creating a Go tree in
8282
<code>/usr/local/go</code>. For example:
8383
</p>
@@ -138,7 +138,7 @@ <h4 id="tarball_non_standard">Installing to a custom location</h4>
138138
<h3 id="osx">Mac OS X package installer</h3>
139139

140140
<p>
141-
<a href="https://golang.org/dl/">Download the package file</a>,
141+
<a href="/dl/">Download the package file</a>,
142142
open it, and follow the prompts to install the Go tools.
143143
The package installs the Go distribution to <code>/usr/local/go</code>.
144144
</p>
@@ -167,7 +167,7 @@ <h3 id="windows">Windows</h3>
167167
<h4 id="windows_msi">MSI installer</h4>
168168

169169
<p>
170-
Open the <a href="https://golang.org/dl/">MSI file</a>
170+
Open the <a href="/dl/">MSI file</a>
171171
and follow the prompts to install the Go tools.
172172
By default, the installer puts the Go distribution in <code>c:\Go</code>.
173173
</p>
@@ -185,7 +185,7 @@ <h4 id="windows_msi">MSI installer</h4>
185185
<h4 id="windows_zip">Zip archive</h4>
186186

187187
<p>
188-
<a href="https://golang.org/dl/">Download the zip file</a> and extract it into the directory of your choice (we suggest <code>c:\Go</code>).
188+
<a href="/dl/">Download the zip file</a> and extract it into the directory of your choice (we suggest <code>c:\Go</code>).
189189
</p>
190190

191191
<p>

doc/root.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858

5959
<div id="gopher"></div>
6060

61-
<a href="https://golang.org/dl/" id="start">
61+
<a href="/dl/" id="start">
6262
<span class="big">Download Go</span>
6363
<span class="desc">
6464
Binary distributions available for<br>

src/cmd/compile/internal/gc/builtin.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/cmd/compile/internal/gc/builtin/runtime.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,9 @@ func mapaccess2_faststr(mapType *byte, hmap map[any]any, key any) (val *any, pre
106106
func mapaccess2_fat(mapType *byte, hmap map[any]any, key *any, zero *byte) (val *any, pres bool)
107107
func mapassign(mapType *byte, hmap map[any]any, key *any) (val *any)
108108
func mapassign_fast32(mapType *byte, hmap map[any]any, key any) (val *any)
109+
func mapassign_fast32ptr(mapType *byte, hmap map[any]any, key any) (val *any)
109110
func mapassign_fast64(mapType *byte, hmap map[any]any, key any) (val *any)
111+
func mapassign_fast64ptr(mapType *byte, hmap map[any]any, key any) (val *any)
110112
func mapassign_faststr(mapType *byte, hmap map[any]any, key any) (val *any)
111113
func mapiterinit(mapType *byte, hmap map[any]any, hiter *any)
112114
func mapdelete(mapType *byte, hmap map[any]any, key *any)

0 commit comments

Comments
 (0)