[llgo] Roll gofrontend to a6e10414311a

[pcc]

Summary

This takes us to Go 1.4. Also includes a couple of changes to the test
suite, both in the runtime package:

• Disable TestSetPanicOnFault. We cannot support this scenario at all, due to LLVM's lack of non-call exceptions.

• Tweak TestFinalizerType. This test only passes with two GC runs.

[axw]

LGTM with minor comment update

libgo-check-failures.diff

57

Would be good to add a brief explanation that this is due to lack of non-call exception support.

CMakeLists.txt

set(LLGO_GO_SOURCES
   ${CMAKE_CURRENT_SOURCE_DIR}/third_party/gofrontend/libgo/go/cmd/go/build.go
   ${CMAKE_CURRENT_SOURCE_DIR}/third_party/gofrontend/libgo/go/cmd/go/clean.go
   ${CMAKE_CURRENT_SOURCE_DIR}/third_party/gofrontend/libgo/go/cmd/go/context.go
   ${CMAKE_CURRENT_SOURCE_DIR}/third_party/gofrontend/libgo/go/cmd/go/discovery.go
   ${CMAKE_CURRENT_SOURCE_DIR}/third_party/gofrontend/libgo/go/cmd/go/doc.go
   ${CMAKE_CURRENT_SOURCE_DIR}/third_party/gofrontend/libgo/go/cmd/go/env.go
   ${CMAKE_CURRENT_SOURCE_DIR}/third_party/gofrontend/libgo/go/cmd/go/fix.go
   ${CMAKE_CURRENT_SOURCE_DIR}/third_party/gofrontend/libgo/go/cmd/go/fmt.go
+  ${CMAKE_CURRENT_SOURCE_DIR}/third_party/gofrontend/libgo/go/cmd/go/generate.go
   ${CMAKE_CURRENT_SOURCE_DIR}/third_party/gofrontend/libgo/go/cmd/go/get.go
   ${CMAKE_CURRENT_SOURCE_DIR}/third_party/gofrontend/libgo/go/cmd/go/go11.go
   ${CMAKE_CURRENT_SOURCE_DIR}/third_party/gofrontend/libgo/go/cmd/go/help.go
   ${CMAKE_CURRENT_SOURCE_DIR}/third_party/gofrontend/libgo/go/cmd/go/http.go
   ${CMAKE_CURRENT_SOURCE_DIR}/third_party/gofrontend/libgo/go/cmd/go/list.go
   ${CMAKE_CURRENT_SOURCE_DIR}/third_party/gofrontend/libgo/go/cmd/go/main.go
   ${CMAKE_CURRENT_SOURCE_DIR}/third_party/gofrontend/libgo/go/cmd/go/pkg.go
   ${CMAKE_CURRENT_SOURCE_DIR}/third_party/gofrontend/libgo/go/cmd/go/run.go

irgen/typemap.go

const (
   gccgoRuntimeTypeKindFUNC           = 19
   gccgoRuntimeTypeKindINTERFACE      = 20
   gccgoRuntimeTypeKindMAP            = 21
   gccgoRuntimeTypeKindPTR            = 22
   gccgoRuntimeTypeKindSLICE          = 23
   gccgoRuntimeTypeKindSTRING         = 24
   gccgoRuntimeTypeKindSTRUCT         = 25
   gccgoRuntimeTypeKindUNSAFE_POINTER = 26
+  gccgoRuntimeTypeKindDIRECT_IFACE   = (1 << 5)
   gccgoRuntimeTypeKindNO_POINTERS    = (1 << 7)
 )
 
 func hasPointers(t types.Type) bool {
   switch t := t.(type) {
   case *types.Basic:
     return t.Kind() == types.String || t.Kind() == types.UnsafePointer
 
case types.Float64:
       k = gccgoRuntimeTypeKindFLOAT64
     case types.Complex64:
       k = gccgoRuntimeTypeKindCOMPLEX64
     case types.Complex128:
       k = gccgoRuntimeTypeKindCOMPLEX128
     case types.String:
       k = gccgoRuntimeTypeKindSTRING
     case types.UnsafePointer:
-      k = gccgoRuntimeTypeKindUNSAFE_POINTER
+      k = gccgoRuntimeTypeKindUNSAFE_POINTER | gccgoRuntimeTypeKindDIRECT_IFACE
     default:
       panic("unrecognized builtin type")
     }
   case *types.Array:
     k = gccgoRuntimeTypeKindARRAY
   case *types.Slice:
     k = gccgoRuntimeTypeKindSLICE
   case *types.Struct:
     k = gccgoRuntimeTypeKindSTRUCT
   case *types.Pointer:
-    k = gccgoRuntimeTypeKindPTR
+    k = gccgoRuntimeTypeKindPTR | gccgoRuntimeTypeKindDIRECT_IFACE
   case *types.Signature:
     k = gccgoRuntimeTypeKindFUNC
   case *types.Interface:
     k = gccgoRuntimeTypeKindINTERFACE
   case *types.Map:
     k = gccgoRuntimeTypeKindMAP
   case *types.Chan:
     k = gccgoRuntimeTypeKindCHAN

libgo-check-failures.diff

-diff --git a/libgo/Makefile.am b/libgo/Makefile.am
-index 526b656..31c206e 100644
---- a/libgo/Makefile.am
-+++ b/libgo/Makefile.am
-@@ -3688,7 +3688,6 @@ TEST_PACKAGES = \
+diff -r a6e10414311a libgo/Makefile.am
+--- a/libgo/Makefile.am Fri Jan 16 07:57:02 2015 -0800
++++ b/libgo/Makefile.am Fri Apr 03 15:07:47 2015 -0700
+@@ -3738,7 +3738,6 @@
   os/check \
   path/check \
   reflect/check \
 - regexp/check \
   runtime/check \
   sort/check \
   strconv/check \
-@@ -3787,7 +3786,6 @@ TEST_PACKAGES = \
+@@ -3838,7 +3837,6 @@
   os/user/check \
   path/filepath/check \
   regexp/syntax/check \
 - runtime/pprof/check \
   sync/atomic/check \
   text/scanner/check \
   text/tabwriter/check \
-diff --git a/libgo/Makefile.in b/libgo/Makefile.in
-index 2254478..d2482d1 100644
---- a/libgo/Makefile.in
-+++ b/libgo/Makefile.in
-@@ -2193,7 +2193,6 @@ TEST_PACKAGES = \
+diff -r a6e10414311a libgo/Makefile.in
+--- a/libgo/Makefile.in Fri Jan 16 07:57:02 2015 -0800
++++ b/libgo/Makefile.in Fri Apr 03 15:07:47 2015 -0700
+@@ -2212,7 +2212,6 @@
   os/check \
   path/check \
   reflect/check \
 - regexp/check \
   runtime/check \
   sort/check \
   strconv/check \
-@@ -2292,7 +2291,6 @@ TEST_PACKAGES = \
+@@ -2312,7 +2311,6 @@
   os/user/check \
   path/filepath/check \
   regexp/syntax/check \
 - runtime/pprof/check \
   sync/atomic/check \
   text/scanner/check \
   text/tabwriter/check \
+diff -r a6e10414311a libgo/go/runtime/mfinal_test.go
+--- a/libgo/go/runtime/mfinal_test.go Fri Jan 16 07:57:02 2015 -0800
++++ b/libgo/go/runtime/mfinal_test.go Fri Apr 03 15:07:47 2015 -0700
+@@ -62,6 +62,7 @@
+    }()
+    <-done
+    runtime.GC()
++   runtime.GC()
+    select {
+    case <-ch:
+    case <-time.After(time.Second * 4):
+diff -r a6e10414311a libgo/go/runtime/runtime_test.go
+--- a/libgo/go/runtime/runtime_test.go  Fri Jan 16 07:57:02 2015 -0800
++++ b/libgo/go/runtime/runtime_test.go  Fri Apr 03 15:07:47 2015 -0700
+@@ -176,6 +176,8 @@
+ }
+ 
+ func TestSetPanicOnFault(t *testing.T) {
++ t.Skip("skipping for llgo")
++
+  // This currently results in a fault in the signal trampoline on
+  // dragonfly/386 - see issue 7421.
+  if GOOS == "dragonfly" && GOARCH == "386" {

libgo-noext.diff

-diff -r 0fde0b6a7eb2 libgo/runtime/chan.goc
---- a/libgo/runtime/chan.goc  Fri Jan 09 17:00:26 2015 -0800
-+++ b/libgo/runtime/chan.goc  Fri Feb 13 12:12:23 2015 -0800
+diff -r a6e10414311a libgo/runtime/chan.goc
+--- a/libgo/runtime/chan.goc  Fri Jan 16 07:57:02 2015 -0800
++++ b/libgo/runtime/chan.goc  Fri Feb 13 16:36:07 2015 -0800
 @@ -111,7 +111,7 @@
     mysg.releasetime = -1;
   }
  
 - runtime_lock(c);
 + runtime_lock(&c->lock);
   if(c->closed)
     goto closed;
@@ -1048,7 +1048,7 @@
     runtime_ready(gp);
   }
  
 - runtime_unlock(c);
 + runtime_unlock(&c->lock);
  }
  
  void
