v2: lots of ssa/builder fixes; make arm64 and ssac pass all tests

Author: medvednikov

cmd/tools/vast2/vast2.v

@@ -72,7 +72,7 @@ fn main() {
 	checker.check_files(ast_files)
 
 	// Transform
-	mut trans := transformer.Transformer.new(ast_files, env)
+	mut trans := transformer.Transformer.new_with_pref(ast_files, env, &prefs)
 	transformed_files := trans.transform_files(ast_files)
 
 	// Write post-transformation AST (only user files)

cmd/v2/test_ssa_backends.v

@@ -14,7 +14,7 @@ fn main() {
 	vroot := os.dir(@VEXE)
 	v2_source := os.join_path(vroot, 'cmd', 'v2', 'v2.v')
 	v2_binary := os.join_path(vroot, 'cmd', 'v2', 'v2')
-	build_res := os.execute('${@VEXE} ${v2_source} -o ${v2_binary}')
+	build_res := os.execute('${@VEXE} -gc none ${v2_source} -o ${v2_binary}')
 	if build_res.exit_code != 0 {
 		eprintln('Error: Failed to build v2')
 		eprintln(build_res.output)
@@ -52,7 +52,7 @@ fn main() {
 
 	// Run v2 with selected backend
 	println('[*] Running v2 -backend ${backend} ${input_file}...')
-	mut backend_flags := '-backend ${backend}'
+	mut backend_flags := '-gc none -backend ${backend}'
 	if backend == 'cleanc' {
 		// cleanc needs full per-run codegen for this suite right now.
 		backend_flags += ' -nomarkused -nocache'
@@ -90,7 +90,7 @@ fn main() {
 		// Run Reference (v run test.v)
 		println('[*] Running reference: ${@VEXE} -enable-globals run ${input_file}...')
 		os.rm(ref_output_path) or {}
-		ref_cmd := '${@VEXE} -n -w -enable-globals run ${input_file} > ${ref_output_path} 2>&1'
+		ref_cmd := '${@VEXE} -gc none -n -w -enable-globals run ${input_file} > ${ref_output_path} 2>&1'
 		ref_res := os.execute(ref_cmd)
 		ref_out := os.read_file(ref_output_path) or { '' }
 		os.rm(ref_output_path) or {}

cmd/v2/test_v2_self.sh

@@ -10,26 +10,30 @@ v3_bin="${script_dir}/v3"
 v4_bin="${script_dir}/v4"
 v5_bin="${script_dir}/v5"
 
-v1_compiler="${V:-${repo_root}/v}"
+preferred_v1_compiler="${HOME}/code/v/v"
+v1_compiler="${V:-${preferred_v1_compiler}}"
+if [[ ! -x "${v1_compiler}" ]]; then
+	v1_compiler="${repo_root}/v"
+fi
 if [[ ! -x "${v1_compiler}" ]]; then
 	echo "FAILURE: v1 compiler not found or not executable: ${v1_compiler}"
 	exit 1
 fi
 
 # Build v2 with v1.
 rm -f "${v2_bin}" "${v3_bin}" "${v3_bin}.c" "${v4_bin}" "${v4_bin}.c" "${v5_bin}" "${v5_bin}.c"
-"${v1_compiler}" -o "${v2_bin}" "${v2_source}"
+"${v1_compiler}" -gc none -o "${v2_bin}" "${v2_source}"
 
 # Use v2 to compile itself to v3 (using cleanc backend).
-"${v2_bin}" -o "${v3_bin}" -backend cleanc "${v2_source}"
+"${v2_bin}" -gc none -o "${v3_bin}" -backend cleanc "${v2_source}"
 
 echo "SUCCESS: v2 successfully compiled itself to v3"
 echo "v3 binary size: $(ls -lh "${v3_bin}" | awk '{print $5}')"
 
-"${v3_bin}" -realloc -o "${v4_bin}" -backend cleanc "${v2_source}"
+"${v3_bin}" -gc none -o "${v4_bin}" -backend cleanc "${v2_source}"
 printf '\nV4 compiled\n\n'
 
-"${v4_bin}" -o "${v5_bin}" -backend cleanc "${v2_source}"
+"${v4_bin}" -gc none  -o "${v5_bin}" -backend cleanc "${v2_source}"
 printf '\nV5 compiled\n\n'
 
 # Test that v3 runs and produces expected output.

vlib/gx/text.v

@@ -5,7 +5,7 @@ module gx
 import gg
 
 // TODO: remove these, and use the enum everywhere
-pub const align_left = HorizontalAlign.left
-pub const align_right = HorizontalAlign.right
+pub const align_left = gg.HorizontalAlign.left
+pub const align_right = gg.HorizontalAlign.right
 
 pub type TextCfg = gg.TextCfg

vlib/os/file_le_be.c.v

@@ -109,8 +109,6 @@ fn swap_bytes[T](input T) T {
 		return input
 	} $else $if T is i8 {
 		return input
-	} $else $if T is byte {
-		return input
 	} $else $if T is u16 {
 		return swap_bytes_u16(input)
 	} $else $if T is u32 {

vlib/os/os_structs_dirent_default.c.v

@@ -1,5 +1,10 @@
 module os
 
 pub struct C.dirent {
-	d_name [256]char
+	d_ino     u64
+	d_seekoff u64
+	d_reclen  u16
+	d_namlen  u16
+	d_type    u8
+	d_name    [256]char
 }

vlib/strconv/atou.v

@@ -38,7 +38,7 @@ fn atou_common_check(s string) !int {
 // s is string to parse, max is respective types max value.
 @[direct_array_access]
 fn atou_common(s string, type_max u64) !u64 {
-	mut start_idx := atou_common_check(s)!
+	mut start_idx := int(atou_common_check(s)!)
 	mut x := u64(0)
 	mut underscored := false
 	for i in start_idx .. s.len {

vlib/strings/builder.c.v

@@ -107,7 +107,7 @@ pub fn (mut b Builder) write(data []u8) !int {
 	if data.len == 0 {
 		return 0
 	}
-	b << data
+	unsafe { b.push_many(data.data, data.len) }
 	return data.len
 }
 

vlib/v2/builder/builder.v

@@ -87,7 +87,7 @@ pub fn (mut b Builder) build(files []string) {
 
 	// Transform AST (flag enum desugaring, etc.)
 	transform_start := sw.elapsed()
-	mut trans := transformer.Transformer.new(b.files, b.env)
+	mut trans := transformer.Transformer.new_with_pref(b.files, b.env, b.pref)
 	b.files = trans.transform_files(b.files)
 	transform_time := time.Duration(sw.elapsed() - transform_start)
 	print_time('Transform', transform_time)
@@ -223,8 +223,13 @@ fn (b &Builder) is_cmd_v2_self_build() bool {
 	if b.user_files.len != 1 {
 		return false
 	}
+	// Avoid path normalization here: during bootstraps, some intermediate
+	// compilers can still have unstable path helpers.
 	path := b.user_files[0].replace('\\', '/')
-	return path.ends_with('/cmd/v2/v2.v') || path.ends_with('cmd/v2/v2.v') || path == 'v2.v'
+	if path == 'v2.v' || path.ends_with('/v2.v') {
+		return true
+	}
+	return path.ends_with('/cmd/v2/v2.v') || path.ends_with('cmd/v2/v2.v')
 }
 
 fn (mut b Builder) gen_ssa_c() {
@@ -247,7 +252,11 @@ fn (mut b Builder) gen_ssa_c() {
 	print_time('SSA Build', time.Duration(sw.elapsed() - stage_start))
 
 	stage_start = sw.elapsed()
-	if os.getenv('V2_SSA_OPT') != '0' {
+	mut use_ssa_opt := os.getenv('V2_SSA_OPT') != '0'
+	if b.is_cmd_v2_self_build() {
+		use_ssa_opt = false
+	}
+	if use_ssa_opt {
 		optimize.optimize(mut mod)
 	}
 	print_time('SSA Optimize', time.Duration(sw.elapsed() - stage_start))
@@ -299,54 +308,13 @@ fn (mut b Builder) gen_ssa_c() {
 	}
 	cc_res := os.execute(cc_cmd)
 	if cc_res.exit_code != 0 {
-		eprintln('warning: ssa c backend compilation failed, falling back to cleanc backend')
-		ssa_snapshot := output_name + '.ssa.c'
-		os.cp(c_file, ssa_snapshot) or {}
+		eprintln('error: ssa c backend compilation failed')
 		lines := cc_res.output.split_into_lines()
 		limit := if lines.len < 20 { lines.len } else { 20 }
 		for line in lines[..limit] {
 			eprintln(line)
 		}
-		mut fallback_args := []string{}
-		fallback_args << os.quoted_path(os.args[0])
-		fallback_args << '-backend cleanc'
-		fallback_args << '-nomarkused'
-		fallback_args << '-nocache'
-		if b.pref.show_cc {
-			fallback_args << '-showcc'
-		}
-		if b.pref.stats {
-			fallback_args << '-stats'
-		}
-		if b.pref.print_parsed_files {
-			fallback_args << '-print-parsed-files'
-		}
-		if b.pref.skip_builtin {
-			fallback_args << '--skip-builtin'
-		}
-		if b.pref.skip_imports {
-			fallback_args << '--skip-imports'
-		}
-		if b.pref.skip_type_check {
-			fallback_args << '--skip-type-check'
-		}
-		if output_name.len > 0 {
-			fallback_args << '-o ${os.quoted_path(output_name)}'
-		}
-		for user_file in b.user_files {
-			fallback_args << os.quoted_path(user_file)
-		}
-		fallback_cmd := fallback_args.join(' ')
-		fallback_res := os.execute(fallback_cmd)
-		if fallback_res.exit_code != 0 {
-			eprintln('error: cleanc fallback failed')
-			eprintln(fallback_res.output)
-			exit(1)
-		}
-		if fallback_res.output.len > 0 {
-			println(fallback_res.output)
-		}
-		return
+		exit(1)
 	}
 	print_time('CC', time.Duration(sw.elapsed() - cc_start))
 

vlib/v2/builder/cache_headers.v

@@ -191,8 +191,10 @@ fn (b &Builder) can_use_cached_core_headers() bool {
 }
 
 fn (b &Builder) can_use_cached_module_bundle(cache_name string, module_paths []string, cc string, cc_flags string) bool {
-	obj_path := os.join_path(b.core_cache_dir(), '${cache_name}.o')
-	stamp_path := os.join_path(b.core_cache_dir(), '${cache_name}.stamp')
+	obj_file := cache_name + '.o'
+	stamp_file := cache_name + '.stamp'
+	obj_path := os.join_path(b.core_cache_dir(), obj_file)
+	stamp_path := os.join_path(b.core_cache_dir(), stamp_file)
 	if !os.exists(obj_path) || !os.exists(stamp_path) {
 		return false
 	}