Add changes for workflows to test.

Author: dimi181

.github/workflows/compilation_on_android_ubuntu.yml

@@ -123,7 +123,7 @@ jobs:
       - name: Build wamrc
         run: |
           mkdir build && cd build
-          cmake .. -DCMAKE_C_FLAGS="-Werror"
+          cmake .. -DCMAKE_C_FLAGS="-Werror" -DWAMR_BUILD_COMPONENT_MODEL=0
           cmake --build . --config Release --parallel 4
         working-directory: wamr-compiler
 
@@ -295,15 +295,15 @@ jobs:
         if: matrix.platform == 'linux'
         run: |
           mkdir build && cd build
-          cmake .. -DCMAKE_C_FLAGS="-Werror" ${{ matrix.make_options_run_mode }} ${{ matrix.make_options_feature }} ${{ matrix.extra_options}}
+          cmake .. -DCMAKE_C_FLAGS="-Werror" -DWAMR_BUILD_COMPONENT_MODEL=0 ${{ matrix.make_options_run_mode }} ${{ matrix.make_options_feature }} ${{ matrix.extra_options}}
           cmake --build . --config Release --parallel 4
         working-directory: product-mini/platforms/${{ matrix.platform }}
 
       - name: Build iwasm for android
         if: matrix.platform == 'android'
         run: |
           mkdir build && cd build
-          cmake .. -DCMAKE_C_FLAGS="-Werror" ${{ matrix.make_options_run_mode }} ${{ matrix.make_options_feature }} \
+          cmake .. -DCMAKE_C_FLAGS="-Werror" -DWAMR_BUILD_COMPONENT_MODEL=0 ${{ matrix.make_options_run_mode }} ${{ matrix.make_options_feature }} \
                 -DWAMR_BUILD_TARGET=X86_64
           cmake --build . --config Release --parallel 4
         working-directory: product-mini/platforms/${{ matrix.platform }}
@@ -348,7 +348,7 @@ jobs:
       - name: Build wamrc
         run: |
           mkdir build && cd build
-          cmake ..
+          cmake .. -DWAMR_BUILD_COMPONENT_MODEL=0
           cmake --build . --config Release --parallel 4
         working-directory: wamr-compiler
 
@@ -472,7 +472,7 @@ jobs:
         if: (!endsWith(matrix.make_options, '_INTERP_BUILD_OPTIONS'))
         run: |
           mkdir build && cd build
-          cmake ..
+          cmake .. -DWAMR_BUILD_COMPONENT_MODEL=0
           cmake --build . --config Release --parallel 4
         working-directory: wamr-compiler
 
@@ -523,7 +523,7 @@ jobs:
       - name: Build wamrc
         run: |
           mkdir build && cd build
-          cmake ..
+          cmake .. -DWAMR_BUILD_COMPONENT_MODEL=0
           cmake --build . --config Release --parallel 4
         working-directory: wamr-compiler
 

.github/workflows/compilation_on_windows.yml

@@ -95,7 +95,7 @@ jobs:
         run: |
           cd product-mini/platforms/windows
           mkdir build && cd build
-          cmake .. ${{ matrix.build_options }}
+          cmake .. -DWAMR_BUILD_COMPONENT_MODEL=0 ${{ matrix.build_options }}
           cmake --build . --config Release --parallel 4
 
   build_wamrc:
@@ -130,7 +130,7 @@ jobs:
 
       - name: Build wamrc
         run: |
-          cmake -S . -B build
+          cmake -S . -B build -DWAMR_BUILD_COMPONENT_MODEL=0
           cmake --build build --config Release --parallel 4
         working-directory: wamr-compiler
 

core/iwasm/aot/aot_runtime.c

@@ -50,12 +50,17 @@ bh_static_assert(offsetof(AOTModuleInstance, cur_exception)
                  == 13 * sizeof(uint64));
 bh_static_assert(offsetof(AOTModuleInstance, c_api_func_imports)
                  == 13 * sizeof(uint64) + 128 + 7 * sizeof(uint64));
+#if WASM_ENABLE_COMPONENT_MODEL != 0
 bh_static_assert(offsetof(AOTModuleInstance, global_table_data)
                  == 13 * sizeof(uint64) + 128 + 14 * sizeof(uint64)
 #if WASM_ENABLE_COMPONENT_MODEL != 0
-                        + sizeof(void *) + sizeof(uint64)
+bh_static_assert(offsetof(AOTModuleInstance, global_table_data)
+                == 13 * sizeof(uint64) + 128 + 14 * sizeof(uint64)
+                    + sizeof(void *) + sizeof(uint64));
+#else
+bh_static_assert(offsetof(AOTModuleInstance, global_table_data)
+                == 13 * sizeof(uint64) + 128 + 14 * sizeof(uint64));
 #endif
-);
 
 bh_static_assert(sizeof(AOTMemoryInstance) == 120);
 bh_static_assert(offsetof(AOTTableInstance, elems) == 24);

tests/regression/ba-issues/build_wamr.sh

@@ -26,7 +26,8 @@ function build_iwasm() {
     if [ -d build-iwasm-$2 ]; then rm -rf build-iwasm-$2; else mkdir build-iwasm-$2; fi &&
     cd build-iwasm-$2 &&
     cmake ${WAMR_DIR}/product-mini/platforms/${PLATFORM} $1 \
-          -DCMAKE_BUILD_TYPE=Debug -DWAMR_BUILD_SANITIZER=asan &&
+          -DCMAKE_BUILD_TYPE=Debug -DWAMR_BUILD_SANITIZER=asan \
+          -DWAMR_BUILD_COMPONENT_MODEL=0 &&
     make -j 4
     if [ "$?" != 0 ]; then
         echo -e "build iwasm failed"

tests/wamr-test-suites/test_wamr.sh

@@ -1159,6 +1159,7 @@ function trigger()
     EXTRA_COMPILE_FLAGS+=" -DWAMR_BUILD_BULK_MEMORY=1"
     EXTRA_COMPILE_FLAGS+=" -DWAMR_BUILD_REF_TYPES=1"
     EXTRA_COMPILE_FLAGS+=" -DWAMR_BUILD_LIBC_WASI=0"
+    EXTRA_COMPILE_FLAGS+=" -DWAMR_BUILD_COMPONENT_MODEL=0"
 
     if [[ ${ENABLE_MULTI_MODULE} == 1 ]];then
         EXTRA_COMPILE_FLAGS+=" -DWAMR_BUILD_MULTI_MODULE=1"