motiejus/zig

commit 84930fec279a8bf0e7ce79c79a7ccd98d1ef4d0d (tree)
parent b9f37ffe19e30da1fd79cd01dbb6191ec2733b5c
Author: LemonBoy <thatlemon@gmail.com>
Date:   Mon, 13 Jan 2020 21:45:16 +0100

Validate switch range endpoints

Diffstat:
M
src/ir.cpp
 | 
12
++++++++++++
M
test/compile_errors.zig
 | 
14
++++++++++++++

2 files changed, 26 insertions(+), 0 deletions(-)
diff --git a/src/ir.cpp b/src/ir.cpp
@@ -26394,6 +26394,7 @@ static IrInstruction *ir_analyze_instruction_check_switch_prongs(IrAnalyze *ira,
             if (type_is_invalid(end_value->value->type))
                 return ira->codegen->invalid_instruction;
 
+            assert(start_value->value->type->id == ZigTypeIdEnum);
             BigInt start_index;
             bigint_init_bigint(&start_index, &start_value->value->data.x_enum_tag);
 
@@ -26401,6 +26402,11 @@ static IrInstruction *ir_analyze_instruction_check_switch_prongs(IrAnalyze *ira,
             BigInt end_index;
             bigint_init_bigint(&end_index, &end_value->value->data.x_enum_tag);
 
+            if (bigint_cmp(&start_index, &end_index) == CmpGT) {
+                ir_add_error(ira, start_value,
+                    buf_sprintf("range start value is greater than the end value"));
+            }
+
             BigInt field_index;
             bigint_init_bigint(&field_index, &start_index);
             for (;;) {
@@ -26530,6 +26536,12 @@ static IrInstruction *ir_analyze_instruction_check_switch_prongs(IrAnalyze *ira,
 
             assert(start_val->type->id == ZigTypeIdInt || start_val->type->id == ZigTypeIdComptimeInt);
             assert(end_val->type->id == ZigTypeIdInt || end_val->type->id == ZigTypeIdComptimeInt);
+
+            if (bigint_cmp(&start_val->data.x_bigint, &end_val->data.x_bigint) == CmpGT) {
+                ir_add_error(ira, start_value,
+                    buf_sprintf("range start value is greater than the end value"));
+            }
+
             AstNode *prev_node = rangeset_add_range(&rs, &start_val->data.x_bigint, &end_val->data.x_bigint,
                     start_value->source_node);
             if (prev_node != nullptr) {
diff --git a/test/compile_errors.zig b/test/compile_errors.zig
@@ -2,6 +2,20 @@ const tests = @import("tests.zig");
 const builtin = @import("builtin");
 
 pub fn addCases(cases: *tests.CompileErrorContext) void {
+    cases.addTest("switch ranges endpoints are validated",
+        \\pub export fn entry() void {
+        \\    var x: i32 = 0;
+        \\    switch (x) {
+        \\        6...1 => {},
+        \\        -1...-5 => {},
+        \\        else => unreachable,
+        \\    }
+        \\}
+    , &[_][]const u8{
+        "tmp.zig:4:9: error: range start value is greater than the end value",
+        "tmp.zig:5:9: error: range start value is greater than the end value",
+    });
+
     cases.addTest("errors in for loop bodies are propagated",
         \\pub export fn entry() void {
         \\    var arr: [100]u8 = undefined;