-diff -r 0fde0b6a7eb2 libgo/runtime/chan.h
---- a/libgo/runtime/chan.h  Fri Jan 09 17:00:26 2015 -0800
-+++ b/libgo/runtime/chan.h  Fri Feb 13 12:12:23 2015 -0800
+diff -r a6e10414311a libgo/runtime/chan.h
+--- a/libgo/runtime/chan.h  Fri Jan 16 07:57:02 2015 -0800
++++ b/libgo/runtime/chan.h  Fri Feb 13 16:36:07 2015 -0800
 @@ -39,7 +39,7 @@
   uintgo  recvx;      // receive index
   WaitQ recvq;      // list of recv waiters
   WaitQ sendq;      // list of send waiters
 - Lock;
 + Lock  lock;
  };
  
  // Buffer follows Hchan immediately in memory.
-diff -r 0fde0b6a7eb2 libgo/runtime/heapdump.c
---- a/libgo/runtime/heapdump.c  Fri Jan 09 17:00:26 2015 -0800
-+++ b/libgo/runtime/heapdump.c  Fri Feb 13 12:12:23 2015 -0800
+diff -r a6e10414311a libgo/runtime/heapdump.c
+--- a/libgo/runtime/heapdump.c  Fri Jan 16 07:57:02 2015 -0800
++++ b/libgo/runtime/heapdump.c  Fri Feb 13 16:36:07 2015 -0800
 @@ -387,7 +387,7 @@
         if(sp->kind != KindSpecialFinalizer)
           continue;
         spf = (SpecialFinalizer*)sp;
 -       p = (byte*)((s->start << PageShift) + spf->offset);
 +       p = (byte*)((s->start << PageShift) + spf->special.offset);
         dumpfinalizer(p, spf->fn, spf->ft, spf->ot);
       }
     }
 @@ -566,7 +566,7 @@
       if(sp->kind != KindSpecialProfile)
         continue;
       spp = (SpecialProfile*)sp;
 -     p = (byte*)((s->start << PageShift) + spp->offset);
 +     p = (byte*)((s->start << PageShift) + spp->special.offset);
       dumpint(TagAllocSample);
       dumpint((uintptr)p);
       dumpint((uintptr)spp->b);
