transpile: move sorting top-level decls after their converted but before they're inserted

This should ensure that those two steps are properly separated.

Author: kkysen

c2rust-transpile/src/translator/mod.rs

@@ -494,10 +494,6 @@ pub fn translate(
     {
         t.use_crate(ExternCrate::Libc);
 
-        // Sort the top-level declarations by file and source location so that we
-        // preserve the ordering of all declarations in each file.
-        t.ast_context.sort_top_decls();
-
         t.locate_comments();
 
         // Headers often pull in declarations that are unused;
@@ -741,6 +737,10 @@ pub fn translate(
             })
             .collect::<HashMap<_, _>>();
 
+        // Sort the top-level declarations by file and source location so that we
+        // preserve the ordering of all declarations in each file.
+        t.ast_context.sort_top_decls();
+
         for top_id in &t.ast_context.c_decls_top {
             let decl = t.ast_context.get_decl(top_id).unwrap();
             let decl_file_id = t.ast_context.file_id(decl);