From a484697958837c8654ca2248230f03ce041c90bf Mon Sep 17 00:00:00 2001
From: Felipe Pena <felipensp@gmail.com>
Date: Thu, 16 Mar 2023 10:02:06 -0300
Subject: [PATCH 1/3] fix

---
 vlib/v/gen/c/fn.v                            | 10 +++++++---
 vlib/v/tests/str_method_call_from_mut_test.v | 21 ++++++++++++++++++++
 2 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 vlib/v/tests/str_method_call_from_mut_test.v

diff --git a/vlib/v/gen/c/fn.v b/vlib/v/gen/c/fn.v
index 939689a805..9e775269ee 100644
--- a/vlib/v/gen/c/fn.v
+++ b/vlib/v/gen/c/fn.v
@@ -1171,10 +1171,11 @@ fn (mut g Gen) method_call(node ast.CallExpr) {
 
 	// TODO2
 	// g.generate_tmp_autofree_arg_vars(node, name)
-	if !node.receiver_type.is_ptr() && left_type.is_ptr() && node.name == 'str' {
+	has_str_method := node.name == 'str' && left_sym.has_method('str')
+	if !has_str_method && !node.receiver_type.is_ptr() && left_type.is_ptr() && node.name == 'str' {
 		g.write('ptr_str(')
-	} else if node.receiver_type.is_ptr() && left_type.is_ptr() && node.name == 'str'
-		&& !left_sym.has_method('str') {
+	} else if !has_str_method && node.receiver_type.is_ptr() && left_type.is_ptr()
+		&& node.name == 'str' {
 		g.gen_expr_to_string(node.left, left_type)
 		return
 	} else {
@@ -1244,6 +1245,9 @@ fn (mut g Gen) method_call(node ast.CallExpr) {
 				g.expr(node.left)
 			}
 		} else {
+			if has_str_method && left_type.is_ptr() && !node.receiver_type.is_ptr() {
+				g.write('*')
+			}
 			g.expr(node.left)
 		}
 		for i, embed in node.from_embed_types {
diff --git a/vlib/v/tests/str_method_call_from_mut_test.v b/vlib/v/tests/str_method_call_from_mut_test.v
new file mode 100644
index 0000000000..ed3d137eea
--- /dev/null
+++ b/vlib/v/tests/str_method_call_from_mut_test.v
@@ -0,0 +1,21 @@
+struct St {
+mut:
+	a []u8
+}
+
+pub fn (s St) str() string {
+	return s.a.bytestr()
+}
+
+fn confuser(mut s St) {
+	assert s.str() == 'a'
+}
+
+fn test_str_method_with_mut() {
+	mut s := St{
+		a: []u8{}
+	}
+	s.a << `a`
+	confuser(mut s)
+	assert s.str() == 'a'
+}

From 17f9b640edcce56f010439e123eff3c97e03c39d Mon Sep 17 00:00:00 2001
From: Felipe Pena <felipensp@gmail.com>
Date: Thu, 16 Mar 2023 18:16:06 -0300
Subject: [PATCH 2/3] fix

---
 vlib/v/gen/c/fn.v | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/vlib/v/gen/c/fn.v b/vlib/v/gen/c/fn.v
index 9e775269ee..8ab4348f1a 100644
--- a/vlib/v/gen/c/fn.v
+++ b/vlib/v/gen/c/fn.v
@@ -1245,7 +1245,8 @@ fn (mut g Gen) method_call(node ast.CallExpr) {
 				g.expr(node.left)
 			}
 		} else {
-			if has_str_method && left_type.is_ptr() && !node.receiver_type.is_ptr() {
+			if node.left is ast.Ident && has_str_method && left_type.is_ptr()
+				&& !node.receiver_type.is_ptr() {
 				g.write('*')
 			}
 			g.expr(node.left)

From 7c4905d7688d22fa46a02bf2ba6fd4a98f201ed1 Mon Sep 17 00:00:00 2001
From: Felipe Pena <felipensp@gmail.com>
Date: Fri, 17 Mar 2023 07:54:03 -0300
Subject: [PATCH 3/3] fix test

---
 vlib/builtin/int_test.v | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vlib/builtin/int_test.v b/vlib/builtin/int_test.v
index dac0cc1cbe..31f89f76d7 100644
--- a/vlib/builtin/int_test.v
+++ b/vlib/builtin/int_test.v
@@ -31,7 +31,7 @@ fn test_str_methods() {
 	assert u64(-1).str() == '18446744073709551615'
 	assert voidptr(-1).str() == '0xffffffffffffffff'
 	assert voidptr(1).str() == '0x1'
-	assert (&u8(-1)).str() == 'ffffffffffffffff'
+	assert (&u8(-1)).str() == '255'
 	assert (&u8(1)).str() == '1'
 	assert byteptr(-1).str() == '0xffffffffffffffff'
 	assert byteptr(1).str() == '0x1'