fixes

Author: medvednikov

ci/common/runner.v

@@ -7,13 +7,23 @@ import time
 
 // exec is a helper function, to execute commands and exit early, if they fail.
 pub fn exec(command string) {
-	log.info('cmd: ${command}')
-	result := os.system(command)
+	cmd := resolve_v_command(command)
+	log.info('cmd: ${cmd}')
+	result := os.system(cmd)
 	if result != 0 {
 		exit(result)
 	}
 }
 
+// resolve_v_command ensures that commands starting with `v ` use the V from @VEXEROOT,
+// not a potentially different V found via PATH.
+fn resolve_v_command(command string) string {
+	if command.starts_with('v ') {
+		return os.quoted_path(os.join_path_single(@VEXEROOT, 'v')) + command[1..]
+	}
+	return command
+}
+
 // unset is a helper function to unset a specific env variable.
 pub fn unset(evar string) {
 	log.info('unsetting env variable: ${evar}')
@@ -37,7 +47,7 @@ pub fn file_size_greater_than(fpath string, min_fsize u64) {
 	}
 }
 
-const self_command = 'v ' +
+const self_command = os.quoted_path(os.join_path_single(@VEXEROOT, 'v')) + ' ' +
 	os.real_path(os.executable()).replace_once(os.real_path(@VEXEROOT), '').trim_left('/\\') +
 	'.vsh'
 

vlib/v/ast/table.v

@@ -4331,11 +4331,26 @@ pub fn (mut t Table) generic_insts_to_concrete() {
 		}
 		if sym.info is Struct {
 			if sym.info.concrete_types.len > 0 && sym.info.parent_type.has_flag(.generic) {
+				// Only register if none of this type's methods have been registered yet
+				// by the first pass (generic_inst handling), to avoid interfering with
+				// types that are already correctly handled.
 				parent_sym := t.sym(sym.info.parent_type)
+				mut any_method_registered := false
 				for method in parent_sym.methods {
-					if method.generic_names.len == sym.info.concrete_types.len
-						&& t.should_auto_register_concrete_method(method, sym.info.parent_type, sym.info.concrete_types) {
-						t.register_fn_concrete_types(method.fkey(), sym.info.concrete_types)
+					if method.generic_names.len == sym.info.concrete_types.len {
+						a := t.fn_generic_types[method.fkey()] or { [][]Type{} }
+						if sym.info.concrete_types in a {
+							any_method_registered = true
+							break
+						}
+					}
+				}
+				if !any_method_registered {
+					for method in parent_sym.methods {
+						if method.generic_names.len == sym.info.concrete_types.len
+							&& t.should_auto_register_concrete_method(method, sym.info.parent_type, sym.info.concrete_types) {
+							t.register_fn_concrete_types(method.fkey(), sym.info.concrete_types)
+						}
 					}
 				}
 			}

vlib/v/parser/assign.v

@@ -132,6 +132,10 @@ fn (mut p Parser) check_undefined_variables(names []string, val ast.Expr) ! {
 }
 
 fn (mut p Parser) check_cross_variables(exprs []ast.Expr, val ast.Expr) bool {
+	// NOTE: val_str must be computed before the match, because inside match arms
+	// `val` gets smartcast to the variant type, and calling .str() on e.g.
+	// IndexExpr would call the auto-generated struct str() instead of Expr.str().
+	val_str := val.str()
 	match val {
 		ast.Ident {
 			for expr in exprs {
@@ -143,7 +147,6 @@ fn (mut p Parser) check_cross_variables(exprs []ast.Expr, val ast.Expr) bool {
 			}
 		}
 		ast.IndexExpr {
-			val_str := val.str()
 			for expr in exprs {
 				if expr.str() == val_str {
 					return true
@@ -174,7 +177,6 @@ fn (mut p Parser) check_cross_variables(exprs []ast.Expr, val ast.Expr) bool {
 			return p.check_cross_variables(exprs, val.expr)
 		}
 		ast.SelectorExpr {
-			val_str := val.str()
 			for expr in exprs {
 				if expr.str() == val_str {
 					return true