-diff -r 0fde0b6a7eb2 libgo/runtime/malloc.goc
---- a/libgo/runtime/malloc.goc  Fri Jan 09 17:00:26 2015 -0800
-+++ b/libgo/runtime/malloc.goc  Fri Feb 13 12:12:23 2015 -0800
-@@ -436,9 +436,9 @@
+diff -r a6e10414311a libgo/runtime/malloc.goc
+--- a/libgo/runtime/malloc.goc  Fri Jan 16 07:57:02 2015 -0800
++++ b/libgo/runtime/malloc.goc  Fri Feb 13 16:36:07 2015 -0800
+@@ -437,9 +437,9 @@
   m->mcache->local_nlookup++;
   if (sizeof(void*) == 4 && m->mcache->local_nlookup >= (1<<30)) {
     // purge cache stats to prevent overflow
 -   runtime_lock(&runtime_mheap);
 +   runtime_lock(&runtime_mheap.lock);
     runtime_purgecachedstats(m->mcache);
 -   runtime_unlock(&runtime_mheap);
 +   runtime_unlock(&runtime_mheap.lock);
   }
  
   s = runtime_MHeap_LookupMaybe(&runtime_mheap, v);
-@@ -735,7 +735,7 @@
+@@ -736,7 +736,7 @@
  
  static struct
  {
 - Lock;
 + Lock  lock;
   byte* pos;
   byte* end;
  } persistent;
