Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cgen: cast 'vstring'.str to char * if it is the expected type #19827

Closed
wants to merge 6 commits into from
Closed

cgen: cast 'vstring'.str to char * if it is the expected type #19827

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4eae9c6
cgen: cast 'vstring'.str to `char *`
ttytm Nov 10, 2023
1cc3701
extend &u8 usage in `mbedtls.c.v` to more types that are declared as …
ttytm Nov 10, 2023
585a767
improve fix, be more explicit
ttytm Nov 10, 2023
1847a7f
use `&char` where `char *` is declared in `mbedtls.c.v`
ttytm Nov 10, 2023
be9a9c9
cover more cases
ttytm Nov 10, 2023
1034487
update test
ttytm Nov 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions vlib/net/mbedtls/mbedtls.c.v
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,8 @@ fn C.mbedtls_entropy_free(&C.mbedtls_entropy_context)

fn C.mbedtls_ssl_config_defaults(&C.mbedtls_ssl_config, int, int, int) int

fn C.mbedtls_x509_crt_parse(&C.mbedtls_x509_crt, &char, int) int
fn C.mbedtls_pk_parse_key(&C.mbedtls_pk_context, &char, int, &char, int, voidptr, voidptr) int
fn C.mbedtls_x509_crt_parse(&C.mbedtls_x509_crt, &u8, int) int
fn C.mbedtls_pk_parse_key(&C.mbedtls_pk_context, &u8, int, &char, int, voidptr, voidptr) int
Comment on lines -166 to +167
Copy link
Member Author

@ttytm ttytm Nov 10, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixing this to use &u8 where types are declared as unsigned char * allows for green CI.

v/thirdparty/mbedtls/include/mbedtls/pk.h

Lines 793 to 795 in e59c194

int mbedtls_pk_parse_key( mbedtls_pk_context *ctx,
const unsigned char *key, size_t keylen,
const unsigned char *pwd, size_t pwdlen,

fn C.mbedtls_x509_crt_parse_file(&C.mbedtls_x509_crt, &char) int
fn C.mbedtls_pk_parse_keyfile(&C.mbedtls_pk_context, &char, &char, voidptr, voidptr) int

Expand All @@ -188,8 +188,8 @@ fn C.mbedtls_ssl_set_bio(&C.mbedtls_ssl_context, &C.mbedtls_net_context, voidptr

fn C.mbedtls_ssl_handshake(&C.mbedtls_ssl_context) int

fn C.mbedtls_ssl_read(&C.mbedtls_ssl_context, &char, int) int
fn C.mbedtls_ssl_write(&C.mbedtls_ssl_context, &char, int) int
fn C.mbedtls_ssl_read(&C.mbedtls_ssl_context, &u8, int) int
fn C.mbedtls_ssl_write(&C.mbedtls_ssl_context, &u8, int) int

fn C.mbedtls_high_level_strerr(int) &char

Expand Down
19 changes: 11 additions & 8 deletions vlib/v/gen/c/cgen.v
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2544,14 +2544,17 @@ fn (mut g Gen) expr_with_cast(expr ast.Expr, got_type_raw ast.Type, expected_typ
g.write('->val')
return
}
if got_is_ptr && !expected_is_ptr && neither_void && exp_sym.kind != .placeholder
&& expr !is ast.InfixExpr {
got_deref_type := got_type.deref()
deref_sym := g.table.sym(got_deref_type)
deref_will_match := expected_type in [got_type, got_deref_type, deref_sym.parent_idx]
got_is_opt_or_res := got_type.has_flag(.option) || got_type.has_flag(.result)
if deref_will_match || got_is_opt_or_res || expr.is_auto_deref_var() {
g.write('*')
if got_is_ptr && neither_void && exp_sym.kind != .placeholder && expr !is ast.InfixExpr {
if !expected_is_ptr {
got_deref_type := got_type.deref()
deref_sym := g.table.sym(got_deref_type)
deref_will_match := expected_type in [got_type, got_deref_type, deref_sym.parent_idx]
got_is_opt_or_res := got_type.has_flag(.option) || got_type.has_flag(.result)
if deref_will_match || got_is_opt_or_res || expr.is_auto_deref_var() {
g.write('*')
}
} else if expr !is ast.StringLiteral && exp_sym.kind == .char && got_sym.kind == .u8 {
g.write('(${exp_styp})')
}
}
if expr is ast.IntegerLiteral {
Expand Down
1 change: 1 addition & 0 deletions vlib/v/gen/c/testdata/c_fn_args.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
bar
8 changes: 8 additions & 0 deletions vlib/v/gen/c/testdata/c_fn_args.vv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
fn foo(str &char) {
println(unsafe { str.vstring() })
}

fn main() {
// Should compile with `-cc [gcc/clang] -cstrict`
foo('bar'.str)
}
Loading