aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/go/gofrontend/MERGE2
-rw-r--r--libgo/go/reflect/all_test.go6
2 files changed, 1 insertions, 7 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 46bdc3c..162c4a8 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-5e8a91bf239c253d7b5c84bd2c1dd3ecb18980e9
+b332ba2f0d0302eeb01a228c217928296cec56f6
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.
diff --git a/libgo/go/reflect/all_test.go b/libgo/go/reflect/all_test.go
index 86e7385..3070aac 100644
--- a/libgo/go/reflect/all_test.go
+++ b/libgo/go/reflect/all_test.go
@@ -6162,9 +6162,6 @@ func TestPtrToMethods(t *testing.T) {
}
func TestMapAlloc(t *testing.T) {
- if runtime.Compiler == "gccgo" {
- t.Skip("skipping on gccgo until we have escape analysis")
- }
m := ValueOf(make(map[int]int, 10))
k := ValueOf(5)
v := ValueOf(7)
@@ -6195,9 +6192,6 @@ func TestMapAlloc(t *testing.T) {
}
func TestChanAlloc(t *testing.T) {
- if runtime.Compiler == "gccgo" {
- t.Skip("skipping on gccgo until we have escape analysis")
- }
// Note: for a chan int, the return Value must be allocated, so we
// use a chan *int instead.
c := ValueOf(make(chan *int, 1))