Commit df636672 authored by Shravan Narayan's avatar Shravan Narayan
Browse files

Bug 1829268 - Update wasm2c compiler used with RLBox to support MinGW r=glandium 

Differential Revision: https://phabricator.services.mozilla.com/D176254
parent 8abc8bdd

config/external/wasm2c_sandbox_compiler/moz.yaml

+2 −2
Original line number Diff line number Diff line
@@ -9,8 +9,8 @@ origin: 
  description: wasm2c fork used for rlbox sandboxing

  url: https://github.com/WebAssembly/wabt



  release: ad5f1385fa7afe29e98d69b6167132162675228f (2023-04-13T05:14:45Z).

  revision: ad5f1385fa7afe29e98d69b6167132162675228f

  release: 3ec45c662746a7094914fccaebae4648765ef56e (2023-04-24T08:07:03Z).

  revision: 3ec45c662746a7094914fccaebae4648765ef56e



  license: Apache-2.0

  license-file: LICENSE

third_party/wasm2c/include/wabt/binary-reader-logging.h

+1 −1
Original line number Diff line number Diff line
@@ -385,7 +385,7 @@ class BinaryReaderLogging : public BinaryReaderDelegate { 
                       Address alignment,

                       uint32_t flags) override;

  Result OnInitFunctionCount(Index count) override;

  Result OnInitFunction(uint32_t priority, Index function_index) override;

  Result OnInitFunction(uint32_t priority, Index symbol_index) override;

  Result OnComdatCount(Index count) override;

  Result OnComdatBegin(std::string_view name,

                       uint32_t flags,

third_party/wasm2c/include/wabt/binary-reader-nop.h

+1 −1
Original line number Diff line number Diff line
@@ -569,7 +569,7 @@ class BinaryReaderNop : public BinaryReaderDelegate { 
    return Result::Ok;

  }

  Result OnInitFunctionCount(Index count) override { return Result::Ok; }

  Result OnInitFunction(uint32_t priority, Index function_index) override {

  Result OnInitFunction(uint32_t priority, Index symbol_index) override {

    return Result::Ok;

  }

  Result OnComdatCount(Index count) override { return Result::Ok; }

third_party/wasm2c/include/wabt/binary-reader.h

+1 −1
Original line number Diff line number Diff line
@@ -460,7 +460,7 @@ class BinaryReaderDelegate { 
                               Address alignment_log2,

                               uint32_t flags) = 0;

  virtual Result OnInitFunctionCount(Index count) = 0;

  virtual Result OnInitFunction(uint32_t priority, Index function_index) = 0;

  virtual Result OnInitFunction(uint32_t priority, Index symbol_index) = 0;

  virtual Result OnComdatCount(Index count) = 0;

  virtual Result OnComdatBegin(std::string_view name,

                               uint32_t flags,

third_party/wasm2c/src/binary-reader-logging.cc

+3 −3
Original line number Diff line number Diff line
@@ -619,9 +619,9 @@ Result BinaryReaderLogging::OnSegmentInfo(Index index, 
}



Result BinaryReaderLogging::OnInitFunction(uint32_t priority,

                                           Index func_index) {

  LOGF("OnInitFunction(%d priority: %d)\n", func_index, priority);

  return reader_->OnInitFunction(priority, func_index);

                                           Index symbol_index) {

  LOGF("OnInitFunction(%d priority: %d)\n", symbol_index, priority);

  return reader_->OnInitFunction(priority, symbol_index);

}



Result BinaryReaderLogging::OnComdatBegin(std::string_view name,