Merge pull request #121 from kornilova-l/cleanups

Minor cleanups

Author: kornilova203

bindgen/TypeTranslator.h

@@ -15,7 +15,7 @@ class TypeTranslator {
      * @return the type translated or nullptr if type is function type.
      */
     std::shared_ptr<Type> translate(const clang::QualType &tpe,
-                                    const std::string * = nullptr);
+                                    const std::string *avoid = nullptr);
 
     std::string getTypeFromTypeMap(std::string cType);
 

bindgen/visitor/TreeVisitor.cpp

@@ -99,22 +99,20 @@ bool TreeVisitor::VisitRecordDecl(clang::RecordDecl *record) {
 }
 
 void TreeVisitor::handleUnion(clang::RecordDecl *record, std::string name) {
-    uint64_t maxSize = 0;
-
     std::vector<std::shared_ptr<Field>> fields;
 
     for (const clang::FieldDecl *field : record->fields()) {
-        uint64_t sizeInBits = astContext->getTypeSize(field->getType());
-        assert(sizeInBits % 8 == 0);
-        maxSize = std::max(maxSize, sizeInBits / 8);
         std::string fname = field->getNameAsString();
         std::shared_ptr<Type> ftype =
             typeTranslator.translate(field->getType(), &name);
 
         fields.push_back(std::make_shared<Field>(fname, ftype));
     }
 
-    ir.addUnion(name, std::move(fields), maxSize, getLocation(record));
+    uint64_t sizeInBits = astContext->getTypeSize(record->getTypeForDecl());
+    assert(sizeInBits % 8 == 0);
+
+    ir.addUnion(name, std::move(fields), sizeInBits / 8, getLocation(record));
 }
 
 void TreeVisitor::handleStruct(clang::RecordDecl *record, std::string name) {
@@ -127,7 +125,6 @@ void TreeVisitor::handleStruct(clang::RecordDecl *record, std::string name) {
         llvm::errs().flush();
     }
 
-    int fieldCnt = 0;
     std::vector<std::shared_ptr<Field>> fields;
 
     for (const clang::FieldDecl *field : record->fields()) {
@@ -137,8 +134,6 @@ void TreeVisitor::handleStruct(clang::RecordDecl *record, std::string name) {
             std::make_shared<Field>(field->getNameAsString(), ftype));
 
         cycleDetection.AddDependency(newName, field->getType());
-
-        fieldCnt++;
     }
 
     if (cycleDetection.isCyclic(newName)) {