From 8ad218804e12534b40cbf742450956ffe77bc584 Mon Sep 17 00:00:00 2001
From: Tonis Tiigi <tonistiigi@gmail.com>
Date: Mon, 5 Aug 2019 17:10:30 -0700
Subject: [PATCH] correct int64 alignment

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
---
 control/control.go    | 2 +-
 solver/result.go      | 2 +-
 util/pull/resolver.go | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/control/control.go b/control/control.go
index 18c8538a6..d426bd79b 100644
--- a/control/control.go
+++ b/control/control.go
@@ -38,13 +38,13 @@ type Opt struct {
 }
 
 type Controller struct { // TODO: ControlService
+	buildCount       int64
 	opt              Opt
 	solver           *llbsolver.Solver
 	cache            solver.CacheManager
 	gatewayForwarder *controlgateway.GatewayForwarder
 	throttledGC      func()
 	gcmu             sync.Mutex
-	buildCount       int64
 }
 
 func NewController(opt Opt) (*Controller, error) {
diff --git a/solver/result.go b/solver/result.go
index b217ae083..c7e100b08 100644
--- a/solver/result.go
+++ b/solver/result.go
@@ -40,9 +40,9 @@ func dup(res Result) (Result, Result) {
 }
 
 type splitResult struct {
-	Result
 	released int64
 	sem      *int64
+	Result
 }
 
 func (r *splitResult) Release(ctx context.Context) error {
diff --git a/util/pull/resolver.go b/util/pull/resolver.go
index 4c3f27268..d4fed1835 100644
--- a/util/pull/resolver.go
+++ b/util/pull/resolver.go
@@ -135,9 +135,9 @@ type resolverCache struct {
 }
 
 type cachedResolver struct {
+	counter int64
 	timeout time.Time
 	remotes.Resolver
-	counter int64
 }
 
 func (cr *cachedResolver) Resolve(ctx context.Context, ref string) (name string, desc ocispec.Descriptor, err error) {