Refactor index logic

Lai-YT · Aug 9, 2024 · 8d0e0e9 · 8d0e0e9
1 parent 1702799
commit 8d0e0e9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/src/llvm_ir_generator.cpp b/src/llvm_ir_generator.cpp
@@ -277,16 +277,15 @@ void LLVMIRGenerator::Visit(const RecordVarDeclNode& record_var_decl) {
     auto init_val = val_recorder.ValOfPrevExpr();
 
     llvm::Value* res_addr = nullptr;
-    if (record_des_vals.empty()) {
-      res_addr = builder_.CreateStructGEP(type, base_addr, i);
-    } else {
+    auto init_index = i;
+    if (!record_des_vals.empty()) {
       // TODO: consider array index designators.
       // NOTE: Only consider identifer designators for now.
       assert(record_des_vals.size() == 1);
-      auto mem_index =
+      init_index =
           record_type.MemberIndex(std::get<std::string>(record_des_vals.at(0)));
-      res_addr = builder_.CreateStructGEP(type, base_addr, mem_index);
     }
+    res_addr = builder_.CreateStructGEP(type, base_addr, init_index);
     builder_.CreateStore(init_val, res_addr);
   }
 }

diff --git a/src/qbe_ir_generator.cpp b/src/qbe_ir_generator.cpp
@@ -321,10 +321,8 @@ void QbeIrGenerator::Visit(const RecordVarDeclNode& record_var_decl) {
     init->Accept(*this);
     const auto init_num = num_recorder.NumOfPrevExpr();
 
-    std::size_t offset = 0;
-    if (record_des_vals.empty()) {
-      offset = record_type.OffsetOf(i);
-    } else {
+    std::size_t offset = record_type.OffsetOf(i);
+    if (!record_des_vals.empty()) {
       // TODO: consider array index designators.
       // NOTE: Only consider identifer designators for now.
       assert(record_des_vals.size() == 1);