code review 147440043: undo CL 138250043 / 4eda5e4001fd

undo CL 138250043 / 4eda5e4001fd

I will use different approach to solve this problem.
See CL 143160046 for details.

««« original CL description
syscall: keep Windows syscall pointers live too

Like https://codereview.appspot.com/139360044

LGTM=rsc, alex.brainman
R=alex.brainman, rsc
CC=golang-codereviews
https://codereview.appspot.com/138250043
»»»

[brainman, 2014-10-02 05:40:20]

Hello golang-codereviews@googlegroups.com,

I'd like you to review this change to
https://go.googlecode.com/hg/

[bradfitz, 2014-10-02 06:00:12]

R=r


On Wed, Oct 1, 2014 at 10:40 PM, <alex.brainman@gmail.com> wrote:

> Reviewers: golang-codereviews,
>
> Message:
> Hello golang-codereviews@googlegroups.com,
>
> I'd like you to review this change to
> https://go.googlecode.com/hg/
>
>
> Description:
> undo CL 138250043 / 4eda5e4001fd
>
> I will use different approach to solve this problem.
> See CL 143160046 for details.
>
> ««« original CL description
> syscall: keep Windows syscall pointers live too
>
> Like https://codereview.appspot.com/139360044
>
> LGTM=rsc, alex.brainman
> R=alex.brainman, rsc
> CC=golang-codereviews
> https://codereview.appspot.com/138250043
> »»»
>
> Please review this at https://codereview.appspot.com/147440043/
>
> Affected files (+6, -33 lines):
>   M src/syscall/mksyscall_windows.go
>   M src/syscall/zsyscall_windows.go
>
>
> Index: src/syscall/mksyscall_windows.go
> ===================================================================
> --- a/src/syscall/mksyscall_windows.go
> +++ b/src/syscall/mksyscall_windows.go
> @@ -158,7 +158,6 @@
>         case p.Type[0] == '*':
>                 s = fmt.Sprintf("unsafe.Pointer(%s)", p.Name)
>         case p.Type == "string":
> -               p.fn.use(p.tmpVar())
>                 s = fmt.Sprintf("unsafe.Pointer(%s)", p.tmpVar())
>         case p.Type == "bool":
>                 s = p.tmpVar()
> @@ -304,7 +303,6 @@
>         Params      []*Param
>         Rets        *Rets
>         PrintTrace  bool
> -       Used        []string
>         dllname     string
>         dllfuncname string
>         src         string
> @@ -312,15 +310,6 @@
>         curTmpVarIdx int // insure tmp variables have uniq names
>  }
>
> -func (f *Fn) use(v string) {
> -       for _, e := range f.Used {
> -               if e == v {
> -                       return
> -               }
> -       }
> -       f.Used = append(f.Used, v)
> -}
> -
>  // extractParams parses s to extract function parameters.
>  func extractParams(s string, f *Fn) ([]*Param, error) {
>         s = trim(s)
> @@ -339,7 +328,7 @@
>                         }
>                 }
>                 ps[i] = &Param{
> -                       Name:      sanitizeName(trim(b[0])),
> +                       Name:      trim(b[0]),
>                         Type:      trim(b[1]),
>                         fn:        f,
>                         tmpVarIdx: -1,
> @@ -348,13 +337,6 @@
>         return ps, nil
>  }
>
> -func sanitizeName(n string) string {
> -       if n == "use" {
> -               return "use_"
> -       }
> -       return n
> -}
> -
>  // extractSection extracts text out of string s starting after start
>  // and ending just before end. found return value will indicate success,
>  // and prefix, body and suffix will contain correspondent parts of string
> s.
> @@ -698,7 +680,7 @@
>  {{define "funcbody"}}
>  func {{.Name}}({{.ParamList}}) {{if .Rets.List}}{{.Rets.List}} {{end}}{
>  {{template "tmpvars" .}}       {{template "syscall" .}}
> -{{template "used" .}}{{template "seterror" .}}{{template "printtrace"
> .}}      return
> +{{template "seterror" .}}{{template "printtrace" .}}   return
>  }
>  {{end}}
>
> @@ -707,8 +689,6 @@
>
>  {{define "syscall"}}{{.Rets.SetReturnValuesCode}}{{.
> Syscall}}(proc{{.DLLFuncName}}.Addr(), {{.ParamCount}},
> {{.SyscallParamList}}){{end}}
>
> -{{define "used"}}{{range .Used}}use(unsafe.Pointer({{.}}));{{end}}{{end}}
> -
>  {{define "seterror"}}{{if .Rets.SetErrorCode}} {{.Rets.SetErrorCode}}
>  {{end}}{{end}}
>
> Index: src/syscall/zsyscall_windows.go
> ===================================================================
> --- a/src/syscall/zsyscall_windows.go
> +++ b/src/syscall/zsyscall_windows.go
> @@ -177,7 +177,6 @@
>                 return
>         }
>         r0, _, e1 := Syscall(procLoadLibraryW.Addr(), 1,
> uintptr(unsafe.Pointer(_p0)), 0, 0)
> -       use(unsafe.Pointer(_p0))
>         handle = Handle(r0)
>         if handle == 0 {
>                 if e1 != 0 {
> @@ -208,7 +207,6 @@
>                 return
>         }
>         r0, _, e1 := Syscall(procGetProcAddress.Addr(), 2,
> uintptr(module), uintptr(unsafe.Pointer(_p0)), 0)
> -       use(unsafe.Pointer(_p0))
>         proc = uintptr(r0)
>         if proc == 0 {
>                 if e1 != 0 {
> @@ -1561,7 +1559,6 @@
>                 return
>         }
>         r0, _, e1 := Syscall(procgethostbyname.Addr(), 1,
> uintptr(unsafe.Pointer(_p0)), 0, 0)
> -       use(unsafe.Pointer(_p0))
>         h = (*Hostent)(unsafe.Pointer(r0))
>         if h == nil {
>                 if e1 != 0 {
> @@ -1585,8 +1582,6 @@
>                 return
>         }
>         r0, _, e1 := Syscall(procgetservbyname.Addr(), 2,
> uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
> -       use(unsafe.Pointer(_p0))
> -       use(unsafe.Pointer(_p1))
>         s = (*Servent)(unsafe.Pointer(r0))
>         if s == nil {
>                 if e1 != 0 {
> @@ -1611,7 +1606,6 @@
>                 return
>         }
>         r0, _, e1 := Syscall(procgetprotobyname.Addr(), 1,
> uintptr(unsafe.Pointer(_p0)), 0, 0)
> -       use(unsafe.Pointer(_p0))
>         p = (*Protoent)(unsafe.Pointer(r0))
>         if p == nil {
>                 if e1 != 0 {
> @@ -1630,7 +1624,6 @@
>                 return
>         }
>         r0, _, _ := Syscall6(procDnsQuery_W.Addr(), 6,
> uintptr(unsafe.Pointer(_p0)), uintptr(qtype), uintptr(options),
> uintptr(unsafe.Pointer(extra)), uintptr(unsafe.Pointer(qrs)),
> uintptr(unsafe.Pointer(pr)))
> -       use(unsafe.Pointer(_p0))
>         if r0 != 0 {
>                 status = Errno(r0)
>         }
> @@ -1750,8 +1743,8 @@
>         return
>  }
>
> -func LookupAccountSid(systemName *uint16, sid *SID, name *uint16, nameLen
> *uint32, refdDomainName *uint16, refdDomainNameLen *uint32, use_ *uint32)
> (err error) {
> -       r1, _, e1 := Syscall9(procLookupAccountSidW.Addr(), 7,
> uintptr(unsafe.Pointer(systemName)), uintptr(unsafe.Pointer(sid)),
> uintptr(unsafe.Pointer(name)), uintptr(unsafe.Pointer(nameLen)),
> uintptr(unsafe.Pointer(refdDomainName)),
uintptr(unsafe.Pointer(refdDomainNameLen)),
> uintptr(unsafe.Pointer(use_)), 0, 0)
> +func LookupAccountSid(systemName *uint16, sid *SID, name *uint16, nameLen
> *uint32, refdDomainName *uint16, refdDomainNameLen *uint32, use *uint32)
> (err error) {
> +       r1, _, e1 := Syscall9(procLookupAccountSidW.Addr(), 7,
> uintptr(unsafe.Pointer(systemName)), uintptr(unsafe.Pointer(sid)),
> uintptr(unsafe.Pointer(name)), uintptr(unsafe.Pointer(nameLen)),
> uintptr(unsafe.Pointer(refdDomainName)),
uintptr(unsafe.Pointer(refdDomainNameLen)),
> uintptr(unsafe.Pointer(use)), 0, 0)
>         if r1 == 0 {
>                 if e1 != 0 {
>                         err = error(e1)
> @@ -1762,8 +1755,8 @@
>         return
>  }
>
> -func LookupAccountName(systemName *uint16, accountName *uint16, sid *SID,
> sidLen *uint32, refdDomainName *uint16, refdDomainNameLen *uint32, use_
> *uint32) (err error) {
> -       r1, _, e1 := Syscall9(procLookupAccountNameW.Addr(), 7,
> uintptr(unsafe.Pointer(systemName)), uintptr(unsafe.Pointer(accountName)),
> uintptr(unsafe.Pointer(sid)), uintptr(unsafe.Pointer(sidLen)),
> uintptr(unsafe.Pointer(refdDomainName)),
uintptr(unsafe.Pointer(refdDomainNameLen)),
> uintptr(unsafe.Pointer(use_)), 0, 0)
> +func LookupAccountName(systemName *uint16, accountName *uint16, sid *SID,
> sidLen *uint32, refdDomainName *uint16, refdDomainNameLen *uint32, use
> *uint32) (err error) {
> +       r1, _, e1 := Syscall9(procLookupAccountNameW.Addr(), 7,
> uintptr(unsafe.Pointer(systemName)), uintptr(unsafe.Pointer(accountName)),
> uintptr(unsafe.Pointer(sid)), uintptr(unsafe.Pointer(sidLen)),
> uintptr(unsafe.Pointer(refdDomainName)),
uintptr(unsafe.Pointer(refdDomainNameLen)),
> uintptr(unsafe.Pointer(use)), 0, 0)
>         if r1 == 0 {
>                 if e1 != 0 {
>                         err = error(e1)
>
>
> --
> You received this message because you are subscribed to the Google Groups
> "golang-codereviews" group.
> To unsubscribe from this group and stop receiving emails from it, send an
> email to golang-codereviews+unsubscribe@googlegroups.com.
> For more options, visit https://groups.google.com/d/optout.
>

[r, 2014-10-02 14:02:06]

LGTM

[brainman, 2014-10-03 00:37:03]

*** Submitted as https://code.google.com/p/go/source/detail?r=920cde0a8b2d ***

undo CL 138250043 / 4eda5e4001fd

I will use different approach to solve this problem.
See CL 143160046 for details.

««« original CL description
syscall: keep Windows syscall pointers live too

Like https://codereview.appspot.com/139360044

LGTM=rsc, alex.brainman
R=alex.brainman, rsc
CC=golang-codereviews
https://codereview.appspot.com/138250043
»»»

LGTM=r
R=golang-codereviews, bradfitz, r
CC=golang-codereviews
https://codereview.appspot.com/147440043

[gobot, 2014-10-03 04:07:04]

This CL appears to have broken the netbsd-amd64-bsiegert builder.
See http://build.golang.org/log/854013ab1ba36fc039cf25672b75b22a6aea4261