RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-22 10:42:39 +01:00
Code Issues Projects Releases Wiki Activity

Reland: "[WebAssembly] Deduplicate imports of the same module name, field name, and type"

Browse Source 
When two symbols import the same thing, only one import should be
emitted in the Wasm file.

Fixes https://bugs.llvm.org/show_bug.cgi?id=50938

Reverted in: 16aac493e59519377071e900d119ba2e7e5b525d.

Reviewed By: sbc100

Differential Revision: https://reviews.llvm.org/D105519
This commit is contained in:
Nick Fitzgerald 2021-07-22 14:12:50 -07:00 committed by Sam Clegg
parent a7e679b2fb
commit f7deab5277
2 changed files with 53 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/llvm/BinaryFormat/Wasm.h
View File

@ -429,6 +429,16 @@ inline bool operator!=(const WasmGlobalType &LHS, const WasmGlobalType &RHS) {
return !(LHS == RHS); return !(LHS == RHS);
} }
inline bool operator==(const WasmLimits &LHS, const WasmLimits &RHS) {
return LHS.Flags == RHS.Flags && LHS.Minimum == RHS.Minimum &&
(LHS.Flags & WASM_LIMITS_FLAG_HAS_MAX ? LHS.Maximum == RHS.Maximum
: true);
}
inline bool operator==(const WasmTableType &LHS, const WasmTableType &RHS) {
return LHS.ElemType == RHS.ElemType && LHS.Limits == RHS.Limits;
}
std::string toString(WasmSymbolType type); std::string toString(WasmSymbolType type);
std::string relocTypetoString(uint32_t type); std::string relocTypetoString(uint32_t type);
bool relocTypeHasAddend(uint32_t type); bool relocTypeHasAddend(uint32_t type);

43
include/llvm/BinaryFormat/WasmTraits.h
View File

@ -63,6 +63,49 @@ template <> struct DenseMapInfo<wasm::WasmGlobalType> {
} }
}; };
// Traits for using WasmLimits in a DenseMap
template <> struct DenseMapInfo<wasm::WasmLimits> {
static wasm::WasmLimits getEmptyKey() {
return wasm::WasmLimits{0xff, 0xff, 0xff};
}
static wasm::WasmLimits getTombstoneKey() {
return wasm::WasmLimits{0xee, 0xee, 0xee};
}
static unsigned getHashValue(const wasm::WasmLimits &Limits) {
unsigned Hash = hash_value(Limits.Flags);
Hash = hash_combine(Hash, Limits.Minimum);
if (Limits.Flags & llvm::wasm::WASM_LIMITS_FLAG_HAS_MAX) {
Hash = hash_combine(Hash, Limits.Maximum);
}
return Hash;
}
static bool isEqual(const wasm::WasmLimits &LHS,
const wasm::WasmLimits &RHS) {
return LHS == RHS;
}
};
// Traits for using WasmTableType in a DenseMap
template <> struct DenseMapInfo<wasm::WasmTableType> {
static wasm::WasmTableType getEmptyKey() {
return wasm::WasmTableType{0,
DenseMapInfo<wasm::WasmLimits>::getEmptyKey()};
}
static wasm::WasmTableType getTombstoneKey() {
return wasm::WasmTableType{
1, DenseMapInfo<wasm::WasmLimits>::getTombstoneKey()};
}
static unsigned getHashValue(const wasm::WasmTableType &TableType) {
return hash_combine(
TableType.ElemType,
DenseMapInfo<wasm::WasmLimits>::getHashValue(TableType.Limits));
}
static bool isEqual(const wasm::WasmTableType &LHS,
const wasm::WasmTableType &RHS) {
return LHS == RHS;
}
};
} // end namespace llvm } // end namespace llvm
#endif // LLVM_BINARYFORMAT_WASMTRAITS_H #endif // LLVM_BINARYFORMAT_WASMTRAITS_H