mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

checker/ci: workaround bug causing errors with -usecache (sumtype field access) & add more -usecache tests (#10199)

Browse Source
This commit is contained in:
joe-conigliaro 2021-05-25 19:28:18 +10:00 committed by GitHub
parent 5b8402bccb
commit 4217f05146
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
.github/workflows/ci.yml vendored
View File

@ -280,8 +280,11 @@ jobs:
UBSAN_OPTIONS=print_stacktrace=1:halt_on_error=1 ./v2 -o v.c cmd/v UBSAN_OPTIONS=print_stacktrace=1:halt_on_error=1 ./v2 -o v.c cmd/v
- name: Build V using V - name: Build V using V
run: ./v -o v2 cmd/v && ./v2 -o v3 cmd/v run: ./v -o v2 cmd/v && ./v2 -o v3 cmd/v
- name: v self with -usecache - name: v self compilation with -usecache
run: ./v -o v2 -usecache cmd/v run: |
./v -o v2 -usecache cmd/v
./v2 -o v3 -usecache cmd/v
./v3 -usecache examples/tetris/tetris.v
- name: Test symlink - name: Test symlink
run: ./v symlink run: ./v symlink
# - name: Set up pg database # - name: Set up pg database
@ -368,10 +371,11 @@ jobs:
run: ./v -freestanding run vlib/os/bare/bare_example_linux.v run: ./v -freestanding run vlib/os/bare/bare_example_linux.v
- name: v self compilation - name: v self compilation
run: ./v -o v2 cmd/v && ./v2 -o v3 cmd/v && ./v3 -o v4 cmd/v run: ./v -o v2 cmd/v && ./v2 -o v3 cmd/v && ./v3 -o v4 cmd/v
- name: -usecache - name: v self compilation with -usecache
run: | run: |
./v -o v2 -usecache cmd/v ./v -o v2 -usecache cmd/v
./v -usecache examples/tetris/tetris.v ./v2 -o v3 -usecache cmd/v
./v3 -usecache examples/tetris/tetris.v
- name: Verify `v test` works - name: Verify `v test` works
run: | run: |
./v cmd/tools/test_if_v_test_system_works.v ./v cmd/tools/test_if_v_test_system_works.v
@ -456,8 +460,11 @@ jobs:
ASAN_OPTIONS=detect_leaks=0 UBSAN_OPTIONS=print_stacktrace=1:halt_on_error=1 ./v5 -o v.c cmd/v ASAN_OPTIONS=detect_leaks=0 UBSAN_OPTIONS=print_stacktrace=1:halt_on_error=1 ./v5 -o v.c cmd/v
- name: v self compilation - name: v self compilation
run: ./v -o v2 cmd/v && ./v2 -o v3 cmd/v && ./v3 -o v4 cmd/v run: ./v -o v2 cmd/v && ./v2 -o v3 cmd/v && ./v3 -o v4 cmd/v
- name: v self with -usecache - name: v self compilation with -usecache
run: ./v -o v2 -usecache cmd/v run: |
./v -o v2 -usecache cmd/v
./v2 -o v3 -usecache cmd/v
./v3 -usecache examples/tetris/tetris.v
- name: Verify `v test` works - name: Verify `v test` works
run: | run: |
./v cmd/tools/test_if_v_test_system_works.v ./v cmd/tools/test_if_v_test_system_works.v

9
vlib/v/checker/checker.v
View File

@ -1015,7 +1015,7 @@ pub fn (mut c Checker) infix_expr(mut infix_expr ast.InfixExpr) ast.Type {
} }
} }
mut return_type := left_type mut return_type := left_type
if !c.pref.use_cache && infix_expr.op != .key_is { if infix_expr.op != .key_is {
match mut infix_expr.left { match mut infix_expr.left {
ast.Ident, ast.SelectorExpr { ast.Ident, ast.SelectorExpr {
if infix_expr.left.is_mut { if infix_expr.left.is_mut {
@ -1685,7 +1685,10 @@ fn (mut c Checker) check_map_and_filter(is_map bool, elem_typ ast.Type, call_exp
return return
} }
} }
if !is_map && arg_expr.info.typ != ast.bool_type { // NOTE: bug accessing typ field on sumtype variant (not cast properly).
// leaving this here as the resulting issue is notoriously hard to debug.
// if !is_map && arg_expr.info.typ != ast.bool_type {
if !is_map && arg_expr.var_info().typ != ast.bool_type {
c.error('type mismatch, should be bool', arg_expr.pos) c.error('type mismatch, should be bool', arg_expr.pos)
} }
} }
@ -5122,7 +5125,7 @@ pub fn (mut c Checker) ident(mut ident ast.Ident) ast.Type {
return info.typ return info.typ
} else if ident.kind == .unresolved { } else if ident.kind == .unresolved {
// first use // first use
if !c.pref.use_cache && ident.tok_kind == .assign && ident.is_mut { if ident.tok_kind == .assign && ident.is_mut {
c.error('`mut` not allowed with `=` (use `:=` to declare a variable)', ident.pos) c.error('`mut` not allowed with `=` (use `:=` to declare a variable)', ident.pos)
} }
if obj := ident.scope.find(ident.name) { if obj := ident.scope.find(ident.name) {