[lld][WebAssembly] Common superclass for input globals/events/tables

This commit regroups commonalities among InputGlobal, InputEvent, and
InputTable into the new InputElement.  The subclasses are defined
inline in the new InputElement.h.  NFC.

Reviewed By: sbc100

Differential Revision: https://reviews.llvm.org/D94677

Author: wingo

lld/include/lld/Common/LLVM.h

@@ -49,6 +49,7 @@ struct WasmEventType;
 struct WasmFunction;
 struct WasmGlobal;
 struct WasmGlobalType;
+struct WasmInitExpr;
 struct WasmLimits;
 struct WasmRelocation;
 struct WasmSignature;
@@ -91,6 +92,7 @@ using llvm::wasm::WasmEventType;
 using llvm::wasm::WasmFunction;
 using llvm::wasm::WasmGlobal;
 using llvm::wasm::WasmGlobalType;
+using llvm::wasm::WasmInitExpr;
 using llvm::wasm::WasmLimits;
 using llvm::wasm::WasmRelocation;
 using llvm::wasm::WasmSignature;

lld/wasm/Driver.cpp

@@ -9,8 +9,7 @@
 #include "lld/Common/Driver.h"
 #include "Config.h"
 #include "InputChunks.h"
-#include "InputGlobal.h"
-#include "InputTable.h"
+#include "InputElement.h"
 #include "MarkLive.h"
 #include "SymbolTable.h"
 #include "Writer.h"

lld/wasm/InputElement.h

@@ -0,0 +1,101 @@
+//===- InputElement.h ----------------------------------------*- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLD_WASM_INPUT_ELEMENT_H
+#define LLD_WASM_INPUT_ELEMENT_H
+
+#include "Config.h"
+#include "InputFiles.h"
+#include "WriterUtils.h"
+#include "lld/Common/LLVM.h"
+#include "llvm/Object/Wasm.h"
+
+namespace lld {
+namespace wasm {
+
+// Represents a single element (Global, Event, Table, etc) within an input
+// file.
+class InputElement {
+protected:
+  InputElement(StringRef name, ObjFile *f)
+      : file(f), live(!config->gcSections), name(name) {}
+
+public:
+  StringRef getName() const { return name; }
+  uint32_t getAssignedIndex() const { return assignedIndex.getValue(); }
+  bool hasAssignedIndex() const { return assignedIndex.hasValue(); }
+  void assignIndex(uint32_t index) {
+    assert(!hasAssignedIndex());
+    assignedIndex = index;
+  }
+
+  ObjFile *file;
+  bool live = false;
+
+protected:
+  StringRef name;
+  llvm::Optional<uint32_t> assignedIndex;
+};
+
+class InputGlobal : public InputElement {
+public:
+  InputGlobal(const WasmGlobal &g, ObjFile *f)
+      : InputElement(g.SymbolName, f), type(g.Type), initExpr(g.InitExpr) {}
+
+  const WasmGlobalType &getType() const { return type; }
+  const WasmInitExpr &getInitExpr() const { return initExpr; }
+
+  void setPointerValue(uint64_t value) {
+    if (config->is64.getValueOr(false)) {
+      assert(initExpr.Opcode == llvm::wasm::WASM_OPCODE_I64_CONST);
+      initExpr.Value.Int64 = value;
+    } else {
+      assert(initExpr.Opcode == llvm::wasm::WASM_OPCODE_I32_CONST);
+      initExpr.Value.Int32 = value;
+    }
+  }
+
+private:
+  WasmGlobalType type;
+  WasmInitExpr initExpr;
+};
+
+class InputEvent : public InputElement {
+public:
+  InputEvent(const WasmSignature &s, const WasmEvent &e, ObjFile *f)
+      : InputElement(e.SymbolName, f), signature(s), type(e.Type) {}
+
+  const WasmEventType &getType() const { return type; }
+
+  const WasmSignature &signature;
+
+private:
+  WasmEventType type;
+};
+
+class InputTable : public InputElement {
+public:
+  InputTable(const WasmTable &t, ObjFile *f)
+      : InputElement(t.SymbolName, f), type(t.Type) {}
+
+  const WasmTableType &getType() const { return type; }
+  void setLimits(const WasmLimits &limits) { type.Limits = limits; }
+
+private:
+  WasmTableType type;
+};
+
+} // namespace wasm
+
+inline std::string toString(const wasm::InputElement *d) {
+  return (toString(d->file) + ":(" + d->getName() + ")").str();
+}
+
+} // namespace lld
+
+#endif // LLD_WASM_INPUT_ELEMENT_H

lld/wasm/InputEvent.h

@@ -9,9 +9,7 @@
 #include "InputFiles.h"
 #include "Config.h"
 #include "InputChunks.h"
-#include "InputEvent.h"
-#include "InputGlobal.h"
-#include "InputTable.h"
+#include "InputElement.h"
 #include "OutputSegment.h"
 #include "SymbolTable.h"
 #include "lld/Common/ErrorHandler.h"

lld/wasm/InputFiles.cpp

@@ -19,8 +19,8 @@
 //===----------------------------------------------------------------------===//
 
 #include "MapFile.h"
+#include "InputElement.h"
 #include "InputFiles.h"
-#include "InputGlobal.h"
 #include "OutputSections.h"
 #include "OutputSegment.h"
 #include "SymbolTable.h"
@@ -148,7 +148,7 @@ void lld::wasm::writeMapFile(ArrayRef<OutputSection *> outputSections) {
       }
     } else if (auto *globals = dyn_cast<GlobalSection>(osec)) {
       for (auto *global : globals->inputGlobals) {
-        writeHeader(os, global->getGlobalIndex(), 0, 0);
+        writeHeader(os, global->getAssignedIndex(), 0, 0);
         os.indent(8) << global->getName() << '\n';
       }
     }

lld/wasm/InputGlobal.h

@@ -21,9 +21,7 @@
 #include "MarkLive.h"
 #include "Config.h"
 #include "InputChunks.h"
-#include "InputEvent.h"
-#include "InputGlobal.h"
-#include "InputTable.h"
+#include "InputElement.h"
 #include "SymbolTable.h"
 #include "Symbols.h"
 

lld/wasm/InputTable.h

@@ -9,9 +9,7 @@
 #include "SymbolTable.h"
 #include "Config.h"
 #include "InputChunks.h"
-#include "InputEvent.h"
-#include "InputGlobal.h"
-#include "InputTable.h"
+#include "InputElement.h"
 #include "WriterUtils.h"
 #include "lld/Common/ErrorHandler.h"
 #include "lld/Common/Memory.h"