iterator itab table, remove all interface inter or type in load module

pkujhd · Jul 13, 2020 · b3853c8 · b3853c8
1 parent be33f75
commit b3853c8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/iface.1.10.go b/iface.1.10.go
@@ -1,5 +1,5 @@
 // +build go1.10
-// +build !go1.15
+// +build !go1.16
 
 package goloader
 
@@ -65,9 +65,11 @@ func removeitabs(module *moduledata) bool {
 		p := (**itab)(add(unsafe.Pointer(&itabTable.entries), i*PtrSize))
 		m := (*itab)(loadp(unsafe.Pointer(p)))
 		if m != nil {
+			uintptrm := uintptr(unsafe.Pointer(m))
 			inter := uintptr(unsafe.Pointer(m.inter))
 			_type := uintptr(unsafe.Pointer(m._type))
-			if (inter >= module.types && inter <= module.etypes) || (_type >= module.types && _type <= module.etypes) {
+			if (inter >= module.types && inter <= module.etypes) || (_type >= module.types && _type <= module.etypes) ||
+				(uintptrm >= module.types && uintptrm <= module.etypes) {
 				atomicstorep(unsafe.Pointer(p), unsafe.Pointer(nil))
 				itabTable.count = itabTable.count - 1
 			}

diff --git a/iface.1.8.go b/iface.1.8.go
@@ -63,9 +63,11 @@ func removeitabs(module *moduledata) bool {
 	for index, h := range &hash {
 		last := h
 		for m := h; m != nil; m = m.link {
+			uintptrm := uintptr(unsafe.Pointer(m))
 			inter := uintptr(unsafe.Pointer(m.inter))
 			_type := uintptr(unsafe.Pointer(m._type))
-			if (inter >= module.types && inter <= module.etypes) || (_type >= module.types && _type <= module.etypes) {
+			if (inter >= module.types && inter <= module.etypes) || (_type >= module.types && _type <= module.etypes) ||
+				(uintptrm >= module.types && uintptrm <= module.etypes) {
 				if m == h {
 					hash[index] = m.link
 				} else {