← Back to branch summary

~ubuntu-branches/ubuntu/vivid/golang/vivid

« back to all changes in this revision

Viewing changes to src/pkg/runtime/error.go

  • Committer: Package Import Robot
  • Author(s): Serge Hallyn
  • Date: 2014-11-18 15:12:26 UTC
  • mfrom: (14.2.12 vivid-proposed)
  • Revision ID: package-import@ubuntu.com-20141118151226-zug7vn93mn3dtiz3
Tags: 2:1.3.2-1ubuntu1
* Merge from Debian unstable.  Remaining changes:
  - 016-armhf-elf-header.patch: Use correct ELF header for armhf binaries.
  - Support co-installability with gccgo-go tool:
    - d/rules,golang-go.install: Rename bin/go -> bin/golang-go
    - d/golang-go.{postinst,prerm}: Install/remove /usr/bin/go using
      alternatives.
  - d/copyright: Amendments for full compiliance with copyright format.
  - d/control: Demote golang-go.tools to Suggests to support Ubuntu MIR.
  - dropped patches (now upstream):
    - d/p/issue27650045_40001_50001.diff
    - d/p/issue28050043_60001_70001.diff
    - d/p/issue54790044_100001_110001.diff

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/pkg/runtime/error.go
75
75
}
76
76
 
77
77
// An errorCString represents a runtime error described by a single C string.
78
 
type errorCString uintptr
 
78
// Not "type errorCString uintptr" because of http://golang.org/issue/7084.
 
79
type errorCString struct{ cstr uintptr }
79
80
 
80
81
func (e errorCString) RuntimeError() {}
81
82
 
82
83
func cstringToGo(uintptr) string
83
84
 
84
85
func (e errorCString) Error() string {
85
 
        return "runtime error: " + cstringToGo(uintptr(e))
 
86
        return "runtime error: " + cstringToGo(e.cstr)
86
87
}
87
88
 
88
89
// For calling from C.
89
90
func newErrorCString(s uintptr, ret *interface{}) {
90
 
        *ret = errorCString(s)
 
91
        *ret = errorCString{s}
91
92
}
92
93
 
93
94
type stringer interface {