[wasm] Rename ModuleEnv to CompilationEnv

R=mstarzinger@chromium.org

Bug: v8:8238
Change-Id: I93c9d2a643731766f15f4db1bf7647a85488a6d0
Reviewed-on: https://chromium-review.googlesource.com/c/1296454Reviewed-by: Michael Starzinger <mstarzinger@chromium.org>
Reviewed-by: Ben Titzer <titzer@chromium.org>
Commit-Queue: Clemens Hammacher <clemensh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#56906}

src/compiler/wasm-compiler.cc

@@ -136,7 +136,7 @@ bool ContainsInt64(wasm::FunctionSig* sig) {
 }  // namespace
 
 WasmGraphBuilder::WasmGraphBuilder(
-    wasm::ModuleEnv* env, Zone* zone, MachineGraph* mcgraph,
+    wasm::CompilationEnv* env, Zone* zone, MachineGraph* mcgraph,
     wasm::FunctionSig* sig,
     compiler::SourcePositionTable* source_position_table)
     : zone_(zone),
@@ -4063,8 +4063,8 @@ void RecordFunctionCompilation(CodeEventListener::LogEventsAndTags tag,
 
 class WasmWrapperGraphBuilder : public WasmGraphBuilder {
  public:
-  WasmWrapperGraphBuilder(Zone* zone, wasm::ModuleEnv* env, JSGraph* jsgraph,
-                          wasm::FunctionSig* sig,
+  WasmWrapperGraphBuilder(Zone* zone, wasm::CompilationEnv* env,
+                          JSGraph* jsgraph, wasm::FunctionSig* sig,
                           compiler::SourcePositionTable* spt,
                           StubCallMode stub_mode)
       : WasmGraphBuilder(env, zone, jsgraph, sig, spt),
@@ -4880,8 +4880,8 @@ MaybeHandle<Code> CompileJSToWasmWrapper(Isolate* isolate,
   Node* control = nullptr;
   Node* effect = nullptr;
 
-  wasm::ModuleEnv env(nullptr, wasm::kNoTrapHandler,
-                      wasm::kRuntimeExceptionSupport);
+  wasm::CompilationEnv env(nullptr, wasm::kNoTrapHandler,
+                           wasm::kRuntimeExceptionSupport);
   WasmWrapperGraphBuilder builder(&zone, &env, &jsgraph, sig, nullptr,
                                   StubCallMode::kCallOnHeapBuiltin);
   builder.set_control_ptr(&control);
@@ -4990,8 +4990,8 @@ MaybeHandle<Code> CompileWasmImportCallWrapper(Isolate* isolate,
   SourcePositionTable* source_position_table =
       source_positions ? new (&zone) SourcePositionTable(&graph) : nullptr;
 
-  wasm::ModuleEnv env(nullptr, wasm::kNoTrapHandler,
-                      wasm::kRuntimeExceptionSupport);
+  wasm::CompilationEnv env(nullptr, wasm::kNoTrapHandler,
+                           wasm::kRuntimeExceptionSupport);
 
   WasmWrapperGraphBuilder builder(&zone, &env, &jsgraph, sig,
                                   source_position_table,
@@ -5144,7 +5144,7 @@ TurbofanWasmCompilationUnit::TurbofanWasmCompilationUnit(
 TurbofanWasmCompilationUnit::~TurbofanWasmCompilationUnit() = default;
 
 SourcePositionTable* TurbofanWasmCompilationUnit::BuildGraphForWasmFunction(
-    wasm::ModuleEnv* env, wasm::WasmFeatures* detected, double* decode_ms,
+    wasm::CompilationEnv* env, wasm::WasmFeatures* detected, double* decode_ms,
     MachineGraph* mcgraph, NodeOriginTable* node_origins) {
   base::ElapsedTimer decode_timer;
   if (FLAG_trace_wasm_decode_time) {
@@ -5207,7 +5207,7 @@ Vector<const char> GetDebugName(Zone* zone, int index) {
 }  // namespace
 
 void TurbofanWasmCompilationUnit::ExecuteCompilation(
-    wasm::ModuleEnv* env, wasm::WasmFeatures* detected) {
+    wasm::CompilationEnv* env, wasm::WasmFeatures* detected) {
   TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("v8.wasm"),
                "ExecuteTurbofanCompilation");
   double decode_ms = 0;

src/compiler/wasm-compiler.h

@@ -50,13 +50,14 @@ class TurbofanWasmCompilationUnit {
   explicit TurbofanWasmCompilationUnit(wasm::WasmCompilationUnit* wasm_unit);
   ~TurbofanWasmCompilationUnit();
 
-  SourcePositionTable* BuildGraphForWasmFunction(wasm::ModuleEnv* env,
+  SourcePositionTable* BuildGraphForWasmFunction(wasm::CompilationEnv* env,
                                                  wasm::WasmFeatures* detected,
                                                  double* decode_ms,
                                                  MachineGraph* mcgraph,
                                                  NodeOriginTable* node_origins);
 
-  void ExecuteCompilation(wasm::ModuleEnv* env, wasm::WasmFeatures* detected);
+  void ExecuteCompilation(wasm::CompilationEnv* env,
+                          wasm::WasmFeatures* detected);
 
  private:
   wasm::WasmCompilationUnit* const wasm_unit_;
@@ -137,7 +138,7 @@ class WasmGraphBuilder {
     kNoExtraCallableParam = false
   };
 
-  WasmGraphBuilder(wasm::ModuleEnv* env, Zone* zone, MachineGraph* mcgraph,
+  WasmGraphBuilder(wasm::CompilationEnv* env, Zone* zone, MachineGraph* mcgraph,
                    wasm::FunctionSig* sig,
                    compiler::SourcePositionTable* spt = nullptr);
 
@@ -338,7 +339,7 @@ class WasmGraphBuilder {
 
   Zone* const zone_;
   MachineGraph* const mcgraph_;
-  wasm::ModuleEnv* const env_;
+  wasm::CompilationEnv* const env_;
 
   Node** control_ = nullptr;
   Node** effect_ = nullptr;

src/wasm/baseline/liftoff-compiler.cc

@@ -147,8 +147,8 @@ class LiftoffCompiler {
     }
   };
 
-  LiftoffCompiler(compiler::CallDescriptor* call_descriptor, ModuleEnv* env,
-                  Zone* compilation_zone)
+  LiftoffCompiler(compiler::CallDescriptor* call_descriptor,
+                  CompilationEnv* env, Zone* compilation_zone)
       : descriptor_(
             GetLoweredCallDescriptor(compilation_zone, call_descriptor)),
         env_(env),
@@ -1836,7 +1836,7 @@ class LiftoffCompiler {
  private:
   LiftoffAssembler asm_;
   compiler::CallDescriptor* const descriptor_;
-  ModuleEnv* const env_;
+  CompilationEnv* const env_;
   bool ok_ = true;
   std::vector<OutOfLineCode> out_of_line_code_;
   SourcePositionTableBuilder source_position_table_builder_;
@@ -1872,7 +1872,7 @@ class LiftoffCompiler {
 
 }  // namespace
 
-bool LiftoffCompilationUnit::ExecuteCompilation(ModuleEnv* env,
+bool LiftoffCompilationUnit::ExecuteCompilation(CompilationEnv* env,
                                                 WasmFeatures* detected) {
   TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("v8.wasm"),
                "ExecuteLiftoffCompilation");

src/wasm/baseline/liftoff-compiler.h

@@ -11,7 +11,7 @@ namespace v8 {
 namespace internal {
 namespace wasm {
 
-struct ModuleEnv;
+struct CompilationEnv;
 class WasmCompilationUnit;
 struct WasmFeatures;
 
@@ -20,7 +20,7 @@ class LiftoffCompilationUnit final {
   explicit LiftoffCompilationUnit(WasmCompilationUnit* wasm_unit)
       : wasm_unit_(wasm_unit) {}
 
-  bool ExecuteCompilation(ModuleEnv*, WasmFeatures* detected);
+  bool ExecuteCompilation(CompilationEnv*, WasmFeatures* detected);
 
  private:
   WasmCompilationUnit* const wasm_unit_;

src/wasm/compilation-environment.h

@@ -31,10 +31,9 @@ enum UseTrapHandler : bool { kUseTrapHandler = true, kNoTrapHandler = false };
 
 enum LowerSimd : bool { kLowerSimd = true, kNoLowerSimd = false };
 
-// The {ModuleEnv} encapsulates the module data that is used during compilation.
-// ModuleEnvs are shareable across multiple compilations.
-// TODO(clemensh): Rename this struct to CompilationEnv.
-struct ModuleEnv {
+// The {CompilationEnv} encapsulates the module data that is used during
+// compilation. CompilationEnvs are shareable across multiple compilations.
+struct CompilationEnv {
   // A pointer to the decoded module's static representation.
   const WasmModule* const module;
 
@@ -57,9 +56,10 @@ struct ModuleEnv {
 
   const LowerSimd lower_simd;
 
-  constexpr ModuleEnv(const WasmModule* module, UseTrapHandler use_trap_handler,
-                      RuntimeExceptionSupport runtime_exception_support,
-                      LowerSimd lower_simd = kNoLowerSimd)
+  constexpr CompilationEnv(const WasmModule* module,
+                           UseTrapHandler use_trap_handler,
+                           RuntimeExceptionSupport runtime_exception_support,
+                           LowerSimd lower_simd = kNoLowerSimd)
       : module(module),
         use_trap_handler(use_trap_handler),
         runtime_exception_support(runtime_exception_support),

src/wasm/function-compiler.cc

@@ -63,7 +63,7 @@ WasmCompilationUnit::WasmCompilationUnit(WasmEngine* wasm_engine,
 // {TurbofanWasmCompilationUnit} can be opaque in the header file.
 WasmCompilationUnit::~WasmCompilationUnit() = default;
 
-void WasmCompilationUnit::ExecuteCompilation(ModuleEnv* env,
+void WasmCompilationUnit::ExecuteCompilation(CompilationEnv* env,
                                              WasmFeatures* detected) {
   const WasmModule* module = native_module_->module();
   auto size_histogram =
@@ -145,7 +145,7 @@ WasmCode* WasmCompilationUnit::CompileWasmFunction(
 
   WasmCompilationUnit unit(isolate->wasm_engine(), native_module, function_body,
                            function->func_index, isolate->counters(), mode);
-  ModuleEnv env = native_module->CreateModuleEnv();
+  CompilationEnv env = native_module->CreateCompilationEnv();
   unit.ExecuteCompilation(&env, detected);
   if (unit.failed()) {
     unit.ReportError(thrower);

src/wasm/function-compiler.h

@@ -42,7 +42,7 @@ class WasmCompilationUnit final {
 
   ~WasmCompilationUnit();
 
-  void ExecuteCompilation(ModuleEnv*, WasmFeatures* detected);
+  void ExecuteCompilation(CompilationEnv*, WasmFeatures* detected);
 
   NativeModule* native_module() const { return native_module_; }
   ExecutionTier mode() const { return mode_; }

src/wasm/module-compiler.cc

@@ -356,7 +356,7 @@ WasmCode* LazyCompileFunction(Isolate* isolate, NativeModule* native_module,
 
   WasmCompilationUnit unit(isolate->wasm_engine(), native_module, body,
                            func_index, isolate->counters());
-  ModuleEnv env = native_module->CreateModuleEnv();
+  CompilationEnv env = native_module->CreateCompilationEnv();
   unit.ExecuteCompilation(
       &env, native_module->compilation_state()->detected_features());
 
@@ -489,7 +489,7 @@ double MonotonicallyIncreasingTimeInMs() {
 // foreground and background threads). The no_finisher_callback is called
 // within the result_mutex_ lock when no finishing task is running, i.e. when
 // the finisher_is_running_ flag is not set.
-bool FetchAndExecuteCompilationUnit(ModuleEnv* env,
+bool FetchAndExecuteCompilationUnit(CompilationEnv* env,
                                     CompilationState* compilation_state,
                                     WasmFeatures* detected) {
   DisallowHeapAccess no_heap_access;
@@ -603,7 +603,7 @@ void CompileInParallel(Isolate* isolate, NativeModule* native_module,
   //      The foreground task bypasses waiting on memory threshold, because
   //      its results will immediately be converted to code (below).
   WasmFeatures detected_features;
-  ModuleEnv env = native_module->CreateModuleEnv();
+  CompilationEnv env = native_module->CreateCompilationEnv();
   while (FetchAndExecuteCompilationUnit(&env, compilation_state,
                                         &detected_features) &&
          !compilation_state->baseline_compilation_finished()) {
@@ -826,7 +826,7 @@ class BackgroundCompileTask : public CancelableTask {
     TRACE_COMPILE("(3b) Compiling...\n");
     // The number of currently running background tasks is reduced in
     // {OnBackgroundTaskStopped}.
-    ModuleEnv env = native_module_->CreateModuleEnv();
+    CompilationEnv env = native_module_->CreateCompilationEnv();
     auto* compilation_state = native_module_->compilation_state();
     while (!compilation_state->failed()) {
       if (!FetchAndExecuteCompilationUnit(&env, compilation_state,

src/wasm/module-compiler.h

@@ -29,12 +29,12 @@ class Vector;
 
 namespace wasm {
 
+struct CompilationEnv;
 class CompilationResultResolver;
 class ErrorThrower;
 class ModuleCompiler;
 class NativeModule;
 class WasmCode;
-struct ModuleEnv;
 struct WasmModule;
 
 MaybeHandle<WasmModuleObject> CompileToModuleObject(

src/wasm/module-decoder.h

@@ -19,7 +19,7 @@ class Counters;
 
 namespace wasm {
 
-struct ModuleEnv;
+struct CompilationEnv;
 
 inline bool IsValidSectionCode(uint8_t byte) {
   return kTypeSectionCode <= byte && byte <= kLastKnownModuleSection;

src/wasm/wasm-code-manager.cc

@@ -384,7 +384,7 @@ void NativeModule::LogWasmCodes(Isolate* isolate) {
   }
 }
 
-ModuleEnv NativeModule::CreateModuleEnv() const {
+CompilationEnv NativeModule::CreateCompilationEnv() const {
   return {module(), use_trap_handler_, kRuntimeExceptionSupport};
 }
 

src/wasm/wasm-code-manager.h

@@ -314,9 +314,9 @@ class V8_EXPORT_PRIVATE NativeModule final {
 
   CompilationState* compilation_state() { return compilation_state_.get(); }
 
-  // Create a {ModuleEnv} object for compilation. Only valid as long as this
-  // {NativeModule} is alive.
-  ModuleEnv CreateModuleEnv() const;
+  // Create a {CompilationEnv} object for compilation. Only valid as long as
+  // this {NativeModule} is alive.
+  CompilationEnv CreateCompilationEnv() const;
 
   uint32_t num_functions() const {
     return module_->num_declared_functions + module_->num_imported_functions;

src/wasm/wasm-objects.h

@@ -20,16 +20,16 @@
 namespace v8 {
 namespace internal {
 namespace wasm {
+struct CompilationEnv;
 class InterpretedFrame;
 struct InterpretedFrameDeleter;
 class NativeModule;
-struct ModuleEnv;
+class SignatureMap;
 class WasmCode;
+struct WasmFeatures;
+class WasmInterpreter;
 struct WasmModule;
-class SignatureMap;
 class WireBytesRef;
-class WasmInterpreter;
-struct WasmFeatures;
 }  // namespace wasm
 
 class BreakPoint;

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

@@ -187,7 +187,7 @@ uint32_t TestingModuleBuilder::AddBytes(Vector<const byte> bytes) {
   return bytes_offset;
 }
 
-ModuleEnv TestingModuleBuilder::CreateModuleEnv() {
+CompilationEnv TestingModuleBuilder::CreateCompilationEnv() {
   return {
       test_module_ptr_,
       trap_handler::IsTrapHandlerEnabled() ? kUseTrapHandler : kNoTrapHandler,
@@ -252,7 +252,7 @@ void TestBuildingGraphWithBuilder(compiler::WasmGraphBuilder* builder,
 }
 
 void TestBuildingGraph(Zone* zone, compiler::JSGraph* jsgraph,
-                       ModuleEnv* module, FunctionSig* sig,
+                       CompilationEnv* module, FunctionSig* sig,
                        compiler::SourcePositionTable* source_position_table,
                        const byte* start, const byte* end) {
   compiler::WasmGraphBuilder builder(module, zone, jsgraph, sig,
@@ -410,7 +410,7 @@ void WasmFunctionCompiler::Build(const byte* start, const byte* end) {
                                          ->native_module()
                                          ->wire_bytes();
 
-  ModuleEnv env = builder_->CreateModuleEnv();
+  CompilationEnv env = builder_->CreateCompilationEnv();
   ScopedVector<uint8_t> func_wire_bytes(function_->code.length());
   memcpy(func_wire_bytes.start(), wire_bytes.start() + function_->code.offset(),
          func_wire_bytes.length());

test/cctest/wasm/wasm-run-utils.h

@@ -208,7 +208,7 @@ class TestingModuleBuilder {
     native_module_->SetExecutable(true);
   }
 
-  ModuleEnv CreateModuleEnv();
+  CompilationEnv CreateCompilationEnv();
 
   ExecutionTier execution_tier() const { return execution_tier_; }
 
@@ -239,7 +239,7 @@ class TestingModuleBuilder {
 };
 
 void TestBuildingGraph(Zone* zone, compiler::JSGraph* jsgraph,
-                       ModuleEnv* module, FunctionSig* sig,
+                       CompilationEnv* module, FunctionSig* sig,
                        compiler::SourcePositionTable* source_position_table,
                        const byte* start, const byte* end);