fix(bleach): add missing zero index on stack access

Author: arromanoff

lib/lifter/lifter.cpp

@@ -772,12 +772,13 @@ static auto generate_load_store_from_stack(
   auto *idx = builder.CreateAdd(sp, offset);
   auto *state_arg = get_current_state(*bb.getParent());
   auto *stack_type = *std::next(state.element_begin(), reg_stats.size());
+  auto *const_zero = ConstantInt::get(ctx, APInt(32, 0));
   auto *stack_addr = builder.CreateGEP(
       &state, state_arg,
-      ArrayRef<Value *>{ConstantInt::get(ctx, APInt(64, reg_stats.size()))});
-  auto *addr = builder.CreateInBoundsGEP(
-      stack_type, stack_addr,
-      ArrayRef<Value *>{ConstantInt::get(ctx, APInt(64, 0)), idx});
+      ArrayRef<Value *>{const_zero,
+                        ConstantInt::get(ctx, APInt(32, reg_stats.size()))});
+  auto *addr = builder.CreateInBoundsGEP(stack_type, stack_addr,
+                                         ArrayRef<Value *>{const_zero, idx});
   auto *iinfo = target_machine.getMCInstrInfo();
   auto name = get_instruction_name(minst, *iinfo);
   auto *m = bb.getParent()->getParent();
@@ -1174,7 +1175,6 @@ Module &bleach_module(Module &m, MachineModuleInfo &mmi,
   for (auto &&[oldf, func_info] : funcs)
     generate_function(*oldf, func_info, instrs, mmi, state, reg_stats,
                       assume_functions_nop);
-  m.print(errs(), nullptr);
   if (finfo) {
     for (auto *func :
          translated | views::filter([](auto *f) { return !f->empty(); }))

test/integration/fact-local-var.c

@@ -1,5 +1,3 @@
-// Failes due to corruption of local variable in bleached-main-local-var.c
-// XFAIL: *
 // RUN: %config-gen-path/config-gen.rb --march rv64im \
 // RUN:   --template-dir %config-gen-path/templates -o %t.yaml
 // RUN: riscv64-unknown-linux-gnu-clang %s -O2 -o %t.out -march=rv64im -nostdlib

test/tools/llvm-bleach/loadsstores.test

@@ -5,11 +5,11 @@
 # CHECK: define void @SnippyFunction(ptr %0) {
 # CHECK: %[[SP:[0-9]+]] = call i64 @ADDI(i64 %{{[0-9]+}}, i64 6)
 # CHECK: %[[IDX:[0-9]+]] = add i64 %[[SP]], -5
-# CHECK: %[[STACK:[0-9]+]] = getelementptr %register_state, ptr %0, i64 1
-# CHECK: %[[ADDR:[0-9]+]] = getelementptr inbounds [1000 x i64], ptr %[[STACK]], i64 0, i64 %[[IDX]]
+# CHECK: %[[STACK:[0-9]+]] = getelementptr %register_state, ptr %0, i32 0, i32 1
+# CHECK: %[[ADDR:[0-9]+]] = getelementptr inbounds [1000 x i64], ptr %[[STACK]], i32 0, i64 %[[IDX]]
 # CHECK: %[[LOADED:[0-9]+]] = load i64, ptr %[[ADDR]]
 
 # CHECK: %[[IDX2:[0-9]+]] = add i64 %[[SP]], -3
-# CHECK: %[[STACK2:[0-9]+]] = getelementptr %register_state, ptr %0, i64 1
-# CHECK: %[[ADDR2:[0-9]+]] = getelementptr inbounds [1000 x i64], ptr %[[STACK2]], i64 0, i64 %[[IDX2]]
+# CHECK: %[[STACK2:[0-9]+]] = getelementptr %register_state, ptr %0, i32 0, i32 1
+# CHECK: %[[ADDR2:[0-9]+]] = getelementptr inbounds [1000 x i64], ptr %[[STACK2]], i32 0, i64 %[[IDX2]]
 # CHECK: store i64 %[[LOADED]], ptr %[[ADDR2]]