build: use features that are now supported in the bootstrap compiler

bvdberg · bvdberg · commit c60f0d9a552a · 2025-11-08T16:56:44.000+01:00
diff --git a/analyser/conversion_checker.c2 b/analyser/conversion_checker.c2
@@ -214,8 +214,6 @@ fn bool Checker.checkTypes(Checker* c, const Type* lcanon, const Type* rcanon) {
         c.diags.note(c.loc, "TODO CONVERSION  %d)", res);
         return false;
     }
-
-    return true;
 }
 
 fn bool Checker.checkBuiltins(Checker* c, const Type* lcanon, const Type* rcanon) {
@@ -441,8 +439,6 @@ fn bool Checker.checkEnum2Int(Checker* c, const Type* lcanon, const Type* rcanon
 
         return c.check(c.lhs, impl, c.expr_ptr, c.loc);
     }
-
-    return true;
 }
 
 fn bool Checker.checkFunc2Func(Checker* c, const Type* lcanon, const Type* rcanon) {
@@ -579,8 +575,6 @@ public fn bool Checker.checkCast(Checker* c, QualType lhs, QualType rhs, SrcLoc
         c.diags.note(c.loc, "TODO CONVERSION  %d)", res);
         return false;
     }
-
-    return true;
 }
 
 fn bool Checker.checkBuiltin2PointerCast(Checker* c, const Type* lcanon, const Type* rcanon) {
diff --git a/analyser/module_analyser_unaryop.c2 b/analyser/module_analyser_unaryop.c2
@@ -127,7 +127,6 @@ fn QualType Analyser.analyseUnaryOperator(Analyser* ma, Expr** e_ptr, u32 side)
             ma.error(e.getLoc(), "indirection requires pointer operand ('%s' invalid)", t.diagName());
             return QualType_Invalid;
         }
-        break;
     case Minus:
         QualType lhs = getMinusType(canon);
         if (!lhs.isValid()) goto invalid_type;
diff --git a/ast/ast_evaluator.c2 b/ast/ast_evaluator.c2
@@ -501,7 +501,6 @@ fn Cont WhileStmt.eval(WhileStmt* s, Evaluator* sf) {
             return cont;
         }
     }
-    return Cont.Abort;
 }
 
 fn Cont ForStmt.eval(ForStmt* s, Evaluator* sf) {
@@ -542,7 +541,6 @@ fn Cont ForStmt.eval(ForStmt* s, Evaluator* sf) {
                 return Cont.Error;
         }
     }