-@@ -764,19 +764,19 @@
+@@ -765,19 +765,19 @@
     align = 8;
   if(size >= PersistentAllocMaxBlock)
     return runtime_SysAlloc(size, stat);
 - runtime_lock(&persistent);
 + runtime_lock(&persistent.lock);
   persistent.pos = (byte*)ROUND((uintptr)persistent.pos, align);
   if(persistent.pos + size > persistent.end) {
     persistent.pos = runtime_SysAlloc(PersistentAllocChunk, &mstats.other_sys);
     if(persistent.pos == nil) {
 -     runtime_unlock(&persistent);
 +     runtime_unlock(&persistent.lock);
       runtime_throw("runtime: cannot allocate memory");
     }
     persistent.end = persistent.pos + PersistentAllocChunk;
   }
   p = persistent.pos;
   persistent.pos += size;
 - runtime_unlock(&persistent);
 + runtime_unlock(&persistent.lock);
   if(stat != &mstats.other_sys) {
     // reaccount the allocation against provided stat
     runtime_xadd64(stat, size);
-diff -r 0fde0b6a7eb2 libgo/runtime/malloc.h
---- a/libgo/runtime/malloc.h  Fri Jan 09 17:00:26 2015 -0800
-+++ b/libgo/runtime/malloc.h  Fri Feb 13 12:12:23 2015 -0800
+diff -r a6e10414311a libgo/runtime/malloc.h
+--- a/libgo/runtime/malloc.h  Fri Jan 16 07:57:02 2015 -0800
++++ b/libgo/runtime/malloc.h  Fri Feb 13 16:36:07 2015 -0800
 @@ -390,7 +390,7 @@
  typedef struct SpecialFinalizer SpecialFinalizer;
  struct SpecialFinalizer
  {
 - Special;
 + Special   special;
   FuncVal*  fn;
   const FuncType* ft;
@@ -505,7 +505,7 @@
   // spaced CacheLineSize bytes apart, so that each MCentral.Lock
   // gets its own cache line.
   struct {
 -   MCentral;
 +   MCentral mcentral;
     byte pad[64];
   } central[NumSizeClasses];
  
-diff -r 0fde0b6a7eb2 libgo/runtime/mcache.c
---- a/libgo/runtime/mcache.c  Fri Jan 09 17:00:26 2015 -0800
-+++ b/libgo/runtime/mcache.c  Fri Feb 13 12:12:23 2015 -0800
+diff -r a6e10414311a libgo/runtime/mcache.c
+--- a/libgo/runtime/mcache.c  Fri Jan 16 07:57:02 2015 -0800
++++ b/libgo/runtime/mcache.c  Fri Feb 13 16:36:07 2015 -0800
 @@ -23,9 +23,9 @@
   MCache *c;
   int32 i;
  
 - runtime_lock(&runtime_mheap);
 + runtime_lock(&runtime_mheap.lock);
   c = runtime_FixAlloc_Alloc(&runtime_mheap.cachealloc);
 - runtime_unlock(&runtime_mheap);
+     runtime_MCentral_UncacheSpan(&runtime_mheap.central[i].mcentral, s);
     }
     l = &c->free[i];
     if(l->nlist > 0) {
 -     runtime_MCentral_FreeList(&runtime_mheap.central[i], l->list);
 +     runtime_MCentral_FreeList(&runtime_mheap.central[i].mcentral, l->list);
       l->list = nil;
       l->nlist = 0;
     }
-diff -r 0fde0b6a7eb2 libgo/runtime/mcentral.c
---- a/libgo/runtime/mcentral.c  Fri Jan 09 17:00:26 2015 -0800
-+++ b/libgo/runtime/mcentral.c  Fri Feb 13 12:12:23 2015 -0800
+diff -r a6e10414311a libgo/runtime/mcentral.c
+--- a/libgo/runtime/mcentral.c  Fri Jan 16 07:57:02 2015 -0800
++++ b/libgo/runtime/mcentral.c  Fri Feb 13 16:36:07 2015 -0800
 @@ -39,14 +39,14 @@
   int32 cap, n;
   uint32 sg;
  
 - runtime_lock(c);
 + runtime_lock(&c->lock);
   sg = runtime_mheap.sweepgen;
  retry:
@@ -301,7 +301,7 @@
   if(s->ref != 0)
     runtime_throw("ref wrong");
   c->nfree -= (s->npages << PageShift) / size;
 - runtime_unlock(c);
 + runtime_unlock(&c->lock);
   runtime_unmarkspan((byte*)(s->start<<PageShift), s->npages<<PageShift);
   runtime_MHeap_Free(&runtime_mheap, s, 0);
  }
