FunctionDepsFinder: Check for declarations inside another declaration

libcextract/FunctionDepsFinder.cpp

@@ -623,6 +623,34 @@ void FunctionDependencyFinder::Remove_Redundant_Decls(void) {
             }
           }
         }
+
+        /*
+         * Check if there wasn't any symbol that is being defined in the same
+         * interval and remove it. Otherwise we might clash the types.
+         *
+         * One example of how this can happen is then we have something like
+         *
+         * typedef struct {
+         * ...
+         * } x, y;
+         *
+         * In the process of creating the closure we might reach the following
+         * situation:
+         *
+         * typdef struct {
+         * ...
+         * } x;
+         *
+         * typedef struct {
+         *
+         * } x, y;
+         *
+         * Which then breaks the one-definition-rule. In such cases, remove the
+         * previous declaration in the same code range, since the later will
+         * contain both definitions either way.
+         */
+        if (Decl *range_decl = Closure.insideRangeOfDecl(decl))
+          Closure.Remove_Decl(range_decl);
       }
     }
     /* Handle the case where an enum is declared as:

libcextract/FunctionDepsFinder.hh

@@ -43,6 +43,31 @@ class ClosureSet
     Dependencies.insert(decl);
   }
 
+  /*
+   * Check if the same Decl was already added into the closure but for a
+   * different typename.
+   */
+  Decl *insideRangeOfDecl(Decl *decl)
+  {
+    SourceRange range = decl->getSourceRange();
+
+    /* FIXME: optimize this loop */
+    for (auto it = Dependencies.begin(); it != Dependencies.end(); ++it) {
+      if (TypedefDecl *cur_decl = dyn_cast<TypedefDecl>(*it)) {
+        SourceRange cur_range = cur_decl->getSourceRange();
+
+        // Avoid comparing to itself
+        if (cur_range == range)
+          continue;
+
+        if (PrettyPrint::Contains_From_LineCol(range, cur_range))
+          return cur_decl;
+      }
+    }
+
+    return nullptr;
+  }
+
   inline std::unordered_set<Decl *> &Get_Set(void)
   {
     return Dependencies;

testsuite/linux/typedef-1.c

@@ -0,0 +1,19 @@
+/* { dg-options "-DCE_EXTRACT_FUNCTIONS=f" } */
+
+typedef struct {
+	int id;
+	int val;
+} st1, st2;
+
+int f(void)
+{
+	st1 s1;
+	st2 s2;
+
+	s1.id = 10;
+	s2.val = 5;
+}
+/* { dg-final { scan-tree-dump "int f\(void\)" } } */
+/* { dg-final { scan-tree-dump "} st1, st2;" } } */
+/* { dg-final { scan-tree-dump-not "} st1;" } } */
+/* { dg-final { scan-tree-dump-not "} st2;" } } */