v.ast: implement Scope.find_ptr/1; use it internally instead of Scope.find/1 (#25386)

Author: spytheman

vlib/v/ast/scope.v

@@ -46,7 +46,7 @@ fn (s &Scope) dont_lookup_parent() bool {
 }
 
 pub fn (s &Scope) find(name string) ?ScopeObject {
-	if s == unsafe { nil } {
+	if _unlikely_(s == unsafe { nil }) {
 		return none
 	}
 	for sc := unsafe { s }; true; sc = sc.parent {
@@ -60,9 +60,24 @@ pub fn (s &Scope) find(name string) ?ScopeObject {
 	return none
 }
 
+pub fn (s &Scope) find_ptr(name string) &ScopeObject {
+	if _unlikely_(s == unsafe { nil }) {
+		return 0
+	}
+	for sc := unsafe { s }; true; sc = sc.parent {
+		if name in sc.objects {
+			return unsafe { &sc.objects[name] }
+		}
+		if sc.dont_lookup_parent() {
+			break
+		}
+	}
+	return 0
+}
+
 // selector_expr:  name.field_name
 pub fn (s &Scope) find_struct_field(name string, struct_type Type, field_name string) &ScopeStructField {
-	if s == unsafe { nil } {
+	if _unlikely_(s == unsafe { nil }) {
 		return unsafe { nil }
 	}
 	k := '${name}.${field_name}'
@@ -82,7 +97,8 @@ pub fn (s &Scope) find_struct_field(name string, struct_type Type, field_name st
 }
 
 pub fn (s &Scope) find_var(name string) ?&Var {
-	if obj := s.find(name) {
+	obj := s.find_ptr(name)
+	if _likely_(obj != unsafe { nil }) {
 		match obj {
 			Var { return &obj }
 			else {}
@@ -92,7 +108,8 @@ pub fn (s &Scope) find_var(name string) ?&Var {
 }
 
 pub fn (s &Scope) find_global(name string) ?&GlobalField {
-	if obj := s.find(name) {
+	obj := s.find_ptr(name)
+	if _likely_(obj != unsafe { nil }) {
 		match obj {
 			GlobalField { return &obj }
 			else {}
@@ -102,7 +119,8 @@ pub fn (s &Scope) find_global(name string) ?&GlobalField {
 }
 
 pub fn (s &Scope) find_const(name string) ?&ConstField {
-	if obj := s.find(name) {
+	obj := s.find_ptr(name)
+	if _likely_(obj != unsafe { nil }) {
 		match obj {
 			ConstField { return &obj }
 			else {}
@@ -112,7 +130,7 @@ pub fn (s &Scope) find_const(name string) ?&ConstField {
 }
 
 pub fn (s &Scope) known_var(name string) bool {
-	if s == unsafe { nil } {
+	if _unlikely_(s == unsafe { nil }) {
 		return false
 	}
 	for sc := unsafe { s }; true; sc = sc.parent {
@@ -280,7 +298,10 @@ pub fn (sc &Scope) show(depth int, max_depth int) string {
 }
 
 pub fn (mut sc Scope) mark_var_as_used(varname string) bool {
-	mut obj := sc.find(varname) or { return false }
+	mut obj := sc.find_ptr(varname)
+	if obj == unsafe { nil } {
+		return false
+	}
 	if mut obj is Var {
 		obj.is_used = true
 		return true

vlib/v/checker/checker.v

@@ -4212,7 +4212,9 @@ fn (mut c Checker) ident(mut node ast.Ident) ast.Type {
 			c.error('`mut` is not allowed with `=` (use `:=` to declare a variable)',
 				node.pos)
 		}
-		if mut obj := node.scope.find(node.name) {
+		mut pobj := node.scope.find_ptr(node.name)
+		if pobj != unsafe { nil } {
+			mut obj := *pobj
 			match mut obj {
 				ast.GlobalField {
 					if node.mod == '' {
@@ -4322,7 +4324,9 @@ fn (mut c Checker) ident(mut node ast.Ident) ast.Type {
 		else if !name.contains('.') && node.mod != 'builtin' {
 			name = '${node.mod}.${node.name}'
 		}
-		if mut obj := c.file.global_scope.find(name) {
+		pobj = c.file.global_scope.find_ptr(name)
+		if pobj != unsafe { nil } {
+			mut obj := *pobj
 			match mut obj {
 				ast.GlobalField {
 					node.kind = .global