vendor: update simplelru to v2

Signed-off-by: Tonis Tiigi <[email protected]>

Author: tonistiigi

cache/contenthash/checksum.go

@@ -12,7 +12,7 @@ import (
 	"sync"
 
 	iradix "github.com/hashicorp/go-immutable-radix/v2"
-	"github.com/hashicorp/golang-lru/simplelru"
+	simplelru "github.com/hashicorp/golang-lru/v2/simplelru"
 	"github.com/moby/buildkit/cache"
 	"github.com/moby/buildkit/session"
 	"github.com/moby/buildkit/snapshot"
@@ -31,7 +31,7 @@ var defaultManagerOnce sync.Once
 
 func getDefaultManager() *cacheManager {
 	defaultManagerOnce.Do(func() {
-		lru, _ := simplelru.NewLRU(20, nil) // error is impossible on positive size
+		lru, _ := simplelru.NewLRU[string, *cacheContext](20, nil) // error is impossible on positive size
 		defaultManager = &cacheManager{lru: lru, locker: locker.New()}
 	})
 	return defaultManager
@@ -85,7 +85,7 @@ type includedPath struct {
 
 type cacheManager struct {
 	locker *locker.Locker
-	lru    *simplelru.LRU
+	lru    *simplelru.LRU[string, *cacheContext]
 	lruMu  sync.Mutex
 }
 
@@ -110,10 +110,10 @@ func (cm *cacheManager) GetCacheContext(ctx context.Context, md cache.RefMetadat
 	cm.lruMu.Unlock()
 	if ok {
 		cm.locker.Unlock(md.ID())
-		v.(*cacheContext).mu.Lock() // locking is required because multiple ImmutableRefs can reach this code; however none of them use the linkMap.
-		v.(*cacheContext).linkMap = map[string][][]byte{}
-		v.(*cacheContext).mu.Unlock()
-		return v.(*cacheContext), nil
+		v.mu.Lock() // locking is required because multiple ImmutableRefs can reach this code; however none of them use the linkMap.
+		v.linkMap = map[string][][]byte{}
+		v.mu.Unlock()
+		return v, nil
 	}
 	cc, err := newCacheContext(md)
 	if err != nil {

go.mod

@@ -42,7 +42,7 @@ require (
 	github.com/hashicorp/go-cleanhttp v0.5.2
 	github.com/hashicorp/go-immutable-radix/v2 v2.1.0
 	github.com/hashicorp/go-multierror v1.1.1
-	github.com/hashicorp/golang-lru v0.5.4
+	github.com/hashicorp/golang-lru/v2 v2.0.0
 	github.com/in-toto/in-toto-golang v0.5.0
 	github.com/klauspost/compress v1.17.4
 	github.com/mitchellh/hashstructure/v2 v2.0.2
@@ -148,7 +148,6 @@ require (
 	github.com/hanwen/go-fuse/v2 v2.4.0 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-retryablehttp v0.7.5 // indirect
-	github.com/hashicorp/golang-lru/v2 v2.0.0 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
 	github.com/kylelemons/godebug v1.1.0 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect

go.sum

@@ -249,8 +249,6 @@ github.com/hashicorp/go-retryablehttp v0.7.5 h1:bJj+Pj19UZMIweq/iie+1u5YCdGrnxCT
 github.com/hashicorp/go-retryablehttp v0.7.5/go.mod h1:Jy/gPYAdjqffZ/yFGCFV2doI5wjtH1ewM9u8iYVjtX8=
 github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8=
 github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
-github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc=
-github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
 github.com/hashicorp/golang-lru/v2 v2.0.0 h1:Lf+9eD8m5pncvHAOCQj49GSN6aQI8XGfI5OpXNkoWaA=
 github.com/hashicorp/golang-lru/v2 v2.0.0/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=