transpile: sort top-level decls for converting w/ macros coming last

Author: kkysen

c2rust-transpile/src/c_ast/mod.rs

@@ -1013,6 +1013,21 @@ impl TypedAstContext {
         }
     }
 
+    /// Sort the top-level declarations with macros coming last.
+    /// This is needed during conversion so that when recreating macros,
+    /// we can look up the [`Translation::expr_override_tys`],
+    /// which are set when the macro expansion expressions are converted.
+    pub fn sort_top_decls_for_converting(&mut self) {
+        self.c_decls_top.sort_unstable_by_key(|decl_id| {
+            let reverse_order = match self.c_decls.get(decl_id).unwrap().kind {
+                CDeclKind::MacroFunction { .. } => 0,
+                CDeclKind::MacroObject { .. } => 1,
+                _ => 2,
+            };
+            -reverse_order
+        });
+    }
+
     /// Sort the top-level declarations by file and source location
     /// so that we preserve the ordering of all declarations in each file.
     /// This preserves the order when we emit the converted declarations.

c2rust-transpile/src/translator/mod.rs

@@ -689,6 +689,8 @@ pub fn translate(
             }
         }
 
+        t.ast_context.sort_top_decls_for_converting();
+
         // Export top-level value declarations.
         // We do this in a conversion pass and then an insertion pass
         // so that the conversion order can differ from the order they're emitted in.