-diff -r 0fde0b6a7eb2 libgo/runtime/mgc0.c
---- a/libgo/runtime/mgc0.c  Fri Jan 09 17:00:26 2015 -0800
-+++ b/libgo/runtime/mgc0.c  Fri Feb 13 12:12:23 2015 -0800
-@@ -224,7 +224,7 @@
+diff -r a6e10414311a libgo/runtime/mgc0.c
+--- a/libgo/runtime/mgc0.c  Fri Jan 16 07:57:02 2015 -0800
++++ b/libgo/runtime/mgc0.c  Fri Feb 13 16:36:07 2015 -0800
+@@ -225,7 +225,7 @@
   Note  alldone;
   ParFor  *markfor;
  
 - Lock;
 + Lock  lock;
   byte  *chunk;
   uintptr nchunk;
  } work __attribute__((aligned(8)));
-@@ -1336,7 +1336,7 @@
+@@ -1337,7 +1337,7 @@
         // retain everything it points to.
         spf = (SpecialFinalizer*)sp;
         // A finalizer can be set for an inner byte of an object, find object beginning.
 -       p = (void*)((s->start << PageShift) + spf->offset/s->elemsize*s->elemsize);
 +       p = (void*)((s->start << PageShift) + spf->special.offset/s->elemsize*s->elemsize);
         enqueue1(&wbuf, (Obj){p, s->elemsize, 0});
         enqueue1(&wbuf, (Obj){(void*)&spf->fn, PtrSize, 0});
         enqueue1(&wbuf, (Obj){(void*)&spf->ft, PtrSize, 0});
-@@ -1377,7 +1377,7 @@
+@@ -1378,7 +1378,7 @@
   b = (Workbuf*)runtime_lfstackpop(&work.empty);
   if(b == nil) {
     // Need to allocate.
 -   runtime_lock(&work);
 +   runtime_lock(&work.lock);
     if(work.nchunk < sizeof *b) {
       work.nchunk = 1<<20;
       work.chunk = runtime_SysAlloc(work.nchunk, &mstats.gc_sys);
-@@ -1387,7 +1387,7 @@
+@@ -1388,7 +1388,7 @@
     b = (Workbuf*)work.chunk;
     work.chunk += sizeof *b;
     work.nchunk -= sizeof *b;
 -   runtime_unlock(&work);
 +   runtime_unlock(&work.lock);
   }
   b->nobj = 0;
   return b;
-@@ -1801,7 +1801,7 @@
+@@ -1802,7 +1802,7 @@
     c->local_nsmallfree[cl] += nfree;
     c->local_cachealloc -= nfree * size;
     runtime_xadd64(&mstats.next_gc, -(uint64)(nfree * size * (gcpercent + 100)/100));
 -   res = runtime_MCentral_FreeSpan(&runtime_mheap.central[cl], s, nfree, head.next, end);
 +   res = runtime_MCentral_FreeSpan(&runtime_mheap.central[cl].mcentral, s, nfree, head.next, end);
     //MCentral_FreeSpan updates sweepgen
   }
   return res;
-@@ -2146,10 +2146,10 @@
+@@ -2147,10 +2147,10 @@
     return;
  
   if(gcpercent == GcpercentUnknown) { // first time through
 -   runtime_lock(&runtime_mheap);
 +   runtime_lock(&runtime_mheap.lock);
     if(gcpercent == GcpercentUnknown)
       gcpercent = readgogc();
 -   runtime_unlock(&runtime_mheap);
 +   runtime_unlock(&runtime_mheap.lock);
   }
   if(gcpercent < 0)
     return;
-@@ -2420,7 +2420,7 @@
+@@ -2423,7 +2423,7 @@
  
   // Pass back: pauses, last gc (absolute time), number of gc, total pause ns.
   p = (uint64*)pauses->array;
 - runtime_lock(&runtime_mheap);
 + runtime_lock(&runtime_mheap.lock);
   n = mstats.numgc;
   if(n > nelem(mstats.pause_ns))
     n = nelem(mstats.pause_ns);
-@@ -2435,7 +2435,7 @@
+@@ -2438,7 +2438,7 @@
   p[n] = mstats.last_gc;
   p[n+1] = mstats.numgc;
   p[n+2] = mstats.pause_total_ns; 
 - runtime_unlock(&runtime_mheap);
 + runtime_unlock(&runtime_mheap.lock);
   pauses->__count = n+3;
  }
  
