Reland of [wasm] Enforce that function bodies end with the \"end\" opcode.

test/cctest/wasm/test-run-wasm-module.cc

 // Copyright 2015 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stdlib.h>
 #include <string.h>
 
 #include "src/snapshot/code-serializer.h"
 #include "src/version.h"
 #include "src/wasm/module-decoder.h"
@@ skipping 45 matching lines @@
   testing::SetupIsolateForWasmModule(isolate);
   v8::TryCatch try_catch(reinterpret_cast<v8::Isolate*>(isolate));
   testing::CompileAndRunWasmModule(isolate, buffer.begin(), buffer.end(),
                                    ModuleOrigin::kWasmOrigin);
   CHECK(try_catch.HasCaught());
   isolate->clear_pending_exception();
 }
 
 void ExportAsMain(WasmFunctionBuilder* f) { f->ExportAs(CStrVector("main")); }
 
+#define EMIT_CODE_WITH_END(f, code)  \
+  do {                               \
+    f->EmitCode(code, sizeof(code)); \
+    f->Emit(kExprEnd);               \
+  } while (false)
+
 }  // namespace
 
 TEST(Run_WasmModule_Return114) {
   {
     static const int32_t kReturnValue = 114;
     TestSignatures sigs;
     v8::internal::AccountingAllocator allocator;
     Zone zone(&allocator, ZONE_NAME);
 
     WasmModuleBuilder* builder = new (&zone) WasmModuleBuilder(&zone);
     WasmFunctionBuilder* f = builder->AddFunction(sigs.i_v());
     ExportAsMain(f);
     byte code[] = {WASM_I32V_2(kReturnValue)};
-    f->EmitCode(code, sizeof(code));
+    EMIT_CODE_WITH_END(f, code);
     TestModule(&zone, builder, kReturnValue);
   }
   Cleanup();
 }
 
 TEST(Run_WasmModule_CallAdd) {
   {
     v8::internal::AccountingAllocator allocator;
     Zone zone(&allocator, ZONE_NAME);
     TestSignatures sigs;
 
     WasmModuleBuilder* builder = new (&zone) WasmModuleBuilder(&zone);
 
     WasmFunctionBuilder* f1 = builder->AddFunction(sigs.i_ii());
     uint16_t param1 = 0;
     uint16_t param2 = 1;
     byte code1[] = {
         WASM_I32_ADD(WASM_GET_LOCAL(param1), WASM_GET_LOCAL(param2))};
-    f1->EmitCode(code1, sizeof(code1));
+    EMIT_CODE_WITH_END(f1, code1);
 
     WasmFunctionBuilder* f2 = builder->AddFunction(sigs.i_v());
 
     ExportAsMain(f2);
     byte code2[] = {
         WASM_CALL_FUNCTION(f1->func_index(), WASM_I32V_2(77), WASM_I32V_1(22))};
-    f2->EmitCode(code2, sizeof(code2));
+    EMIT_CODE_WITH_END(f2, code2);
     TestModule(&zone, builder, 99);
   }
   Cleanup();
 }
 
 TEST(Run_WasmModule_ReadLoadedDataSegment) {
   {
     static const byte kDataSegmentDest0 = 12;
     v8::internal::AccountingAllocator allocator;
     Zone zone(&allocator, ZONE_NAME);
     TestSignatures sigs;
 
     WasmModuleBuilder* builder = new (&zone) WasmModuleBuilder(&zone);
     WasmFunctionBuilder* f = builder->AddFunction(sigs.i_v());
 
     ExportAsMain(f);
     byte code[] = {
         WASM_LOAD_MEM(MachineType::Int32(), WASM_I32V_1(kDataSegmentDest0))};
-    f->EmitCode(code, sizeof(code));
+    EMIT_CODE_WITH_END(f, code);
     byte data[] = {0xaa, 0xbb, 0xcc, 0xdd};
     builder->AddDataSegment(data, sizeof(data), kDataSegmentDest0);
     TestModule(&zone, builder, 0xddccbbaa);
   }
   Cleanup();
 }
 
 TEST(Run_WasmModule_CheckMemoryIsZero) {
   {
     static const int kCheckSize = 16 * 1024;
     v8::internal::AccountingAllocator allocator;
     Zone zone(&allocator, ZONE_NAME);
     TestSignatures sigs;
 
     WasmModuleBuilder* builder = new (&zone) WasmModuleBuilder(&zone);
     WasmFunctionBuilder* f = builder->AddFunction(sigs.i_v());
 
     uint16_t localIndex = f->AddLocal(kWasmI32);
     ExportAsMain(f);
     byte code[] = {WASM_BLOCK_I(
         WASM_WHILE(
             WASM_I32_LTS(WASM_GET_LOCAL(localIndex), WASM_I32V_3(kCheckSize)),
             WASM_IF_ELSE(
                 WASM_LOAD_MEM(MachineType::Int32(), WASM_GET_LOCAL(localIndex)),
                 WASM_BRV(3, WASM_I32V_1(-1)),
                 WASM_INC_LOCAL_BY(localIndex, 4))),
         WASM_I32V_1(11))};
-    f->EmitCode(code, sizeof(code));
+    EMIT_CODE_WITH_END(f, code);
     TestModule(&zone, builder, 11);
   }
   Cleanup();
 }
 
 TEST(Run_WasmModule_CallMain_recursive) {
   {
     v8::internal::AccountingAllocator allocator;
     Zone zone(&allocator, ZONE_NAME);
     TestSignatures sigs;
 
     WasmModuleBuilder* builder = new (&zone) WasmModuleBuilder(&zone);
     WasmFunctionBuilder* f = builder->AddFunction(sigs.i_v());
 
     uint16_t localIndex = f->AddLocal(kWasmI32);
     ExportAsMain(f);
     byte code[] = {
         WASM_SET_LOCAL(localIndex,
                        WASM_LOAD_MEM(MachineType::Int32(), WASM_ZERO)),
         WASM_IF_ELSE_I(WASM_I32_LTS(WASM_GET_LOCAL(localIndex), WASM_I32V_1(5)),
                        WASM_SEQ(WASM_STORE_MEM(MachineType::Int32(), WASM_ZERO,
                                                WASM_INC_LOCAL(localIndex)),
                                 WASM_CALL_FUNCTION0(0)),
                        WASM_I32V_1(55))};
-    f->EmitCode(code, sizeof(code));
+    EMIT_CODE_WITH_END(f, code);
     TestModule(&zone, builder, 55);
   }
   Cleanup();
 }
 
 TEST(Run_WasmModule_Global) {
   {
     v8::internal::AccountingAllocator allocator;
     Zone zone(&allocator, ZONE_NAME);
     TestSignatures sigs;
 
     WasmModuleBuilder* builder = new (&zone) WasmModuleBuilder(&zone);
     uint32_t global1 = builder->AddGlobal(kWasmI32, 0);
     uint32_t global2 = builder->AddGlobal(kWasmI32, 0);
     WasmFunctionBuilder* f1 = builder->AddFunction(sigs.i_v());
     byte code1[] = {
         WASM_I32_ADD(WASM_GET_GLOBAL(global1), WASM_GET_GLOBAL(global2))};
-    f1->EmitCode(code1, sizeof(code1));
+    EMIT_CODE_WITH_END(f1, code1);
     WasmFunctionBuilder* f2 = builder->AddFunction(sigs.i_v());
     ExportAsMain(f2);
     byte code2[] = {WASM_SET_GLOBAL(global1, WASM_I32V_1(56)),
                     WASM_SET_GLOBAL(global2, WASM_I32V_1(41)),
                     WASM_RETURN1(WASM_CALL_FUNCTION0(f1->func_index()))};
-    f2->EmitCode(code2, sizeof(code2));
+    EMIT_CODE_WITH_END(f2, code2);
     TestModule(&zone, builder, 97);
   }
   Cleanup();
 }
 
 // Approximate gtest TEST_F style, in case we adopt gtest.
 class WasmSerializationTest {
  public:
   WasmSerializationTest() : zone_(&allocator_, ZONE_NAME) {
     // Don't call here if we move to gtest.
@@ skipping 74 matching lines @@
   }
 
   v8::Isolate* current_isolate_v8() { return current_isolate_v8_; }
 
   void SetUp() {
     WasmModuleBuilder* builder = new (zone()) WasmModuleBuilder(zone());
     TestSignatures sigs;
 
     WasmFunctionBuilder* f = builder->AddFunction(sigs.i_i());
     byte code[] = {WASM_GET_LOCAL(0), kExprI32Const, 1, kExprI32Add};
-    f->EmitCode(code, sizeof(code));
+    EMIT_CODE_WITH_END(f, code);
     f->ExportAs(CStrVector(kFunctionName));
 
     ZoneBuffer buffer(&zone_);
     builder->WriteTo(buffer);
 
     Isolate* serialization_isolate = CcTest::InitIsolateOnce();
     ErrorThrower thrower(serialization_isolate, "");
     uint8_t* bytes = nullptr;
     size_t bytes_size = 0;
     {
@@ skipping 111 matching lines @@
     // Initial memory size is 16, see wasm-module-builder.cc
     static const int kExpectedValue = 16;
     TestSignatures sigs;
     v8::internal::AccountingAllocator allocator;
     Zone zone(&allocator, ZONE_NAME);
 
     WasmModuleBuilder* builder = new (&zone) WasmModuleBuilder(&zone);
     WasmFunctionBuilder* f = builder->AddFunction(sigs.i_v());
     ExportAsMain(f);
     byte code[] = {WASM_MEMORY_SIZE};
-    f->EmitCode(code, sizeof(code));
+    EMIT_CODE_WITH_END(f, code);
     TestModule(&zone, builder, kExpectedValue);
   }
   Cleanup();
 }
 
 TEST(Run_WasmModule_MemSize_GrowMem) {
   {
     // Initial memory size = 16 + GrowMemory(10)
     static const int kExpectedValue = 26;
     TestSignatures sigs;
     v8::internal::AccountingAllocator allocator;
     Zone zone(&allocator, ZONE_NAME);
 
     WasmModuleBuilder* builder = new (&zone) WasmModuleBuilder(&zone);
     WasmFunctionBuilder* f = builder->AddFunction(sigs.i_v());
     ExportAsMain(f);
     byte code[] = {WASM_GROW_MEMORY(WASM_I32V_1(10)), WASM_DROP,
                    WASM_MEMORY_SIZE};
-    f->EmitCode(code, sizeof(code));
+    EMIT_CODE_WITH_END(f, code);
     TestModule(&zone, builder, kExpectedValue);
   }
   Cleanup();
 }
 
 TEST(GrowMemoryZero) {
   {
     // Initial memory size is 16, see wasm-module-builder.cc
     static const int kExpectedValue = 16;
     TestSignatures sigs;
     v8::internal::AccountingAllocator allocator;
     Zone zone(&allocator, ZONE_NAME);
 
     WasmModuleBuilder* builder = new (&zone) WasmModuleBuilder(&zone);
     WasmFunctionBuilder* f = builder->AddFunction(sigs.i_v());
     ExportAsMain(f);
     byte code[] = {WASM_GROW_MEMORY(WASM_I32V(0))};
-    f->EmitCode(code, sizeof(code));
+    EMIT_CODE_WITH_END(f, code);
     TestModule(&zone, builder, kExpectedValue);
   }
   Cleanup();
 }
 
 class InterruptThread : public v8::base::Thread {
  public:
   explicit InterruptThread(Isolate* isolate, int32_t* memory)
       : Thread(Options("TestInterruptLoop")),
         isolate_(isolate),
@@ skipping 50 matching lines @@
     ExportAsMain(f);
     byte code[] = {
         WASM_LOOP(
             WASM_IFB(WASM_NOT(WASM_LOAD_MEM(
                          MachineType::Int32(),
                          WASM_I32V(InterruptThread::interrupt_location_ * 4))),
                      WASM_STORE_MEM(MachineType::Int32(), WASM_ZERO,
                                     WASM_I32V(InterruptThread::signal_value_)),
                      WASM_BR(1))),
         WASM_I32V(121)};
-    f->EmitCode(code, sizeof(code));
+    EMIT_CODE_WITH_END(f, code);
     ZoneBuffer buffer(&zone);
     builder->WriteTo(buffer);
 
     HandleScope scope(isolate);
     testing::SetupIsolateForWasmModule(isolate);
     ErrorThrower thrower(isolate, "Test");
     const Handle<WasmInstanceObject> instance =
         testing::CompileInstantiateWasmModuleForTesting(
             isolate, &thrower, buffer.begin(), buffer.end(),
             ModuleOrigin::kWasmOrigin);
@@ skipping 18 matching lines @@
 TEST(Run_WasmModule_GrowMemoryInIf) {
   {
     TestSignatures sigs;
     v8::internal::AccountingAllocator allocator;
     Zone zone(&allocator, ZONE_NAME);
     WasmModuleBuilder* builder = new (&zone) WasmModuleBuilder(&zone);
     WasmFunctionBuilder* f = builder->AddFunction(sigs.i_v());
     ExportAsMain(f);
     byte code[] = {WASM_IF_ELSE_I(WASM_I32V(0), WASM_GROW_MEMORY(WASM_I32V(1)),
                                   WASM_I32V(12))};
-    f->EmitCode(code, sizeof(code));
+    EMIT_CODE_WITH_END(f, code);
     TestModule(&zone, builder, 12);
   }
   Cleanup();
 }
 
 TEST(Run_WasmModule_GrowMemOobOffset) {
   {
     static const int kPageSize = 0x10000;
     // Initial memory size = 16 + GrowMemory(10)
     static const int index = kPageSize * 17 + 4;
     int value = 0xaced;
     TestSignatures sigs;
     v8::internal::AccountingAllocator allocator;
     Zone zone(&allocator, ZONE_NAME);
 
     WasmModuleBuilder* builder = new (&zone) WasmModuleBuilder(&zone);
     WasmFunctionBuilder* f = builder->AddFunction(sigs.i_v());
     ExportAsMain(f);
     byte code[] = {WASM_GROW_MEMORY(WASM_I32V_1(1)),
                    WASM_STORE_MEM(MachineType::Int32(), WASM_I32V(index),
                                   WASM_I32V(value))};
-    f->EmitCode(code, sizeof(code));
+    EMIT_CODE_WITH_END(f, code);
     TestModuleException(&zone, builder);
   }
   Cleanup();
 }
 
 TEST(Run_WasmModule_GrowMemOobFixedIndex) {
   {
     static const int kPageSize = 0x10000;
     // Initial memory size = 16 + GrowMemory(10)
     static const int index = kPageSize * 26 + 4;
     int value = 0xaced;
     TestSignatures sigs;
     Isolate* isolate = CcTest::InitIsolateOnce();
     Zone zone(isolate->allocator(), ZONE_NAME);
 
     WasmModuleBuilder* builder = new (&zone) WasmModuleBuilder(&zone);
     WasmFunctionBuilder* f = builder->AddFunction(sigs.i_i());
     ExportAsMain(f);
     byte code[] = {WASM_GROW_MEMORY(WASM_GET_LOCAL(0)), WASM_DROP,
                    WASM_STORE_MEM(MachineType::Int32(), WASM_I32V(index),
                                   WASM_I32V(value)),
                    WASM_LOAD_MEM(MachineType::Int32(), WASM_I32V(index))};
-    f->EmitCode(code, sizeof(code));
+    EMIT_CODE_WITH_END(f, code);
 
     HandleScope scope(isolate);
     ZoneBuffer buffer(&zone);
     builder->WriteTo(buffer);
     testing::SetupIsolateForWasmModule(isolate);
 
     ErrorThrower thrower(isolate, "Test");
     Handle<JSObject> instance = testing::CompileInstantiateWasmModuleForTesting(
         isolate, &thrower, buffer.begin(), buffer.end(),
         ModuleOrigin::kWasmOrigin);
@@ skipping 27 matching lines @@
     v8::internal::AccountingAllocator allocator;
     Zone zone(&allocator, ZONE_NAME);
 
     WasmModuleBuilder* builder = new (&zone) WasmModuleBuilder(&zone);
     WasmFunctionBuilder* f = builder->AddFunction(sigs.i_i());
     ExportAsMain(f);
     byte code[] = {WASM_GROW_MEMORY(WASM_I32V_1(1)), WASM_DROP,
                    WASM_STORE_MEM(MachineType::Int32(), WASM_GET_LOCAL(0),
                                   WASM_I32V(value)),
                    WASM_LOAD_MEM(MachineType::Int32(), WASM_GET_LOCAL(0))};
-    f->EmitCode(code, sizeof(code));
+    EMIT_CODE_WITH_END(f, code);
 
     HandleScope scope(isolate);
     ZoneBuffer buffer(&zone);
     builder->WriteTo(buffer);
     testing::SetupIsolateForWasmModule(isolate);
 
     ErrorThrower thrower(isolate, "Test");
     Handle<JSObject> instance = testing::CompileInstantiateWasmModuleForTesting(
         isolate, &thrower, buffer.begin(), buffer.end(),
         ModuleOrigin::kWasmOrigin);
@@ skipping 38 matching lines @@
     TestSignatures sigs;
 
     WasmModuleBuilder* builder = new (&zone) WasmModuleBuilder(&zone);
     uint32_t global1 =
         builder->AddGlobal(kWasmI32, false, false, WasmInitExpr(777777));
     uint32_t global2 =
         builder->AddGlobal(kWasmI32, false, false, WasmInitExpr(222222));
     WasmFunctionBuilder* f1 = builder->AddFunction(sigs.i_v());
     byte code[] = {
         WASM_I32_ADD(WASM_GET_GLOBAL(global1), WASM_GET_GLOBAL(global2))};
-    f1->EmitCode(code, sizeof(code));
+    EMIT_CODE_WITH_END(f1, code);
     ExportAsMain(f1);
     TestModule(&zone, builder, 999999);
   }
   Cleanup();
 }
 
 template <typename CType>
 static void RunWasmModuleGlobalInitTest(ValueType type, CType expected) {
   {
     v8::internal::AccountingAllocator allocator;
@@ skipping 11 matching lines @@
         builder->AddGlobal(kWasmI32, false, false, WasmInitExpr(i + 20000));
       }
       uint32_t global =
           builder->AddGlobal(type, false, false, WasmInitExpr(expected));
       for (int i = 0; i < padding; i++) {  // pad global after
         builder->AddGlobal(kWasmI32, false, false, WasmInitExpr(i + 30000));
       }
 
       WasmFunctionBuilder* f1 = builder->AddFunction(&sig);
       byte code[] = {WASM_GET_GLOBAL(global)};
-      f1->EmitCode(code, sizeof(code));
+      EMIT_CODE_WITH_END(f1, code);
       ExportAsMain(f1);
       TestModule(&zone, builder, expected);
     }
   }
   Cleanup();
 }
 
 TEST(Run_WasmModule_Global_i32) {
   RunWasmModuleGlobalInitTest<int32_t>(kWasmI32, -983489);
   RunWasmModuleGlobalInitTest<int32_t>(kWasmI32, 11223344);
@@ skipping 141 matching lines @@
     };
 
     testing::CompileInstantiateWasmModuleForTesting(isolate, &thrower, data,
                                                     data + arraysize(data),
                                                     ModuleOrigin::kWasmOrigin);
     // It should be possible to instantiate this module.
     CHECK(!thrower.error());
   }
   Cleanup();
 }