fix #94, support golang1.22

pkujhd · Dec 27, 2023 · 1fd5bd4 · 1fd5bd4
1 parent 2fbc174
commit 1fd5bd4
Show file tree

Hide file tree

Showing 23 changed files with 46 additions and 44 deletions.
diff --git a/constants/const_pkgpath.1.19.go b/constants/const_pkgpath.1.19.go
@@ -1,5 +1,5 @@
-//go:build go1.19 && !go1.22
-// +build go1.19,!go1.22
+//go:build go1.19 && !go1.23
+// +build go1.19,!go1.23
 
 package constants
 

diff --git a/constants/const_type.1.20.go b/constants/const_type.1.20.go
@@ -1,5 +1,5 @@
-//go:build go1.20 && !go1.22
-// +build go1.20,!go1.22
+//go:build go1.20 && !go1.23
+// +build go1.20,!go1.23
 
 package constants
 

diff --git a/deferreturn.go b/deferreturn.go
@@ -1,5 +1,5 @@
-//go:build go1.14 && !go1.22
-// +build go1.14,!go1.22
+//go:build go1.14 && !go1.23
+// +build go1.14,!go1.23
 
 package goloader
 

diff --git a/examples/loader/loader.go b/examples/loader/loader.go
@@ -65,7 +65,7 @@ func main() {
 	str := make([]string, 0)
 	goloader.RegTypes(symPtr, http.ListenAndServe, http.Dir("/"),
 		http.Handler(http.FileServer(http.Dir("/"))), http.FileServer, http.HandleFunc,
-		&http.Request{}, &http.Server{})
+		&http.Request{}, &http.Server{}, (&http.ServeMux{}).Handle)
 	goloader.RegTypes(symPtr, runtime.LockOSThread, &w, w.Wait)
 	goloader.RegTypes(symPtr, fmt.Sprint, str)
 

diff --git a/func.1.20.go b/func.1.20.go
@@ -1,5 +1,5 @@
-//go:build go1.20 && !go1.22
-// +build go1.20,!go1.22
+//go:build go1.20 && !go1.23
+// +build go1.20,!go1.23
 
 package goloader
 

diff --git a/functab.1.18.go b/functab.1.18.go
@@ -1,5 +1,5 @@
-//go:build go1.18 && !go1.22
-// +build go1.18,!go1.22
+//go:build go1.18 && !go1.23
+// +build go1.18,!go1.23
 
 package goloader
 

diff --git a/iface.1.10.go b/iface.1.10.go
@@ -1,5 +1,5 @@
-//go:build go1.10 && !go1.22
-// +build go1.10,!go1.22
+//go:build go1.10 && !go1.23
+// +build go1.10,!go1.23
 
 package goloader
 

diff --git a/init.1.21.go b/init.1.21.go
@@ -1,5 +1,5 @@
-//go:build go1.21 && !go1.22
-// +build go1.21,!go1.22
+//go:build go1.21 && !go1.23
+// +build go1.21,!go1.23
 
 package goloader
 

diff --git a/ld.go b/ld.go
@@ -271,6 +271,8 @@ func (linker *Linker) addSymbol(name string) (symbol *obj.Sym, err error) {
 		if _, ok := linker.symMap[objsym.Type]; !ok {
 			if _, ok := linker.objSymbolMap[objsym.Type]; !ok {
 				linker.symMap[objsym.Type] = &obj.Sym{Name: objsym.Type, Offset: InvalidOffset}
+			} else {
+				linker.addSymbol(objsym.Type)
 			}
 		}
 	}

diff --git a/module.1.21.go b/module.1.21.go
@@ -1,5 +1,5 @@
-//go:build go1.21 && !go1.22
-// +build go1.21,!go1.22
+//go:build go1.21 && !go1.23
+// +build go1.21,!go1.23
 
 package goloader
 

diff --git a/obj/funcinfo.1.20.go b/obj/funcinfo.1.20.go
@@ -1,5 +1,5 @@
-//go:build go1.20 && !go1.22
-// +build go1.20,!go1.22
+//go:build go1.20 && !go1.23
+// +build go1.20,!go1.23
 
 package obj
 

