fix: resolve interpreter crash when using 'break' within a switch sta…

…tement
ArgonLang · Oct 5, 2023 · 8166495 · 8166495
1 parent 7bf9184
commit 8166495
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/argon/lang/basicblock.h b/argon/lang/basicblock.h
@@ -42,7 +42,8 @@ namespace argon::lang {
         LOOP,
         TRAP,
         SAFE,
-        SYNC
+        SYNC,
+        SWITCH
     };
 
     struct JBlock {

diff --git a/argon/lang/compiler.cpp b/argon/lang/compiler.cpp
@@ -1260,7 +1260,7 @@ void Compiler::CompileJump(const parser::Unary *jump) {
 
     unsigned short pops;
 
-    if ((jb = this->unit_->FindLoop(label, pops)) == nullptr) {
+    if ((jb = this->unit_->FindJB(label, jump->token_type == scanner::TokenType::KW_BREAK, pops)) == nullptr) {
         ErrorFormat(kCompilerError[0], "unknown loop label, the loop '%s' cannot be %s",
                     ARGON_RAW_STRING((String *) ((const Unary *) jump->value)->value),
                     jump->token_type == scanner::TokenType::KW_BREAK ? "breaked" : "continued");
@@ -1484,6 +1484,8 @@ void Compiler::CompileSwitch(const parser::Test *test) {
         throw DatatypeException();
     }
 
+    auto jb = this->unit_->JBNew(nullptr, JBlockType::SWITCH, end);
+
     try {
         ARC iter;
         ARC scase;
@@ -1539,6 +1541,8 @@ void Compiler::CompileSwitch(const parser::Test *test) {
     this->unit_->BlockAppend(bodies);
     this->unit_->bb.cur = lbody;
 
+    this->unit_->JBPop(jb);
+
     // Set end block
     this->unit_->BlockAppend(end);
 }

diff --git a/argon/lang/translation_unit.cpp b/argon/lang/translation_unit.cpp
@@ -235,12 +235,15 @@ JBlock *TranslationUnit::JBNew(BasicBlock *start, BasicBlock *end, unsigned shor
     return jb;
 }
 
-JBlock *TranslationUnit::FindLoop(String *label, unsigned short &pops) const {
+JBlock *TranslationUnit::FindJB(vm::datatype::String *label, bool is_break, unsigned short &pops) const {
     pops = 0;
 
     for (JBlock *block = this->jstack; block != nullptr; block = block->prev) {
         pops += block->pops;
 
+        if (is_break && label == nullptr && block->type == JBlockType::SWITCH)
+            return block;
+
         if (block->type != JBlockType::LOOP)
             continue;
 

diff --git a/argon/lang/translation_unit.h b/argon/lang/translation_unit.h
@@ -78,7 +78,7 @@ namespace argon::lang {
 
         JBlock *JBNew(BasicBlock *start, BasicBlock *end, unsigned short pops);
 
-        JBlock *FindLoop(vm::datatype::String *label, unsigned short &pops) const;
+        JBlock *FindJB(vm::datatype::String *label, bool is_break, unsigned short &pops) const;
 
         unsigned int ComputeAssemblyLength(unsigned int *out_linfo_sz) const;
-Original file line number
+Diff line change
@@ Expand Up / @@ -42,7 +42,8 @@ namespace argon::lang { @@
             LOOP,
             TRAP,
             SAFE,
-            SYNC
+            SYNC,
+            SWITCH
         };
         struct JBlock {
@@ Expand Down @@