From 412cc5559673963c57653a07696787db6004cd5e Mon Sep 17 00:00:00 2001 From: Robert Fancsik Date: Thu, 20 May 2021 21:51:01 +0200 Subject: [PATCH] release fixes --- src/CMakeLists.txt | 8 +++++++- src/inst.h | 3 ++- src/snapshot-readwriter.cpp | 1 - 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 11b32e6..3c6c946 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -23,7 +23,6 @@ set(SRC add_library(optimizer-core STATIC ${SRC}) add_dependencies(optimizer-core jerry-core) -message(${CMAKE_BINARY_DIR}) target_include_directories (optimizer-core PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} PUBLIC ${CMAKE_BINARY_DIR}/deps/jerryscript/amalgam/ @@ -40,6 +39,13 @@ target_include_directories (optimizer-core PUBLIC ${JERRYSCRIPT_DIR}/jerry-core/parser/js PUBLIC ${JERRYSCRIPT_DIR}/jerry-port/default/include ) + +if (CMAKE_BUILD_TYPE STREQUAL "Release") + target_compile_definitions(optimizer-core + PUBLIC JERRY_NDEBUG + ) +endif() + target_link_libraries (optimizer-core PRIVATE ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libjerry-core${CMAKE_STATIC_LIBRARY_SUFFIX} PRIVATE ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libjerry-port-default${CMAKE_STATIC_LIBRARY_SUFFIX}) diff --git a/src/inst.h b/src/inst.h index 310ccc1..a700f16 100644 --- a/src/inst.h +++ b/src/inst.h @@ -87,7 +87,8 @@ class Argument { public: Argument() : Argument(OperandType::OPERAND_TYPE__COUNT) {} Argument(OperandType type) - : type_(type), branch_offset_(0), byte_arg_(UINT32_MAX) {} + : type_(type), branch_offset_(0), line_info_(0), byte_arg_(UINT32_MAX), + stack_delta_(0) {} auto branchOffset() const { return branch_offset_; } auto type() const { return type_; } diff --git a/src/snapshot-readwriter.cpp b/src/snapshot-readwriter.cpp index b6932a5..342000e 100644 --- a/src/snapshot-readwriter.cpp +++ b/src/snapshot-readwriter.cpp @@ -124,7 +124,6 @@ uint32_t SnapshotReadWriter::writeSnapshot(Bytecode *bytecode, if (!ecma_save_literals_for_snapshot(lit_pool_p, buffer_p, buffer_size, &globals.snapshot_buffer_write_offset, &lit_map_p, &literals_num)) { - JERRY_ASSERT(lit_map_p == NULL); return 0; }