diff --git a/obj/inlinedcall.1.20.go b/obj/inlinedcall.1.20.go
@@ -1,5 +1,5 @@
-//go:build go1.20 && !go1.22
-// +build go1.20,!go1.22
+//go:build go1.20 && !go1.23
+// +build go1.20,!go1.23
 
 package obj
 

diff --git a/obj/pathtoprefix.1.9.go b/obj/pathtoprefix.1.9.go
@@ -1,5 +1,5 @@
-//go:build go1.9 && !go1.22
-// +build go1.9,!go1.22
+//go:build go1.9 && !go1.23
+// +build go1.9,!go1.23
 
 package obj
 

diff --git a/obj/readobj.1.16.go b/obj/readobj.1.16.go
@@ -1,5 +1,5 @@
-//go:build go1.16 && !go1.22
-// +build go1.16,!go1.22
+//go:build go1.16 && !go1.23
+// +build go1.16,!go1.23
 
 package obj
 

diff --git a/objabi/dataindex/dataindex.1.20.go b/objabi/dataindex/dataindex.1.20.go
@@ -1,5 +1,5 @@
-//go:build go1.20 && !go1.22
-// +build go1.20,!go1.22
+//go:build go1.20 && !go1.23
+// +build go1.20,!go1.23
 
 package dataindex
 

diff --git a/objabi/funcalign/funcalign.1.16.go b/objabi/funcalign/funcalign.1.16.go
@@ -1,5 +1,5 @@
-//go:build go1.16 && !go1.22
-// +build go1.16,!go1.22
+//go:build go1.16 && !go1.23
+// +build go1.16,!go1.23
 
 package funcalign
 

diff --git a/objabi/reloctype/reloctype.1.21.go b/objabi/reloctype/reloctype.1.21.go
@@ -1,5 +1,5 @@
-//go:build go1.21 && !go1.22
-// +build go1.21,!go1.22
+//go:build go1.21 && !go1.23
+// +build go1.21,!go1.23
 
 package reloctype
 

diff --git a/objabi/symkind/symkind.1.9.go b/objabi/symkind/symkind.1.9.go
@@ -1,5 +1,5 @@
-//go:build go1.9 && !go1.22
-// +build go1.9,!go1.22
+//go:build go1.9 && !go1.23
+// +build go1.9,!go1.23
 
 package symkind
 

diff --git a/objabi/tls/headtype.1.9.go b/objabi/tls/headtype.1.9.go
@@ -1,5 +1,5 @@
-//go:build go1.9 && !go1.22
-// +build go1.9,!go1.22
+//go:build go1.9 && !go1.23
+// +build go1.9,!go1.23
 
 package tls
 

diff --git a/objabi/tls/tls.1.13.go b/objabi/tls/tls.1.13.go
@@ -1,5 +1,5 @@
-//go:build go1.13 && !go1.22
-// +build go1.13,!go1.22
+//go:build go1.13 && !go1.23
+// +build go1.13,!go1.23
 
 package tls
 

diff --git a/stackobject/stackobject.1.18.go b/stackobject/stackobject.1.18.go
@@ -1,5 +1,5 @@
-//go:build go1.18 && !go1.22
-// +build go1.18,!go1.22
+//go:build go1.18 && !go1.23
+// +build go1.18,!go1.23
 
 package stackobject
 

diff --git a/stackobject/stackobject.go b/stackobject/stackobject.go
@@ -1,5 +1,5 @@
-//go:build go1.12 && !go1.22
-// +build go1.12,!go1.22
+//go:build go1.12 && !go1.23
+// +build go1.12,!go1.23
 
 package stackobject
 

diff --git a/type.1.14.go b/type.1.14.go
@@ -1,5 +1,5 @@
-//go:build go1.14 && !go1.22
-// +build go1.14,!go1.22
+//go:build go1.14 && !go1.23
+// +build go1.14,!go1.23
 
 package goloader
 
@@ -28,4 +28,4 @@ type _type struct {
 	gcdata    *byte
 	str       nameOff
 	ptrToThis typeOff
-}
+}