diff options
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
| -rw-r--r-- | libgo/go/runtime/panic.go | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 8ce4017..a8dba360 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -a459f1fdfe0bd365bf2def730e1529052c6487fd +73b14da15ec731837ce2a45db658142bfbf5fe22 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/runtime/panic.go b/libgo/go/runtime/panic.go index bbd34b4..de3c79f 100644 --- a/libgo/go/runtime/panic.go +++ b/libgo/go/runtime/panic.go @@ -194,7 +194,7 @@ func deferreturn(frame *bool) { // The gc compiler does this using assembler // code in jmpdefer. var fn func(unsafe.Pointer) - *(**uintptr)(unsafe.Pointer(&fn)) = &pfn + *(*uintptr)(unsafe.Pointer(&fn)) = uintptr(unsafe.Pointer(&pfn)) fn(d.arg) } @@ -259,7 +259,7 @@ func checkdefer(frame *bool) { gp._defer = d.link var fn func(unsafe.Pointer) - *(**uintptr)(unsafe.Pointer(&fn)) = &pfn + *(*uintptr)(unsafe.Pointer(&fn)) = uintptr(unsafe.Pointer(&pfn)) fn(d.arg) freedefer(d) @@ -345,7 +345,7 @@ func Goexit() { if pfn != 0 { var fn func(unsafe.Pointer) - *(**uintptr)(unsafe.Pointer(&fn)) = &pfn + *(*uintptr)(unsafe.Pointer(&fn)) = uintptr(unsafe.Pointer(&pfn)) fn(d.arg) } @@ -446,7 +446,7 @@ func gopanic(e interface{}) { if pfn != 0 { var fn func(unsafe.Pointer) - *(**uintptr)(unsafe.Pointer(&fn)) = &pfn + *(*uintptr)(unsafe.Pointer(&fn)) = uintptr(unsafe.Pointer(&pfn)) fn(d.arg) if p.recovered { |