-@@ -2443,14 +2443,14 @@
+@@ -2446,14 +2446,14 @@
  runtime_setgcpercent(int32 in) {
   int32 out;
  
 - runtime_lock(&runtime_mheap);
 + runtime_lock(&runtime_mheap.lock);
   if(gcpercent == GcpercentUnknown)
     gcpercent = readgogc();
   out = gcpercent;
   if(in < 0)
     in = -1;
   gcpercent = in;
 - runtime_unlock(&runtime_mheap);
 + runtime_unlock(&runtime_mheap.lock);
   return out;
  }
  
-diff -r 0fde0b6a7eb2 libgo/runtime/mheap.c
---- a/libgo/runtime/mheap.c Fri Jan 09 17:00:26 2015 -0800
-+++ b/libgo/runtime/mheap.c Fri Feb 13 12:12:23 2015 -0800
+diff -r a6e10414311a libgo/runtime/mheap.c
+--- a/libgo/runtime/mheap.c Fri Jan 16 07:57:02 2015 -0800
++++ b/libgo/runtime/mheap.c Fri Feb 13 16:36:07 2015 -0800
 @@ -70,7 +70,7 @@
   runtime_MSpanList_Init(&h->freelarge);
   runtime_MSpanList_Init(&h->busylarge);
   for(i=0; i<nelem(h->central); i++)
 -   runtime_MCentral_Init(&h->central[i], i);
 +   runtime_MCentral_Init(&h->central[i].mcentral, i);
  }
  
+   runtime_unlock(&c->lock);
     if(s->npages < nelem(h->free))
       runtime_MSpanList_InsertBack(&h->busy[s->npages], s);
     else
       runtime_MSpanList_InsertBack(&h->busylarge, s);
 -   runtime_unlock(h);
 +   runtime_unlock(&h->lock);
   }
  }
-diff -r 0fde0b6a7eb2 libgo/runtime/netpoll.goc
---- a/libgo/runtime/netpoll.goc Fri Jan 09 17:00:26 2015 -0800
-+++ b/libgo/runtime/netpoll.goc Fri Feb 13 12:12:23 2015 -0800
+diff -r a6e10414311a libgo/runtime/netpoll.goc
+--- a/libgo/runtime/netpoll.goc Fri Jan 16 07:57:02 2015 -0800
++++ b/libgo/runtime/netpoll.goc Fri Feb 13 16:36:07 2015 -0800
 @@ -53,7 +53,7 @@
   // pollReset, pollWait, pollWaitCanceled and runtime_netpollready (IO rediness notification)
   // proceed w/o taking the lock. So closing, rg, rd, wg and wd are manipulated
   // in a lock-free way by all operations.
 - Lock;   // protectes the following fields
 + Lock  lock; // protectes the following fields
   uintptr fd;
   bool  closing;

 - runtime_lock(pd);
 + runtime_lock(&pd->lock);
   if(pd->closing) {
 -   runtime_unlock(pd);
 +   runtime_unlock(&pd->lock);
     return;
   }
   pd->seq++;  // invalidate current timers
-@@ -223,7 +223,7 @@
+@@ -226,7 +226,7 @@
     rg = netpollunblock(pd, 'r', false);
   if(pd->wd < 0)
     wg = netpollunblock(pd, 'w', false);
 - runtime_unlock(pd);
 + runtime_unlock(&pd->lock);
   if(rg)
     runtime_ready(rg);
   if(wg)
-@@ -233,7 +233,7 @@
+@@ -236,7 +236,7 @@
  func runtime_pollUnblock(pd *PollDesc) {
   G *rg, *wg;
  
 - runtime_lock(pd);
 + runtime_lock(&pd->lock);
   if(pd->closing)
     runtime_throw("runtime_pollUnblock: already closing");
   pd->closing = true;
-@@ -249,7 +249,7 @@
+@@ -252,7 +252,7 @@
     runtime_deltimer(&pd->wt);
     pd->wt.fv = nil;
   }
 - runtime_unlock(pd);
 + runtime_unlock(&pd->lock);
   if(rg)
     runtime_ready(rg);
   if(wg)
-@@ -277,13 +277,13 @@
+@@ -280,13 +280,13 @@
  void
  runtime_netpolllock(PollDesc *pd)
  {
 - runtime_lock(pd);
 + runtime_lock(&pd->lock);
  }
  
  void
  runtime_netpollunlock(PollDesc *pd)
  {
 - runtime_unlock(pd);
 + runtime_unlock(&pd->lock);
  }
  
  // make pd ready, newly runnable goroutines (if any) are enqueued info gpp list