-    return Cont.Abort;
 }
 
 fn Cont SwitchStmt.eval(SwitchStmt* s, Evaluator* sf) {
diff --git a/ast/type_ref.c2 b/ast/type_ref.c2
@@ -342,7 +342,6 @@ public fn SrcLoc TypeRef.getLoc(const TypeRef* r) {
     case User:
         if (r.hasPrefix()) return r.refs[1].loc;
         else return r.refs[0].loc;
-        break;
     case StructMemberType:
         //TODO
         //return r.user.decl.getLoc();
diff --git a/ast/value.c2 b/ast/value.c2
@@ -212,7 +212,6 @@ public fn bool Value.checkRange(const Value* v, i64 min, u64 max) {
             return (v.uvalue <= (u64)~min + 1);
         else
             return (v.uvalue <= max);
-        break;
     case Float:
         return (v.fvalue >= (f64)min && v.fvalue < (f64)max + 1);
     default:
@@ -567,7 +566,6 @@ public fn bool Value.is_less(const Value* v1, const Value* v2) {
                 return !v2.negative || v1.uvalue > v2.uvalue;
             else
                 return !v2.negative && v1.uvalue < v2.uvalue;
-            break;  // TODO: fix bogus error in Analyser.analyseCase
         case Float:
             return v1.toFloat() < v2.fvalue;
         default:
@@ -591,7 +589,6 @@ fn bool Value.is_less_equal(const Value* v1, const Value* v2) {
                 return !v2.negative || v1.uvalue >= v2.uvalue;
             else
                 return !v2.negative && v1.uvalue <= v2.uvalue;
-            break;  // TODO: fix bogus error in Analyser.analyseCase
         case Float:
             return v1.toFloat() <= v2.fvalue;
         default:
@@ -615,7 +612,6 @@ fn bool Value.is_greater(const Value* v1, const Value* v2) {
                 return v2.negative && v1.uvalue < v2.uvalue;
             else
                 return v2.negative || v1.uvalue > v2.uvalue;
-            break;  // TODO: fix bogus error in Analyser.analyseCase
         case Float:
             return v1.toFloat() > v2.fvalue;
         default:
@@ -639,7 +635,6 @@ fn bool Value.is_greater_equal(const Value* v1, const Value* v2) {
                 return v2.negative && v1.uvalue <= v2.uvalue;
             else
                 return v2.negative || v1.uvalue >= v2.uvalue;
-            break;  // TODO: fix bogus error in Analyser.analyseCase
         case Float:
             return v1.toFloat() >= v2.fvalue;
         default:
diff --git a/common/utils.c2 b/common/utils.c2
@@ -88,7 +88,6 @@ public fn bool findProjectDir(PathInfo* info) {
         }
         strcat(rel_path, "../");
     }
-    return false; // to satisfy compiler
 }
 
 public fn const char* findBuildFile() @(unused) {
diff --git a/generator/ir/ir_generator.c2 b/generator/ir/ir_generator.c2
@@ -234,7 +234,6 @@ fn ir.Type Generator.type2irtype(Generator* gen, QualType qt) {
         default:
             return ir.Type.I64;
         }
-        break;
     case Enum:
         EnumType* et = canon.getEnum();
         return gen.type2irtype(et.getImplType());
diff --git a/ir/context.c2 b/ir/context.c2
@@ -65,8 +65,7 @@ public type Context struct @(opaque) {
     bool single_thread;
     bool print_all;
 
-    // TODO make full member if include bug is solved in bootstrap
-    WorkQueue* queue;
+    WorkQueue queue;
 }
 
 public fn Context* create(bool print, const target_info.Info* info) {
@@ -75,8 +74,7 @@ public fn Context* create(bool print, const target_info.Info* info) {
     c.constants.init(128);
     c.symbols.init(128);
     c.init_values.init(128);
-    //c.queue.init();
-    c.queue = WorkQueue.create();
+    c.queue.init();
     c.single_thread = true;
     c.print_all = print;
     //c.single_thread = false;
diff --git a/ir/target.c2 b/ir/target.c2
@@ -17,12 +17,8 @@ module ir_tools; // Note: in ir_tools to allow passing Tools*
 
 import ir;
 
-public type ApplyCallConvFn fn void (Tools* t, ir.FunctionInfo* f);
-
 public type Target struct {
-    // Need bootstrap update
-    //fn void (Tools* t, ir.FunctionInfo* f) applyCallingConv;
-    ApplyCallConvFn applyCallingConv;
+    fn void (Tools* t, ir.FunctionInfo* f) applyCallingConv;
 
     // layout of registers in one lineair array:
     // return reg (s)
diff --git a/ir/work_queue.c2 b/ir/work_queue.c2
@@ -43,21 +43,6 @@ type WorkQueue struct {
     ir.FunctionInfo** funcs;
 }
 
-// TEMP to workaround include bug in bootstrap
-#if 1
-fn WorkQueue* WorkQueue.create() {
-    WorkQueue* q = stdlib.malloc(sizeof(WorkQueue));
-    memset(q, 0, sizeof(WorkQueue));
-    q.lock.init(nil);
-    q.resize(64);
-    return q;
-}
-
-fn void WorkQueue.free(WorkQueue* q) {
-    stdlib.free(q.funcs);
-    stdlib.free(q);
-}
-#else
 fn WorkQueue* WorkQueue.init(WorkQueue* q) {
     memset(q, 0, sizeof(WorkQueue));
     q.lock.init(nil);
@@ -68,7 +53,6 @@ fn WorkQueue* WorkQueue.init(WorkQueue* q) {
 fn void WorkQueue.free(WorkQueue* q) {
     stdlib.free(q.funcs);
 }
-#endif
 
 fn void WorkQueue.add(WorkQueue* q, ir.FunctionInfo* fi) {
     // Adding is done single-threaded, no need to lock
diff --git a/parser/c2_parser_expr.c2 b/parser/c2_parser_expr.c2
@@ -170,7 +170,6 @@ fn Expr* Parser.parseRHSOfBinaryExpression(Parser* p, Expr* lhs, Prec minPrec) {
             lhs = p.builder.actOnBinaryOperator(opToken.loc, opcode, lhs, rhs);
         }
     }
-    return nil;
 }
 
 const u8[128] CastExprTokenLookup = {
@@ -383,8 +382,6 @@ fn Expr* Parser.parsePostfixExprSuffix(Parser* p, Expr* lhs, bool couldBeTemplat
             return lhs;
         }
     }
-    assert(0); // should not come here
-    return nil;
 }
 
 fn Expr* Parser.parseCallExpr(Parser* p, Expr* func) {
@@ -859,8 +856,6 @@ fn bool Parser.parseAsType(Parser* p) {
             return false;
         }
     }
-    // never reached
-    return false;
 }
 
 /*
@@ -974,6 +969,4 @@ fn u32 Parser.parseAsCastType(Parser* p, u32 ahead, Kind close_tok) {
             return 0;
         }
     }
-    // never reached
-    return 0;
 }
diff --git a/parser/c2_parser_stmt.c2 b/parser/c2_parser_stmt.c2
@@ -150,7 +150,6 @@ fn bool Parser.isTypeSpec(Parser* p) {
             return false;
         }
     }
-    return false;
 }
 
 fn u32 Parser.skipArray(Parser* p, u32 ahead, Kind endKind) {
diff --git a/parser/c2_tokenizer.c2 b/parser/c2_tokenizer.c2
@@ -1327,7 +1327,6 @@ fn void Tokenizer.lex_string_literal(Tokenizer* t, Token* result) {
                 t.error(result, "invalid character 0x%02X in %s", *p, "string");
                 return;
             }
-            break;
         }
     }
 }
@@ -1389,7 +1388,6 @@ fn bool Tokenizer.lex_block_comment(Tokenizer* t, Token* result) {
         }
         t.cur++;
     }
-    return false;
 }
 
 /*---- preprocessing ----*/
@@ -1743,7 +1741,6 @@ fn i64 Tokenizer.parse_ppexpr(Tokenizer* t, Token *result) {
                 t.error(result, "invalid token in preprocessor expression '%s'", sp.op.str());
                 return 0;
             }
-            break;
         }
         if (op == Kind.Eof)
             break;
@@ -1884,7 +1881,6 @@ fn bool Tokenizer.skip_feature(Tokenizer* t, Token* result) {
             break;
         }
     }
-    return false;
 }
 
 fn const char *skip_blanks(const char *p) {
@@ -1913,7 +1909,6 @@ fn const char *skip_string_literal(const char *p) {
             break;
         }
     }
-    return p;   // TODO detect this code as unreachable
 }
 
 fn const char *skip_raw_string_literal(const char *p) {
diff --git a/recipe.txt b/recipe.txt
@@ -157,9 +157,8 @@ executable c2c
     $warnings no-unused-variable
     $warnings no-unused-parameter
     $warnings no-unused-enum-constant
-# This is not supported by the bootstrap yet
-#    $warnings unreachable-code
-#    $warnings promote-to-error
+    $warnings unreachable-code
+    $warnings promote-to-error
     $use pthread dynamic
 
     $backend c

Original file line number	Diff line number	Diff line change
`@@ -214,8 +214,6 @@ fn bool Checker.checkTypes(Checker* c, const Type* lcanon, const Type* rcanon) {`
`214`	`214`	`c.diags.note(c.loc, "TODO CONVERSION %d)", res);`
`215`	`215`	`return false;`
`216`	`216`	`}`
`217`		`-`
`218`		`- return true;`
`219`	`217`	`}`
`220`	`218`
`221`	`219`	`fn bool Checker.checkBuiltins(Checker* c, const Type* lcanon, const Type* rcanon) {`
`@@ -441,8 +439,6 @@ fn bool Checker.checkEnum2Int(Checker* c, const Type* lcanon, const Type* rcanon`
`441`	`439`
`442`	`440`	`return c.check(c.lhs, impl, c.expr_ptr, c.loc);`
`443`	`441`	`}`
`444`		`-`
`445`		`- return true;`
`446`	`442`	`}`
`447`	`443`
`448`	`444`	`fn bool Checker.checkFunc2Func(Checker* c, const Type* lcanon, const Type* rcanon) {`
`@@ -579,8 +575,6 @@ public fn bool Checker.checkCast(Checker* c, QualType lhs, QualType rhs, SrcLoc`
`579`	`575`	`c.diags.note(c.loc, "TODO CONVERSION %d)", res);`
`580`	`576`	`return false;`
`581`	`577`	`}`
`582`		`-`
`583`		`- return true;`
`584`	`578`	`}`
`585`	`579`
`586`	`580`	`fn bool Checker.checkBuiltin2PointerCast(Checker* c, const Type* lcanon, const Type* rcanon) {`
Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,6 @@ fn QualType Analyser.analyseUnaryOperator(Analyser* ma, Expr** e_ptr, u32 side)`
`127`	`127`	`ma.error(e.getLoc(), "indirection requires pointer operand ('%s' invalid)", t.diagName());`
`128`	`128`	`return QualType_Invalid;`
`129`	`129`	`}`
`130`		`- break;`
`131`	`130`	`case Minus:`
`132`	`131`	`QualType lhs = getMinusType(canon);`
`133`	`132`	`if (!lhs.isValid()) goto invalid_type;`
Original file line number	Diff line number	Diff line change
`@@ -501,7 +501,6 @@ fn Cont WhileStmt.eval(WhileStmt* s, Evaluator* sf) {`
`501`	`501`	`return cont;`
`502`	`502`	`}`
`503`	`503`	`}`
`504`		`- return Cont.Abort;`
`505`	`504`	`}`
`506`	`505`
`507`	`506`	`fn Cont ForStmt.eval(ForStmt* s, Evaluator* sf) {`
`@@ -542,7 +541,6 @@ fn Cont ForStmt.eval(ForStmt* s, Evaluator* sf) {`
`542`	`541`	`return Cont.Error;`
`543`	`542`	`}`
`544`	`543`	`}`
`545`		`- return Cont.Abort;`
`546`	`544`	`}`
`547`	`545`
`548`	`546`	`fn Cont SwitchStmt.eval(SwitchStmt* s, Evaluator* sf) {`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,6 @@ public fn bool findProjectDir(PathInfo* info) {`
`88`	`88`	`}`
`89`	`89`	`strcat(rel_path, "../");`
`90`	`90`	`}`
`91`		`- return false; // to satisfy compiler`
`92`	`91`	`}`
`93`	`92`
`94`	`93`	`public fn const char* findBuildFile() @(unused) {`
Original file line number	Diff line number	Diff line change
`@@ -234,7 +234,6 @@ fn ir.Type Generator.type2irtype(Generator* gen, QualType qt) {`
`234`	`234`	`default:`
`235`	`235`	`return ir.Type.I64;`
`236`	`236`	`}`
`237`		`- break;`
`238`	`237`	`case Enum:`
`239`	`238`	`EnumType* et = canon.getEnum();`
`240`	`239`	`return gen.type2irtype(et.getImplType());`