From d49365b4a7371d5a2bef016899955f08a2cf9f95 Mon Sep 17 00:00:00 2001
From: Christoffer Lerno <christoffer@aegik.com>
Date: Sun, 17 Sep 2023 00:23:38 +0200
Subject: [PATCH] Change how -O works and create -optsize / -optlevel. Update
 --safe / --fast.

---
 .github/workflows/main.yml             |  8 +--
 README.md                              |  2 +-
 src/build/build_options.c              | 97 +++++++++++++++-----------
 src/build/build_options.h              | 42 +++++++++--
 src/build/builder.c                    | 93 +++++++++++++++---------
 src/build/project.c                    | 11 +--
 src/compiler/compiler.c                |  4 +-
 src/compiler/llvm_codegen.c            |  4 +-
 src/compiler/llvm_codegen_builtins.c   |  2 +-
 src/compiler/llvm_codegen_debug_info.c |  4 +-
 src/compiler/llvm_codegen_function.c   |  2 +-
 src/compiler/llvm_codegen_module.c     |  2 +-
 src/compiler/target.c                  |  2 +-
 test/src/tester.py                     |  4 +-
 14 files changed, 177 insertions(+), 100 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 9b00c37b8..0324676c7 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -64,7 +64,7 @@ jobs:
       - name: Compile run unit tests
         run: |
           cd test
-          ..\build\${{ matrix.build_type }}\c3c.exe compile-test unit -g1 -O1 --safe
+          ..\build\${{ matrix.build_type }}\c3c.exe compile-test unit -O1
 
       - name: upload artifacts
         uses: actions/upload-artifact@v3
@@ -263,7 +263,7 @@ jobs:
       - name: Compile run unit tests
         run: |
           cd test
-          ../build/c3c compile-test unit -g1 --safe
+          ../build/c3c compile-test unit
 
       - name: Build testproject
         run: |
@@ -368,7 +368,7 @@ jobs:
       - name: Compile run unit tests
         run: |
           cd test
-          ../build/c3c compile-test unit -g1 --safe
+          ../build/c3c compile-test unit
 
       - name: Build testproject
         run: |
@@ -440,7 +440,7 @@ jobs:
       - name: Compile run unit tests
         run: |
           cd test
-          ../build/c3c compile-test unit -g1 --safe
+          ../build/c3c compile-test unit
 
       - name: Build testproject
         run: |
diff --git a/README.md b/README.md
index 852b6d0b6..41710627d 100644
--- a/README.md
+++ b/README.md
@@ -320,6 +320,6 @@ Editor plugins can be found at https://github.com/c3lang/editor-plugins.
 1. Write the test, either adding to existing test files in `/test/unit/` or add
    a new file. (If testing the standard library, put it in the `/test/unit/stdlib/` subdirectory).
 2. Make sure that the test functions have the `@test` attribute. 