-@@ -401,10 +401,10 @@
-  // If it's stale, ignore the timer event.
-  seq = (uintptr)arg.type;
+@@ -399,12 +399,12 @@
+ 
+  pd = (PollDesc*)arg.data;
   rg = wg = nil;
 - runtime_lock(pd);
 + runtime_lock(&pd->lock);
+  // Seq arg is seq when the timer was set.
+  // If it's stale, ignore the timer event.
   if(seq != pd->seq) {
     // The descriptor was reused or timers were reset.
 -   runtime_unlock(pd);
 +   runtime_unlock(&pd->lock);
     return;
   }
   if(read) {
 @@ -421,7 +421,7 @@

 @@ -467,6 +467,6 @@
   }
   pd = pollcache.first;
   pollcache.first = pd->link;
 - runtime_unlock(&pollcache);
 + runtime_unlock(&pollcache.lock);
   return pd;
  }
-diff -r 0fde0b6a7eb2 libgo/runtime/proc.c
---- a/libgo/runtime/proc.c  Fri Jan 09 17:00:26 2015 -0800
-+++ b/libgo/runtime/proc.c  Fri Feb 13 12:12:23 2015 -0800
+diff -r a6e10414311a libgo/runtime/proc.c
+--- a/libgo/runtime/proc.c  Fri Jan 16 07:57:02 2015 -0800
++++ b/libgo/runtime/proc.c  Fri Feb 13 16:36:07 2015 -0800
 @@ -302,7 +302,7 @@
  
  typedef struct Sched Sched;
  struct Sched {
 - Lock;
 + Lock  lock;
  
   uint64  goidgen;
+ runtime_lock(&runtime_sched.lock);
   out = runtime_sched.maxmcount;
   runtime_sched.maxmcount = in;
   checkmcount();
 - runtime_unlock(&runtime_sched);
 + runtime_unlock(&runtime_sched.lock);
   return out;
  }
  
-diff -r 0fde0b6a7eb2 libgo/runtime/runtime.h
---- a/libgo/runtime/runtime.h Fri Jan 09 17:00:26 2015 -0800
-+++ b/libgo/runtime/runtime.h Fri Feb 13 12:12:23 2015 -0800
+diff -r a6e10414311a libgo/runtime/runtime.h
+--- a/libgo/runtime/runtime.h Fri Jan 16 07:57:02 2015 -0800
++++ b/libgo/runtime/runtime.h Fri Feb 13 16:36:07 2015 -0800
 @@ -286,7 +286,7 @@
  
  struct P
  {
 - Lock;
 + Lock  lock;
  
   int32 id;
   uint32  status;   // one of Pidle/Prunning/...
 @@ -384,7 +384,7 @@
  
  struct Timers
  {
 - Lock;
 + Lock  lock;
   G *timerproc;
   bool    sleeping;
   bool    rescheduling;
-diff -r 0fde0b6a7eb2 libgo/runtime/sema.goc
---- a/libgo/runtime/sema.goc  Fri Jan 09 17:00:26 2015 -0800
-+++ b/libgo/runtime/sema.goc  Fri Feb 13 12:12:23 2015 -0800
+diff -r a6e10414311a libgo/runtime/sema.goc
+--- a/libgo/runtime/sema.goc  Fri Jan 16 07:57:02 2015 -0800
++++ b/libgo/runtime/sema.goc  Fri Feb 13 16:36:07 2015 -0800
 @@ -35,7 +35,7 @@
  typedef struct SemaRoot SemaRoot;
  struct SemaRoot
  {
 - Lock;
 + Lock    lock;
   SemaWaiter* head;
   SemaWaiter* tail;
else
       s->tail->next = &w;
     s->tail = &w;
 -   runtime_parkunlock(s, "semarelease");
 +   runtime_parkunlock(&s->lock, "semarelease");
   } else
 -   runtime_unlock(s);
 +   runtime_unlock(&s->lock);
  }
-diff -r 0fde0b6a7eb2 libgo/runtime/sigqueue.goc
---- a/libgo/runtime/sigqueue.goc  Fri Jan 09 17:00:26 2015 -0800
-+++ b/libgo/runtime/sigqueue.goc  Fri Feb 13 12:12:23 2015 -0800
+diff -r a6e10414311a libgo/runtime/sigqueue.goc
+--- a/libgo/runtime/sigqueue.goc  Fri Jan 16 07:57:02 2015 -0800
++++ b/libgo/runtime/sigqueue.goc  Fri Feb 13 16:36:07 2015 -0800
 @@ -32,7 +32,7 @@
  #include "defs.h"
  
  static struct {
 - Note;
 + Note note;
   uint32 mask[(NSIG+31)/32];
   uint32 wanted[(NSIG+31)/32];
@@ -138,7 +138,7 @@
     // to use for initialization.  It does not pass
     // signal information in m.
     sig.inuse = true; // enable reception of signals; cannot disable
 -   runtime_noteclear(&sig);
 +   runtime_noteclear(&sig.note);
     return;
   }
   
-diff -r 0fde0b6a7eb2 libgo/runtime/time.goc
---- a/libgo/runtime/time.goc  Fri Jan 09 17:00:26 2015 -0800
-+++ b/libgo/runtime/time.goc  Fri Feb 13 12:12:23 2015 -0800
-@@ -91,17 +91,17 @@
-  t.period = 0;
+diff -r a6e10414311a libgo/runtime/time.goc
+--- a/libgo/runtime/time.goc  Fri Jan 16 07:57:02 2015 -0800
++++ b/libgo/runtime/time.goc  Fri Feb 13 16:36:07 2015 -0800
+@@ -92,17 +92,17 @@
   t.fv = &readyv;
   t.arg.__object = g;
+  t.seq = 0;
 - runtime_lock(&timers);
 + runtime_lock(&timers.lock);
   addtimer(&t);
 - runtime_parkunlock(&timers, reason);
 + runtime_parkunlock(&timers.lock, reason);
  }
  
  void
  runtime_addtimer(Timer *t)
  {
 - runtime_lock(&timers);
 + runtime_lock(&timers.lock);
   addtimer(t);
 - runtime_unlock(&timers);
 + runtime_unlock(&timers.lock);
  }
  
  // Add a timer to the heap and start or kick the timer proc
