Merge pull request #1399 from Workiva/touchup120

grantnelson-wf · web-flow · commit 2f63887d2467 · 2026-01-12T08:48:26.000-07:00
Touchup of go1.20
diff --git a/.github/workflows/measure-size.yml b/.github/workflows/measure-size.yml
@@ -4,7 +4,6 @@ on: ['pull_request']
 
 env:
   GO_VERSION: '~1.20.14'
-  GOPHERJS_EXPERIMENT: generics
 
 jobs:
   measure:
diff --git a/build/context.go b/build/context.go
@@ -368,11 +368,18 @@ func (cc chainedCtx) Import(importPath string, srcDir string, mode build.ImportM
 	pkg, err := cc.primary.Import(importPath, srcDir, mode)
 	if err == nil {
 		return pkg, nil
-	} else if IsPkgNotFound(err) {
-		return cc.secondary.Import(importPath, srcDir, mode)
-	} else {
-		return nil, err
 	}
+
+	if IsPkgNotFound(err) {
+		if pkg, err2 := cc.secondary.Import(importPath, srcDir, mode); err2 == nil {
+			return pkg, nil
+		}
+		// if err2 != nil, return the original error that occurred in primary
+		// context since the secondary is for the virtual gopherjs context,
+		// meaning err2 will say that GOPATH is not set which is misleading.
+	}
+
+	return nil, err
 }
 
 func (cc chainedCtx) Env() Env { return cc.primary.Env() }
diff --git a/compiler/natives/src/crypto/subtle/xor.go b/compiler/natives/src/crypto/subtle/xor.go
@@ -18,7 +18,7 @@ func XORBytes(dst, x, y []byte) int {
 		panic("subtle.XORBytes: dst too short")
 	}
 
-	// The original uses unsafe and uintptr for specific architecture
+	// GOPHERJS: The original uses unsafe and uintptr for specific architecture
 	// to pack registers full instead of doing one byte at a time.
 	// We can't do the unsafe conversions from []byte to []uintptr
 	// but we can convert a Uint8Array into a Uint32Array,
@@ -73,7 +73,5 @@ const supportsUnaligned = false
 //gopherjs:purge
 func xorBytes(dstb, xb, yb *byte, n int)
 
-// TODO(grantnelson-wf): Check if this should be removed or not with generics.
-//
 //gopherjs:purge
 func xorLoop[T byte | uintptr](dst, x, y []T) {}