-3. Run tests and see that they pass. (Recommended settings: `c3c compile-test --safe -g1 -O0 test/unit`.
+3. Run tests and see that they pass. (Recommended settings: `c3c compile-test -O0 test/unit`.
    - in this example `test/unit/` is the relative path to the test directory, so adjust as required)
 4. Make a pull request for the new tests.
diff --git a/src/build/build_options.c b/src/build/build_options.c
index 8f1f8c83b..8d3d07312 100644
--- a/src/build/build_options.c
+++ b/src/build/build_options.c
@@ -98,18 +98,20 @@ static void usage(void)
 	OUTPUT("  -C                        - Only lex, parse and check.");
 	OUTPUT("  -                         - Read code from standard in.");
 	OUTPUT("  -o <file>                 - Write output to <file>.");
-	OUTPUT("  -O0                       - Optimizations off.");
-	OUTPUT("  -O1                       - Simple optimizations only.");
-	OUTPUT("  -O2                       - Default optimization level.");
-	OUTPUT("  -O3                       - Aggressive optimization.");
-	OUTPUT("  -Os                       - Optimize for size.");
-	OUTPUT("  -Oz                       - Optimize for tiny size.");
-	OUTPUT("  -O0+                      - No optimization, single module.");
-	OUTPUT("  -O1+                      - Simple optimizations, single module.");
-	OUTPUT("  -O2+                      - Default optimization level, single module");
-	OUTPUT("  -O3+                      - Aggressive optimization, single module.");
-	OUTPUT("  -Os+                      - Optimize for size, single module.");
-	OUTPUT("  -Oz+                      - Optimize for tiny size, single module.");
+	OUTPUT("  -O0                       - Safe, no optimizations, emit debug info.");
+	OUTPUT("  -O1                       - Safe, high optimization, emit debug info.");
+	OUTPUT("  -O2                       - Unsafe, high optimization, emit debug info.");
+	OUTPUT("  -O3                       - Unsafe, highest optimization, relaxed maths, emit debug info.");
+	OUTPUT("  -O4                       - Unsafe, highest optimization, fast maths, emit debug info.");
+	OUTPUT("  -Os                       - Unsafe, high optimization, small code, no debug info.");
+	OUTPUT("  -Oz                       - Unsafe, high optimization, tiny code, no debug info.");
+	OUTPUT("  -O0+                      - O0, single module.");
+	OUTPUT("  -O1+                      - O1, single module.");
+	OUTPUT("  -O2+                      - O2, single module.");
+	OUTPUT("  -O3+                      - O3, single module.");
+	OUTPUT("  -O4+                      - O4, single module.");
+	OUTPUT("  -Os+                      - Os, single module.");
+	OUTPUT("  -Oz+                      - Oz, single module.");
 	OUTPUT("  -t1                       - Trust level 1 - don't allow $include nor $exec (default).");
 	OUTPUT("  -t2                       - Trust level 2 - allow $include but not $exec / exec directives.");
 	OUTPUT("  -t3                       - Trust level 3 - full trust, allow both include and exec.");
@@ -127,12 +129,12 @@ static void usage(void)
 	OUTPUT("  --no-emit-stdlib          - Do not output object files (nor asm or ir) for the standard library.");
 	OUTPUT("  --target <target>         - Compile for a particular architecture + OS target.");
 	OUTPUT("  --threads <number>        - Set the number of threads to use for compilation.");
-	OUTPUT("  --safe                    - Set mode to 'safe', generating runtime traps on overflows and contract violations.");
-	OUTPUT("  --fast                    - Set mode to 'fast', removes runtime traps.");
+	OUTPUT("  --safe=<yes|no>           - Turn safety (contracts, runtime bounds checking, null pointer checks etc) on or off.");
+	OUTPUT("  --optlevel=<option>       - Code optimization level: none, less, more, max.");
+	OUTPUT("  --optsize=<option>        - Code size optimization: none, small, tiny.");
 	OUTPUT("");
-	OUTPUT("  -g                        - Emit full debug info.");
+	OUTPUT("  -g                        - Emit debug info.");
 	OUTPUT("  -g0                       - Emit no debug info.");
-	OUTPUT("  -gline-tables-only        - Only emit line tables for debugging.");
 	OUTPUT("");
 	OUTPUT("");
 	OUTPUT("  -l <library>              - Link with the library provided.");
@@ -533,51 +535,59 @@ static void parse_option(BuildOptions *options)
 		case 'O':
 			if (match_shortopt("O0+"))
 			{
-				options->optimization_setting_override = OPT_SETTING_O0_PLUS;
+				options->optsetting = OPT_SETTING_O0_PLUS;
 			}
 			else if (match_shortopt("O0"))
 			{
-				options->optimization_setting_override = OPT_SETTING_O0;
+				options->optsetting = OPT_SETTING_O0;
 			}
 			else if (match_shortopt("O1+"))
 			{
-				options->optimization_setting_override = OPT_SETTING_O1_PLUS;
+				options->optsetting = OPT_SETTING_O1_PLUS;
 			}
 			else if (match_shortopt("O1"))
 			{
-				options->optimization_setting_override = OPT_SETTING_O1;
+				options->optsetting = OPT_SETTING_O1;
 			}
 			else if (match_shortopt("O2+"))
 			{
-				options->optimization_setting_override = OPT_SETTING_O2_PLUS;
+				options->optsetting = OPT_SETTING_O2_PLUS;
 			}
 			else if (match_shortopt("O2"))
 			{
-				options->optimization_setting_override = OPT_SETTING_O2;
+				options->optsetting = OPT_SETTING_O2;
 			}
 			else if (match_shortopt("O3+"))
 			{
-				options->optimization_setting_override = OPT_SETTING_O3_PLUS;
+				options->optsetting = OPT_SETTING_O3_PLUS;
 			}
 			else if (match_shortopt("O3"))
 			{
-				options->optimization_setting_override = OPT_SETTING_O3;
+				options->optsetting = OPT_SETTING_O3;
+			}
+			else if (match_shortopt("O4+"))
+			{
+				options->optsetting = OPT_SETTING_O4_PLUS;
+			}
+			else if (match_shortopt("O4"))
+			{
+				options->optsetting = OPT_SETTING_O4;
 			}
 			else if (match_shortopt("Os+"))
 			{
-				options->optimization_setting_override = OPT_SETTING_OSMALL_PLUS;
+				options->optsetting = OPT_SETTING_OSMALL_PLUS;
 			}
 			else if (match_shortopt("Os"))
 			{
-				options->optimization_setting_override = OPT_SETTING_OSMALL;
+				options->optsetting = OPT_SETTING_OSMALL;
 			}
 			else if (match_shortopt("Oz+"))
 			{
-				options->optimization_setting_override = OPT_SETTING_OTINY_PLUS;
+				options->optsetting = OPT_SETTING_OTINY_PLUS;
 			}
 			else if (match_shortopt("Oz"))
 			{
-				options->optimization_setting_override = OPT_SETTING_OTINY;
+				options->optsetting = OPT_SETTING_OTINY;
 			}
 			else
 			{
@@ -668,6 +678,21 @@ static void parse_option(BuildOptions *options)
 				options->fp_math = (FpOpt)parse_multi_option(argopt, 3, fp_math);
 				return;
 			}
+			if ((argopt = match_argopt("optsize")))
+			{
+				options->optsize = (SizeOptimizationLevel)parse_multi_option(argopt, 3, optsizes);
+				return;
+			}
+			if ((argopt = match_argopt("optlevel")))
+			{
+				options->optlevel = (OptimizationLevel)parse_multi_option(argopt, 4, optlevels);
+				return;
+			}
+			if ((argopt = match_argopt("safe")))
+			{
+				options->safety_level = (SafetyLevel)parse_multi_option(argopt, 2, safety_levels);
+				return;
+			}
 			if (match_longopt("strip-unused"))
 			{
 				options->no_strip_unused = false;
@@ -967,16 +992,6 @@ static void parse_option(BuildOptions *options)
 				options->linuxpaths.crtbegin = check_dir(next_arg());
 				return;
 			}
-			if (match_longopt("safe"))
-			{
-				options->safe_mode = 1;
-				return;
-			}
-			if (match_longopt("fast"))
-			{
-				options->safe_mode = 0;
-				return;
-			}
 			if (match_longopt("benchmarking"))
 			{
 				options->benchmarking = true;
@@ -1015,9 +1030,11 @@ BuildOptions parse_arguments(int argc, const char *argv[])
 	BuildOptions build_options = {
 		.path = ".",
 		.emit_llvm = false,
-		.optimization_setting_override = OPT_SETTING_NOT_SET,
+		.optsetting = OPT_SETTING_NOT_SET,
 		.debug_info_override = DEBUG_INFO_NOT_SET,
-		.safe_mode = -1,
+		.safety_level = SAFETY_NOT_SET,
+		.optlevel = OPTIMIZATION_NOT_SET,
+		.optsize = SIZE_OPTIMIZATION_NOT_SET,
 		.build_threads = cpus(),
 		.command = COMMAND_MISSING,
 		.reloc_model = RELOC_DEFAULT,
diff --git a/src/build/build_options.h b/src/build/build_options.h
index 111e43474..5eae6d71d 100644
--- a/src/build/build_options.h
+++ b/src/build/build_options.h
@@ -76,6 +76,13 @@ typedef enum
 	DIAG_ERROR,
 } DiagnosticsSeverity;
 
+typedef enum
+{
+	SAFETY_NOT_SET = -1,
+	SAFETY_OFF = 0,
+	SAFETY_ON = 1,
+} SafetyLevel;
+
 typedef enum
 {
 	TRUST_NONE,
@@ -103,6 +110,8 @@ typedef enum
 	OPT_SETTING_O2_PLUS,
 	OPT_SETTING_O3,
 	OPT_SETTING_O3_PLUS,
+	OPT_SETTING_O4,
+	OPT_SETTING_O4_PLUS,
 	OPT_SETTING_OSMALL,
 	OPT_SETTING_OSMALL_PLUS,
 	OPT_SETTING_OTINY,
@@ -207,6 +216,24 @@ static const char *fp_math[3] = {
 		[FP_FAST] = "fast",
 };
 
+static const char *optlevels[4] = {
+		[OPTIMIZATION_NONE] = "none",
+		[OPTIMIZATION_LESS] = "less",
+		[OPTIMIZATION_MORE] = "more",
+		[OPTIMIZATION_AGGRESSIVE] = "max",
+};
+
+static const char *optsizes[3] = {
+		[SIZE_OPTIMIZATION_NONE] = "none",
+		[SIZE_OPTIMIZATION_SMALL] = "small",
+		[SIZE_OPTIMIZATION_TINY] = "more",
+};
+
+static const char *safety_levels[2] = {
+		[SAFETY_OFF] = "no",
+		[SAFETY_ON] = "yes",
+};
+
 static const char *riscv_capability[3] = {
 		[RISCVFLOAT_NONE] = "none",
 		[RISCVFLOAT_FLOAT] = "float",
@@ -342,10 +369,10 @@ typedef struct BuildOptions_
 	CompileOption compile_option;
 	TrustLevel trust_level;
 	DiagnosticsSeverity severity[DIAG_END_SENTINEL];
-	OptimizationSetting optimization_setting_override;
+	OptimizationSetting optsetting;
 	DebugInfo debug_info_override;
 	ArchOsTarget arch_os_target_override;
-	int safe_mode;
+	SafetyLevel safety_level;
 	bool emit_llvm;
 	bool emit_asm;
 	bool benchmark_mode;
@@ -368,6 +395,8 @@ typedef struct BuildOptions_
 	X86VectorCapability x86_vector_capability;
 	X86CpuSet x86_cpu_set;
 	FpOpt fp_math;
+	OptimizationLevel optlevel;
+	SizeOptimizationLevel optsize;
 	RiscvFloatCapability riscv_float_capability;
 	MemoryEnvironment memory_environment;
 	bool no_strip_unused;
@@ -460,9 +489,10 @@ typedef struct
 	bool no_emit_stdlib;
 	int build_threads;
 	TrustLevel trust_level;
-	OptimizationLevel optimization_level;
+	OptimizationSetting optsetting;
+	OptimizationLevel optlevel;
 	MemoryEnvironment memory_environment;
-	SizeOptimizationLevel size_optimization_level;
+	SizeOptimizationLevel optsize;
 	bool single_module;
 	DebugInfo debug_info;
 	RelocModel reloc_model;
@@ -482,9 +512,9 @@ typedef struct
 		StructReturn x86_struct_return : 3;
 		X86VectorCapability x86_vector_capability : 4;
 		RiscvFloatCapability riscv_float_capability : 4;
-		FpOpt fp_math : 4;
 		bool trap_on_wrap : 1;
-		bool safe_mode : 1;
+		FpOpt fp_math;
+		SafetyLevel safe_mode;
 		X86CpuSet x86_cpu_set;
 	} feature;
 	struct
diff --git a/src/build/builder.c b/src/build/builder.c
index 71510b4fe..9cae8b608 100644
--- a/src/build/builder.c
+++ b/src/build/builder.c
@@ -94,61 +94,76 @@ bool command_is_projectless(CompilerCommand command)
 
 void update_build_target_with_opt_level(BuildTarget *target, OptimizationSetting level)
 {
+	if (level == OPT_SETTING_NOT_SET) level = OPT_SETTING_O0;
+	OptimizationLevel optlevel = OPTIMIZATION_NONE;
+	SizeOptimizationLevel optsize = SIZE_OPTIMIZATION_NONE;
+	DebugInfo debug = DEBUG_INFO_FULL;
+	SafetyLevel safety_level = SAFETY_ON;
+	bool single_module = false;
+	FpOpt fp_opt = FP_STRICT;
 	switch (level)
 	{
 		case OPT_SETTING_O0_PLUS:
-			target->single_module = true;
-			FALLTHROUGH;
+			single_module = true;
+			break;
 		case OPT_SETTING_O0:
-			target->optimization_level = OPTIMIZATION_NONE;
-			target->size_optimization_level = SIZE_OPTIMIZATION_NONE;
-			target->feature.safe_mode = true;
 			break;
 		case OPT_SETTING_O1_PLUS:
-			target->single_module = true;
+			single_module = true;
 			FALLTHROUGH;
 		case OPT_SETTING_O1:
-			target->optimization_level = OPTIMIZATION_LESS;
-			target->size_optimization_level = SIZE_OPTIMIZATION_NONE;
-			target->feature.safe_mode = false;
+			optlevel = OPTIMIZATION_MORE;
 			break;
 		case OPT_SETTING_O2_PLUS:
-			target->single_module = true;
+			single_module = true;
 			FALLTHROUGH;
 		case OPT_SETTING_O2:
-			target->optimization_level = OPTIMIZATION_MORE;
-			target->size_optimization_level = SIZE_OPTIMIZATION_NONE;
-			target->feature.safe_mode = false;
+			optlevel = OPTIMIZATION_MORE;
+			safety_level = false;
 			break;
 		case OPT_SETTING_O3_PLUS:
-			target->single_module = true;
+			single_module = true;
 			FALLTHROUGH;
 		case OPT_SETTING_O3:
-			target->optimization_level = OPTIMIZATION_AGGRESSIVE;
-			target->size_optimization_level = SIZE_OPTIMIZATION_NONE;
-			target->feature.safe_mode = false;
+			optlevel = OPTIMIZATION_AGGRESSIVE;
+			safety_level = SAFETY_OFF;
+			fp_opt = FP_RELAXED;
+			break;
+		case OPT_SETTING_O4_PLUS:
+			single_module = true;
+			FALLTHROUGH;
+		case OPT_SETTING_O4:
+			optlevel = OPTIMIZATION_AGGRESSIVE;
+			safety_level = SAFETY_OFF;
+			fp_opt = FP_FAST;
 			break;
 		case OPT_SETTING_OSMALL_PLUS:
-			target->single_module = true;
+			single_module = true;
 			FALLTHROUGH;
 		case OPT_SETTING_OSMALL:
-			target->optimization_level = OPTIMIZATION_MORE;
-			target->size_optimization_level = SIZE_OPTIMIZATION_SMALL;
-			target->feature.safe_mode = false;
+			optlevel = OPTIMIZATION_MORE;
+			optsize = SIZE_OPTIMIZATION_SMALL;
+			safety_level = SAFETY_OFF;
 			break;
 		case OPT_SETTING_OTINY_PLUS:
 			target->single_module = true;
 			FALLTHROUGH;
 		case OPT_SETTING_OTINY:
-			target->optimization_level = OPTIMIZATION_MORE;
-			target->size_optimization_level = SIZE_OPTIMIZATION_TINY;
-			target->feature.safe_mode = false;
+			optlevel = OPTIMIZATION_MORE;
+			optsize = SIZE_OPTIMIZATION_TINY;
+			safety_level = SAFETY_OFF;
+			debug = DEBUG_INFO_NONE;
 			break;
 		case OPT_SETTING_NOT_SET:
-			break;
 		default:
 			UNREACHABLE
 	}
+	if (target->optsize == SIZE_OPTIMIZATION_NOT_SET) target->optsize = optsize;
+	if (target->optlevel == OPTIMIZATION_NOT_SET) target->optlevel = optlevel;
+	if (target->feature.safe_mode == SAFETY_NOT_SET) target->feature.safe_mode = safety_level;
+	if (target->debug_info == DEBUG_INFO_NOT_SET) target->debug_info = debug;
+	if (target->feature.fp_math == FP_DEFAULT) target->feature.fp_math = fp_opt;
+	if (single_module) target->single_module = true;
 }
 static void update_build_target_from_options(BuildTarget *target, BuildOptions *options)
 {
@@ -220,12 +235,18 @@ static void update_build_target_from_options(BuildTarget *target, BuildOptions *
 	FOREACH_END();
 
 
-	update_build_target_with_opt_level(target, options->optimization_setting_override);
-
 	if (options->cc) target->cc = options->cc;
-	if (options->safe_mode > -1)
+	if (options->optlevel != OPTIMIZATION_NOT_SET)
+	{
+		target->optlevel = options->optlevel;
+	}
+	if (options->optsize != SIZE_OPTIMIZATION_NOT_SET)
+	{
+		target->optsize = options->optsize;
+	}
+	if (options->safety_level != SAFETY_NOT_SET)
 	{
-		target->feature.safe_mode = options->safe_mode == 1;
+		target->feature.safe_mode = options->safety_level;
 	}
 	if (options->no_strip_unused || options->test_mode) target->no_strip_unused = true;
 
@@ -355,6 +376,13 @@ static void update_build_target_from_options(BuildTarget *target, BuildOptions *
 	{
 		vec_add(target->libs, options->libs[i]);
 	}
+	if (options->optsetting != OPT_SETTING_NOT_SET)
+	{
+		target->optsetting = options->optsetting;
+	}
+	update_build_target_with_opt_level(target, target->optsetting);
+
+
 }
 
 void init_default_build_target(BuildTarget *target, BuildOptions *options)
@@ -364,9 +392,10 @@ void init_default_build_target(BuildTarget *target, BuildOptions *options)
 		.type = TARGET_TYPE_EXECUTABLE,
 		.source_dirs = options->files,
 		.name = options->output_name,
-		.optimization_level = OPTIMIZATION_NONE,
+		.optsetting = OPT_SETTING_NOT_SET,
+		.optlevel = OPTIMIZATION_NOT_SET,
 		.memory_environment = MEMORY_ENV_NORMAL,
-		.size_optimization_level = SIZE_OPTIMIZATION_NONE,
+		.optsize = SIZE_OPTIMIZATION_NOT_SET,
 		.symtab_size = options->symtab_size ? options->symtab_size : DEFAULT_SYMTAB_SIZE,
 		.switchrange_max_size = DEFAULT_SWITCHRANGE_MAX_SIZE,
 		.debug_info = DEBUG_INFO_NOT_SET,
@@ -376,8 +405,8 @@ void init_default_build_target(BuildTarget *target, BuildOptions *options)
 		.feature.x86_cpu_set = X86CPU_DEFAULT,
 		.feature.fp_math = FP_DEFAULT,
 		.feature.riscv_float_capability = RISCVFLOAT_DEFAULT,
+		.feature.safe_mode = SAFETY_NOT_SET,
 		.win.crt_linking = WIN_CRT_DEFAULT,
-		.feature.safe_mode = true,
 	};
 	update_build_target_from_options(target, options);
 }
diff --git a/src/build/project.c b/src/build/project.c
index b16f7aa6e..584361aa7 100644
--- a/src/build/project.c
+++ b/src/build/project.c
@@ -298,7 +298,7 @@ static void load_into_build_target(JSONObject *json, const char *type, BuildTarg
 	DebugInfo info = get_valid_string_setting(json, "debug-info", type, debug_infos, 0, 3, "one of 'full' 'line-table' or 'none'.");
 	if (info > -1) target->debug_info = info;
 
-	static const char *opt_settings[12] = {
+	static const char *opt_settings[14] = {
 			[OPT_SETTING_O0] = "O0",
 			[OPT_SETTING_O0_PLUS] = "O0+",
 			[OPT_SETTING_O1] = "O1",
@@ -312,7 +312,7 @@ static void load_into_build_target(JSONObject *json, const char *type, BuildTarg
 			[OPT_SETTING_OTINY] = "Oz",
 			[OPT_SETTING_OTINY_PLUS] = "Oz+"
 	};
-	OptimizationSetting opt = (OptimizationSetting)get_valid_string_setting(json, "opt", type, opt_settings, 0, 12, "'O0', 'O1' etc.");
+	OptimizationSetting opt = (OptimizationSetting)get_valid_string_setting(json, "opt", type, opt_settings, 0, 14, "'O0', 'O1' etc.");
 	update_build_target_with_opt_level(target, opt);
 
 	MemoryEnvironment env = get_valid_string_setting(json, "memory-env", type, memory_environment, 0, 4, "one of 'normal', 'small', 'tiny' or 'none'.");
@@ -469,9 +469,10 @@ static void project_add_targets(Project *project, JSONObject *project_data)
 			[TARGET_TYPE_OBJECT_FILES] = "object files"};
 
 	BuildTarget default_target = {
-			.optimization_level = OPTIMIZATION_NONE,
+			.optlevel = OPTIMIZATION_NOT_SET,
+			.optsetting = OPT_SETTING_NOT_SET,
 			.memory_environment = MEMORY_ENV_NORMAL,
-			.size_optimization_level = SIZE_OPTIMIZATION_NONE,
+			.optsize = SIZE_OPTIMIZATION_NOT_SET,
 			.arch_os_target = ARCH_OS_TARGET_DEFAULT,
 			.debug_info = DEBUG_INFO_NOT_SET,
 			.symtab_size = DEFAULT_SYMTAB_SIZE,
@@ -484,7 +485,7 @@ static void project_add_targets(Project *project, JSONObject *project_data)
 			.feature.trap_on_wrap = false,
 			.feature.x86_vector_capability = X86VECTOR_DEFAULT,
 			.feature.x86_cpu_set = X86CPU_DEFAULT,
-			.feature.safe_mode = true,
+			.feature.safe_mode = SAFETY_NOT_SET,
 			.win.crt_linking = WIN_CRT_DEFAULT,
 	};
 	load_into_build_target(project_data, "default target", &default_target, true);
diff --git a/src/compiler/compiler.c b/src/compiler/compiler.c
index cfb8cad13..0e0aeb201 100644
--- a/src/compiler/compiler.c
+++ b/src/compiler/compiler.c
@@ -856,9 +856,9 @@ void compile()
 	setup_int_define("ARCH_TYPE", (uint64_t)platform_target.arch, type_int);
 	setup_int_define("MEMORY_ENVIRONMENT", (uint64_t)active_target.memory_environment, type_int);
 	setup_bool_define("COMPILER_LIBC_AVAILABLE", !active_target.no_libc);
-	setup_int_define("COMPILER_OPT_LEVEL", (uint64_t)active_target.optimization_level, type_int);
+	setup_int_define("COMPILER_OPT_LEVEL", (uint64_t)active_target.optlevel, type_int);
 	setup_int_define("OS_TYPE", (uint64_t)platform_target.os, type_int);
-	setup_int_define("COMPILER_SIZE_OPT_LEVEL", (uint64_t)active_target.size_optimization_level, type_int);
+	setup_int_define("COMPILER_SIZE_OPT_LEVEL", (uint64_t)active_target.optsize, type_int);
 	setup_bool_define("COMPILER_SAFE_MODE", active_target.feature.safe_mode);
 	setup_bool_define("DEBUG_SYMBOLS", active_target.debug_info == DEBUG_INFO_FULL);
 	setup_int_define("LLVM_VERSION", llvm_version_major, type_int);
diff --git a/src/compiler/llvm_codegen.c b/src/compiler/llvm_codegen.c
index c355e8df9..781557deb 100644
--- a/src/compiler/llvm_codegen.c
+++ b/src/compiler/llvm_codegen.c
@@ -843,7 +843,7 @@ static inline void llvm_optimize(GenContext *c)
 	LLVMPassBuilderOptionsSetDebugLogging(options, debug_log);
 #endif
 	const char *passes = NULL;
-	switch (active_target.size_optimization_level)
+	switch (active_target.optsize)
 	{
 		case SIZE_OPTIMIZATION_SMALL:
 			passes = "default<Os>";
@@ -854,7 +854,7 @@ static inline void llvm_optimize(GenContext *c)
 		default:
 			break;
 	}
-	switch (active_target.optimization_level)
+	switch (active_target.optlevel)
 	{
 		case OPTIMIZATION_NONE:
 		case OPTIMIZATION_NOT_SET:
diff --git a/src/compiler/llvm_codegen_builtins.c b/src/compiler/llvm_codegen_builtins.c
index cf19fa831..27e3c2628 100644
--- a/src/compiler/llvm_codegen_builtins.c
+++ b/src/compiler/llvm_codegen_builtins.c
@@ -917,7 +917,7 @@ void llvm_emit_builtin_call(GenContext *c, BEValue *result_value, Expr *expr)
 			llvm_emit_masked_load(c, result_value, expr);
 			return;
 		case BUILTIN_EXPECT_WITH_PROBABILITY:
-			if (active_target.optimization_level == OPTIMIZATION_NONE)
+			if (active_target.optlevel == OPTIMIZATION_NONE)
 			{
 				Expr **args = expr->call_expr.arguments;
 				llvm_emit_expr(c, result_value, args[0]);
diff --git a/src/compiler/llvm_codegen_debug_info.c b/src/compiler/llvm_codegen_debug_info.c
index e352121de..0d1a269ff 100644
--- a/src/compiler/llvm_codegen_debug_info.c
+++ b/src/compiler/llvm_codegen_debug_info.c
@@ -129,7 +129,7 @@ void llvm_emit_debug_function(GenContext *c, Decl *decl)
 													true,
 													row,
 													flags,
-													active_target.optimization_level != OPTIMIZATION_NONE);
+													active_target.optlevel != OPTIMIZATION_NONE);
 	LLVMSetSubprogram(decl->backend_ref, c->debug.function);
 
 }
@@ -153,7 +153,7 @@ void llvm_emit_debug_local_var(GenContext *c, Decl *decl)
 			c->debug.file.debug_file,
 			row,
 			llvm_get_debug_type(c, decl->type),
-			active_target.optimization_level != OPTIMIZATION_NONE,
+			active_target.optlevel != OPTIMIZATION_NONE,
 			LLVMDIFlagZero,
 			decl->alignment);
 	decl->var.backend_debug_ref = var;
diff --git a/src/compiler/llvm_codegen_function.c b/src/compiler/llvm_codegen_function.c
index af8d89834..9fe1a907b 100644
--- a/src/compiler/llvm_codegen_function.c
+++ b/src/compiler/llvm_codegen_function.c
@@ -698,7 +698,7 @@ void llvm_emit_xxlizer(GenContext *c, Decl *decl)
 														true,
 														row,
 														LLVMDIFlagZero,
-														active_target.optimization_level != OPTIMIZATION_NONE);
+														active_target.optlevel != OPTIMIZATION_NONE);
 		LLVMSetSubprogram(function, c->debug.function);
 	}
 	llvm_emit_body(c,
diff --git a/src/compiler/llvm_codegen_module.c b/src/compiler/llvm_codegen_module.c
index d36980e0c..40103b873 100644
--- a/src/compiler/llvm_codegen_module.c
+++ b/src/compiler/llvm_codegen_module.c
@@ -181,7 +181,7 @@ void gencontext_init_file_emit(GenContext *c, CompilationUnit *unit)
 		// Set runtime version here.
 		unit->llvm.debug_file = llvm_get_debug_file(c, unit->file->file_id);
 
-		bool is_optimized = active_target.optimization_level != OPTIMIZATION_NONE;
+		bool is_optimized = active_target.optlevel != OPTIMIZATION_NONE;
 		const char *dwarf_flags = "";
 		unsigned runtime_version = 0;
 		LLVMDWARFEmissionKind emission_kind =
diff --git a/src/compiler/target.c b/src/compiler/target.c
index 938d4ce6f..f3da28c55 100644
--- a/src/compiler/target.c
+++ b/src/compiler/target.c
@@ -1741,7 +1741,7 @@ void target_setup(BuildTarget *target)
 	// Create a specific target machine
 	LLVMCodeGenOptLevel level;
 
-	switch (target->optimization_level)
+	switch (target->optlevel)
 	{
 		case OPTIMIZATION_NOT_SET:
 			UNREACHABLE;
diff --git a/test/src/tester.py b/test/src/tester.py
index fd9bc6da6..7442f2d8a 100644
--- a/test/src/tester.py
+++ b/test/src/tester.py
@@ -127,9 +127,9 @@ def compile(self, args):
         for opt in self.opts:
             opts += ' ' + opt
         if self.safe:
-            opts += " --safe"
+            opts += " --safe=yes"
         else:
-            opts += " --fast"
+            opts += " --safe=no"
         code = subprocess.run(self.conf.compiler + target + ' -O0 ' + opts + ' ' + debug + args,
                               universal_newlines=True, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
         os.chdir(self.conf.cwd)