qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-19 19:04:47 -07:00
Code Releases Activity

reflect: don't panic on delete from nil map.

Browse Source 
Fixes #8051

LGTM=bradfitz
R=golang-codereviews, bradfitz
CC=golang-codereviews
https://golang.org/cl/95560046
This commit is contained in:
Keith Randall 2014-05-20 16:26:04 -07:00
parent a43669843b
commit cb6cb42ede
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/pkg/reflect/all_test.go
View File

@ -993,6 +993,9 @@ func TestNilMap(t *testing.T) {
if x.Kind() != Invalid {
t.Errorf("mbig.MapIndex(\"hello\") for nil map = %v, want Invalid Value", x)
}
// Test that deletes from a nil map succeed.
mv.SetMapIndex(ValueOf("hi"), Value{})
}
func TestChan(t *testing.T) {

2
src/pkg/runtime/hashmap.goc
View File

@ -990,7 +990,7 @@ func reflect·mapassign(t *MapType, h *Hmap, key *byte, val *byte) {
#pragma textflag NOSPLIT
func reflect·mapdelete(t *MapType, h *Hmap, key *byte) {
if(h == nil)
runtime·panicstring("delete from nil map");
return; // see bug 8051
if(raceenabled) {
runtime·racewritepc(h, runtime·getcallerpc(&t), reflect·mapdelete);
runtime·racereadobjectpc(key, t->key, runtime·getcallerpc(&t), reflect·mapdelete);