From d90936ff88545c9312a0137725a9b1ab0919ad48 Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <ian@gcc.gnu.org>
Date: Tue, 12 Apr 2016 22:20:30 +0000
Subject: [PATCH] reflect: change Value.Call results to not be addressable

    Leaving them incorrectly marked as addressable broke a use of the
    text/template package, because state.evalField checks CanAddr and takes
    the address if it is addressable.

    Reviewed-on: https://go-review.googlesource.com/21908

From-SVN: r234923
---
 gcc/go/gofrontend/MERGE      | 2 +-
 libgo/go/reflect/all_test.go | 6 ++++++
 libgo/go/reflect/value.go    | 8 +++++---
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index d7f1dbc734d..cc386134d14 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-8edf085a94579bd819a10f50328233812ceeb950
+8e7b5e777333fa4cd070d96e94ea82e3e1132739
 
 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 595d6908f7d..b8e7cd883cb 100644
--- a/libgo/go/reflect/all_test.go
+++ b/libgo/go/reflect/all_test.go
@@ -1478,6 +1478,12 @@ func TestFunc(t *testing.T) {
 	if i != 10 || j != 20 || k != 30 || l != (two{40, 50}) || m != 60 || n != 70 || o != 80 {
 		t.Errorf("Call returned %d, %d, %d, %v, %d, %g, %d; want 10, 20, 30, [40, 50], 60, 70, 80", i, j, k, l, m, n, o)
 	}
+
+	for i, v := range ret {
+		if v.CanAddr() {
+			t.Errorf("result %d is addressable", i)
+		}
+	}
 }
 
 type emptyStruct struct{}
diff --git a/libgo/go/reflect/value.go b/libgo/go/reflect/value.go
index 0f0eb846fc2..75944a6e532 100644
--- a/libgo/go/reflect/value.go
+++ b/libgo/go/reflect/value.go
@@ -433,9 +433,11 @@ func (v Value) call(op string, in []Value) []Value {
 	ret := make([]Value, nout)
 	results := make([]unsafe.Pointer, nout)
 	for i := 0; i < nout; i++ {
-		v := New(t.Out(i))
-		results[i] = unsafe.Pointer(v.Pointer())
-		ret[i] = Indirect(v)
+		tv := t.Out(i)
+		v := New(tv)
+		results[i] = v.pointer()
+		fl := flagIndir | flag(tv.Kind())
+		ret[i] = Value{tv.common(), v.pointer(), fl}
 	}
 
 	var pp *unsafe.Pointer