refactoring

include/ravi_llvmcodegen.h

@@ -600,8 +600,7 @@ public:
   void emit_extern_declarations(RaviFunctionDef *def);
 
   // Retrieve the proto->sizep
-  llvm::Instruction *emit_load_proto_sizep(RaviFunctionDef *def,
-                                           llvm::Value *proto_ptr);
+  llvm::Instruction *emit_load_proto_sizep(RaviFunctionDef *def);
 
   // Store lua_Number or lua_Integer
   llvm::Instruction *emit_store_local_n(RaviFunctionDef *def, llvm::Value *src,

src/ravi_llvmcodegen.cpp

@@ -121,8 +121,7 @@ RaviCodeGenerator::emit_gep_ci_func_value_gc_asLClosure(RaviFunctionDef *def,
 
 // Retrieve the proto->sizep
 llvm::Instruction *
-RaviCodeGenerator::emit_load_proto_sizep(RaviFunctionDef *def,
-                                         llvm::Value *proto_ptr) {
+RaviCodeGenerator::emit_load_proto_sizep(RaviFunctionDef *def) {
   llvm::Value *psize_ptr = emit_gep(def, "sizep", def->proto_ptr, 0, 10);
   // Load sizep
   llvm::Instruction *psize = def->builder->CreateLoad(psize_ptr);
@@ -142,6 +141,7 @@ llvm::Instruction *RaviCodeGenerator::emit_load_base(RaviFunctionDef *def) {
   llvm::Instruction *base_ptr = def->builder->CreateLoad(def->Ci_base);
   base_ptr->setMetadata(llvm::LLVMContext::MD_tbaa,
                         def->types->tbaa_luaState_ci_baseT);
+  def->base_ptr = base_ptr;
   return base_ptr;
 }
 

src/ravi_llvmreturn.cpp

@@ -67,7 +67,7 @@ void RaviCodeGenerator::emit_RETURN(RaviFunctionDef *def, int A, int B) {
 
   // if (cl->p->sizep > 0) luaF_close(L, base);
   // Get pointer to Proto->sizep
-  llvm::Instruction *psize = emit_load_proto_sizep(def, def->proto_ptr);
+  llvm::Instruction *psize = emit_load_proto_sizep(def);
 
   // Test if psize > 0
   llvm::Value *psize_gt_0 =