Fix equality check for Struct and Union

Author: kornilova203

bindgen/ir/Struct.cpp

@@ -21,28 +21,6 @@ StructOrUnion::StructOrUnion(std::string name,
 
 std::string StructOrUnion::getName() const { return name; }
 
-bool StructOrUnion::equals(const StructOrUnion &other) const {
-    if (this == &other) {
-        return true;
-    }
-    if (isInstanceOf<const Struct>(&other)) {
-        auto *s = dynamic_cast<const Struct *>(&other);
-        if (name != s->name) {
-            return false;
-        }
-        if (fields.size() != s->fields.size()) {
-            return false;
-        }
-        for (size_t i = 0; i < fields.size(); i++) {
-            if (*fields[i] != *s->fields[i]) {
-                return false;
-            }
-        }
-        return true;
-    }
-    return false;
-}
-
 std::shared_ptr<Location> StructOrUnion::getLocation() const {
     return location;
 }
@@ -142,17 +120,21 @@ bool Struct::usesType(const std::shared_ptr<Type> &type,
                       bool stopOnTypeDefs) const {
     for (const auto &field : fields) {
         if (*field->getType() == *type ||
-            field->getType().get()->usesType(type, stopOnTypeDefs)) {
+            field->getType()->usesType(type, stopOnTypeDefs)) {
             return true;
         }
     }
     return false;
 }
 
 bool Struct::operator==(const Type &other) const {
+    if (this == &other) {
+        return true;
+    }
     auto *s = dynamic_cast<const Struct *>(&other);
     if (s) {
-        return this->equals(*s);
+        /* structs have unique names */
+        return name == s->name;
     }
     return false;
 }
@@ -290,9 +272,13 @@ std::string Union::generateHelperClass() const {
 std::string Union::getTypeAlias() const { return "union_" + name; }
 
 bool Union::operator==(const Type &other) const {
+    if (this == &other) {
+        return true;
+    }
     auto *u = dynamic_cast<const Union *>(&other);
     if (u) {
-        return this->equals(*u);
+        /* unions have unique names */
+        return name == u->name;
     }
     return false;
 }

bindgen/ir/Struct.h

@@ -35,8 +35,6 @@ class StructOrUnion {
 
     std::string getName() const;
 
-    bool equals(const StructOrUnion &other) const;
-
     std::shared_ptr<Location> getLocation() const;
 
     virtual std::string getTypeAlias() const = 0;