-@@ -166,14 +166,14 @@
+@@ -167,14 +167,14 @@
   i = t->i;
   gi = i;
  
 - runtime_lock(&timers);
 + runtime_lock(&timers.lock);
  
   // t may not be registered anymore and may have
   // a bogus i (typically 0, if generated by Go).
   // Verify it before proceeding.
   i = t->i;
   if(i < 0 || i >= timers.len || timers.t[i] != t) {
 -   runtime_unlock(&timers);
 +   runtime_unlock(&timers.lock);
     return false;
   }
  
-@@ -189,7 +189,7 @@
+@@ -190,7 +190,7 @@
   }
   if(debug)
     dumptimers("deltimer");
 - runtime_unlock(&timers);
 + runtime_unlock(&timers.lock);
   return true;
  }
  
-@@ -207,7 +207,7 @@
-  Eface arg;
+@@ -209,7 +209,7 @@
+  uintptr seq;
  
   for(;;) {
 -   runtime_lock(&timers);
 +   runtime_lock(&timers.lock);
     timers.sleeping = false;
     now = runtime_nanotime();
     for(;;) {
-@@ -233,7 +233,7 @@
-      fv = t->fv;
+@@ -236,7 +236,7 @@
       f = (void*)t->fv->fn;
       arg = t->arg;
+      seq = t->seq;
 -     runtime_unlock(&timers);
 +     runtime_unlock(&timers.lock);
       __go_set_closure(fv);
-      f(now, arg);
+      f(arg, seq);
  
-@@ -244,20 +244,20 @@
+@@ -247,20 +247,20 @@
       arg.__object = nil;
       USED(&arg);
  
 -     runtime_lock(&timers);
 +     runtime_lock(&timers.lock);
     }
     if(delta < 0) {
       // No timers left - put goroutine to sleep.

update_third_party.sh

 #!/bin/sh -e
 
 gofrontendrepo=https://code.google.com/p/gofrontend
-gofrontendrev=0fde0b6a7eb2
+gofrontendrev=a6e10414311a
 
 gccrepo=svn://gcc.gnu.org/svn/gcc/trunk
 gccrev=216268
 
 gotoolsrepo=https://go.googlesource.com/tools
 gotoolsrev=d4e70101500b43ffe705d4c45e50dd4f1c8e3b2e
 
 tempdir=$(mktemp -d /tmp/update_third_party.XXXXXX)