simplify getter/setter names

Author: tlively

src/ir/type-updating.cpp

@@ -90,7 +90,7 @@ GlobalTypeRewriter::TypeMap GlobalTypeRewriter::rebuildTypes(
   i = 0;
   for (auto [type, _] : typeIndices) {
     typeBuilder[i].setOpen(type.isOpen());
-    typeBuilder[i].setShareability(type.getShareability());
+    typeBuilder[i].setShared(type.getShared());
     if (type.isSignature()) {
       auto sig = type.getSignature();
       TypeList newParams, newResults;

src/parser/contexts.h

@@ -1105,7 +1105,7 @@ struct ParseTypeDefsCtx : TypeParserCtx<ParseTypeDefsCtx> {
 
   void setOpen() { builder[index].setOpen(); }
 
-  void setShared() { builder[index].setShareability(Shared); }
+  void setShared() { builder[index].setShared(); }
 
   Result<> addSubtype(HeapTypeT super) {
     builder[index].subTypeOf(super);

src/wasm-type.h

@@ -381,9 +381,9 @@ class HeapType {
   bool isString() const;
   bool isBottom() const;
   bool isOpen() const;
-  bool isShared() const { return getShareability() == Shared; }
+  bool isShared() const { return getShared() == Shared; }
 
-  Shareability getShareability() const;
+  Shareability getShared() const;
 
   Signature getSignature() const;
   Continuation getContinuation() const;
@@ -407,13 +407,13 @@ class HeapType {
   // Get the bottom heap type for this heap type's hierarchy.
   BasicHeapType getUnsharedBottom() const;
   BasicHeapType getBottom() const {
-    return HeapType(getUnsharedBottom()).getBasic(getShareability());
+    return HeapType(getUnsharedBottom()).getBasic(getShared());
   }
 
   // Get the top heap type for this heap type's hierarchy.
   BasicHeapType getUnsharedTop() const;
   BasicHeapType getTop() const {
-    return HeapType(getUnsharedTop()).getBasic(getShareability());
+    return HeapType(getUnsharedTop()).getBasic(getShared());
   }
 
   // Get the recursion group for this non-basic type.
@@ -658,7 +658,7 @@ struct TypeBuilder {
   void createRecGroup(size_t i, size_t length);
 
   void setOpen(size_t i, bool open = true);
-  void setShareability(size_t i, Shareability share);
+  void setShared(size_t i, Shareability share = Shared);
 
   enum class ErrorReason {
     // There is a cycle in the supertype relation.
@@ -731,8 +731,8 @@ struct TypeBuilder {
       builder.setOpen(index, open);
       return *this;
     }
-    Entry& setShareability(Shareability share) {
-      builder.setShareability(index, share);
+    Entry& setShared(Shareability share = Unshared) {
+      builder.setShared(index, share);
       return *this;
     }
   };

src/wasm/literal.cpp

@@ -2689,7 +2689,7 @@ Literal Literal::externalize() const {
     return Literal(std::shared_ptr<GCData>{}, HeapType::noext);
   }
   auto heapType = type.getHeapType();
-  auto extType = HeapTypes::ext.getBasic(heapType.getShareability());
+  auto extType = HeapTypes::ext.getBasic(heapType.getShared());
   if (heapType.isBasic()) {
     switch (heapType.getBasic(Unshared)) {
       case HeapType::i31: {

src/wasm/wasm-binary.cpp

@@ -2403,7 +2403,7 @@ void WasmBinaryReader::readTypes() {
       form = getS32LEB();
     }
     if (form == BinaryConsts::Shared) {
-      builder[i].setShareability(Shared);
+      builder[i].setShared();
       form = getS32LEB();
     }
     if (form == BinaryConsts::EncodedType::Func) {

src/wasm/wasm-type.cpp

@@ -515,7 +515,7 @@ std::optional<HeapType> getBasicHeapTypeLUB(HeapType::BasicHeapType a,
       // Bottom types already handled.
       WASM_UNREACHABLE("unexpected basic type");
   }
-  auto share = HeapType(a).getShareability();
+  auto share = HeapType(a).getShared();
   return {lubUnshared.getBasic(share)};
 }
 
@@ -1270,7 +1270,7 @@ bool HeapType::isOpen() const {
   }
 }
 
-Shareability HeapType::getShareability() const {
+Shareability HeapType::getShared() const {
   if (isBasic()) {
     return (id & 1) != 0 ? Shared : Unshared;
   } else {
@@ -1315,7 +1315,7 @@ std::optional<HeapType> HeapType::getSuperType() const {
     return ret;
   }
 
-  auto share = getShareability();
+  auto share = getShared();
 
   // There may be a basic supertype.
   if (isBasic()) {
@@ -2597,7 +2597,7 @@ void TypeBuilder::setOpen(size_t i, bool open) {
   impl->entries[i].info->isOpen = open;
 }
 
-void TypeBuilder::setShareability(size_t i, Shareability share) {
+void TypeBuilder::setShared(size_t i, Shareability share) {
   assert(i < size() && "index out of bounds");
   impl->entries[i].info->share = share;
 }

test/gtest/type-builder.cpp

@@ -277,8 +277,8 @@ TEST_F(TypeTest, InvalidSharedSupertype) {
   TypeBuilder builder(2);
   builder[0] = Struct{};
   builder[1] = Struct{};
-  builder[0].setShareability(Shared);
-  builder[1].setShareability(Shared);
+  builder[0].setShared();
+  builder[1].setShared();
   builder[1].subTypeOf(builder[0]);
 
   auto result = builder.build();
@@ -294,8 +294,8 @@ TEST_F(TypeTest, InvalidUnsharedSupertype) {
   TypeBuilder builder(2);
   builder[0] = Struct{};
   builder[1] = Struct{};
-  builder[0].setShareability(Unshared);
-  builder[1].setShareability(Shared);
+  builder[0].setShared(Unshared);
+  builder[1].setShared(Shared);
   builder[1].subTypeOf(builder[0]);
 
   auto result = builder.build();
@@ -583,8 +583,8 @@ TEST_F(TypeTest, TestHeapTypeRelations) {
     TypeBuilder builder(2);
     builder[0] = Struct{};
     builder[1] = Signature();
-    builder[0].setShareability(Shared);
-    builder[1].setShareability(Shared);
+    builder[0].setShared();
+    builder[1].setShared();
     auto results = builder.build();
     ASSERT_TRUE(results);
     auto built = *results;