Skip to content

Commit 2da0ccf

Browse files
committed
Merge branch 'dev/checkpoint_and_restore' into main
Signed-off-by: victoryang00 <[email protected]>
1 parent 6cd3e89 commit 2da0ccf

File tree

5 files changed

+5
-65
lines changed

5 files changed

+5
-65
lines changed

core/iwasm/compilation/aot_compiler.c

+4-5
Original file line numberDiff line numberDiff line change
@@ -358,20 +358,19 @@ aot_gen_commit_value(AOTCompFrame *frame, bool reset_dirty_bit,
358358
}
359359
if (local_idx < func_ctx->aot_func->func_type->param_count
360360
+ func_ctx->aot_func->local_count) {
361-
fprintf(stderr, "LLVMBuildLoad2 %d < %d\n", local_idx,
362-
func_ctx->aot_func->local_count);
363361
value =
364362
LLVMBuildLoad2(comp_ctx->builder, llvm_value_type,
365363
func_ctx->locals[local_idx], "commit_stack_load");
366-
fprintf(stderr, "DONE LLVMBuildLoad2 %d\n", local_idx);
367364
}
368365
else {
369366
if (!(*p)->value) {
370367
fprintf(stderr, "value is null, %d %d\n", local_idx, n);
371368
exit(-1);
372369
}
373-
value = LLVMBuildLoad2(comp_ctx->builder, llvm_value_type, (*p)->value,
374-
"commit_stack_load");
370+
value = (*p)->value;
371+
// value = LLVMBuildLoad2(comp_ctx->builder, llvm_value_type,
372+
// (*p)->value,
373+
// "commit_stack_load");
375374
}
376375
if (value == NULL) {
377376
fprintf(stderr, "gen value load error\n");

core/iwasm/compilation/aot_emit_function.c

-15
Original file line numberDiff line numberDiff line change
@@ -1420,21 +1420,6 @@ aot_compile_op_call(AOTCompContext *comp_ctx, AOTFuncContext *func_ctx,
14201420
/* Get param cell number */
14211421
param_cell_num = func_type->param_cell_num;
14221422

1423-
// #if (WASM_ENABLE_DUMP_CALL_STACK != 0) || (WASM_ENABLE_PERF_PROFILING !=
1424-
// 0)
1425-
// if (comp_ctx->enable_aux_stack_frame) {
1426-
// LLVMValueRef func_idx_const;
1427-
1428-
// if (!(func_idx_const = I32_CONST(func_idx))) {
1429-
// aot_set_last_error("llvm build const failed.");
1430-
// return false;
1431-
// }
1432-
// if (!call_aot_alloc_frame_func(comp_ctx, func_ctx,
1433-
// func_idx_const))
1434-
// return false;
1435-
// }
1436-
// #endif
1437-
14381423
/* Allocate memory for parameters.
14391424
* Parameters layout:
14401425
* - exec env

core/iwasm/libraries/ckpt-restore/get_func_name.py

-43
This file was deleted.

core/iwasm/libraries/ckpt-restore/wamr_wasi_arguments.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
#include "wamr_serializer.h"
1818
#include "wasm_runtime.h"
1919
#include <atomic>
20-
#include <filesystem>
2120
#include <map>
2221
#include <memory>
2322
#include <ranges>
2423
#include <string>
2524
#include <unordered_map>
25+
#include <tuple>
2626
#include <vector>
2727

2828
struct WAMRAddrPool {

test-tools/addr2line/addr2line.py

-1
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,6 @@ def main():
346346
if splitted is None:
347347
print(f"{line}")
348348
continue
349-
index = index[2:]
350349

351350
_, offset, index = splitted
352351
if args.no_addr:

0 commit comments

Comments
 (0)