Keep original label names from C code

c2rust-transpile/src/c_ast/conversion.rs

@@ -3,6 +3,7 @@ use c2rust_ast_exporter::clang_ast::*;
 use failure::err_msg;
 use serde_bytes::ByteBuf;
 use std::collections::HashMap;
+use std::rc::Rc;
 use std::vec::Vec;
 
 use super::Located;
@@ -1018,6 +1019,18 @@ impl ConversionContext {
                     let substmt_old = node.children[0].expect("Label sub-statement not found");
                     let substmt = self.visit_stmt(substmt_old);
 
+                    let label_name = from_value::<Rc<str>>(node.extras[0].clone())
+                        .expect("unnamed label in C source code");
+                    match self.typed_context.label_names.insert(CStmtId(new_id), label_name.clone()) {
+                        Some(old_label_name) => {
+                            panic!(
+                                "Duplicate label name with id {}. Old name: {}. New name: {}",
+                                new_id, old_label_name, label_name,
+                            );
+                        }
+                        None => {}
+                    }
+
                     let label_stmt = CStmtKind::Label(substmt);
 
                     self.add_stmt(new_id, located(node, label_stmt));
@@ -2127,10 +2140,7 @@ impl ConversionContext {
                     } else {
                         None
                     };
-                    let static_assert = CDeclKind::StaticAssert {
-                        assert_expr,
-                        message,
-                    };
+                    let static_assert = CDeclKind::StaticAssert { assert_expr, message };
                     self.add_decl(new_id, located(node, static_assert));
                 }
 

c2rust-transpile/src/c_ast/mod.rs

@@ -7,6 +7,7 @@ use std::fmt::{self, Debug, Display};
 use std::mem;
 use std::ops::Index;
 use std::path::{Path, PathBuf};
+use std::rc::Rc;
 
 pub use c2rust_ast_exporter::clang_ast::{BuiltinVaListKind, SrcFile, SrcLoc, SrcSpan};
 
@@ -66,6 +67,9 @@ pub struct TypedAstContext {
     // that location.
     include_map: Vec<Vec<SrcLoc>>,
 
+    // Names of the labels defined in the C source code.
+    pub label_names: IndexMap<CLabelId, Rc<str>>,
+
     // map expressions to the stack of macros they were expanded from
     pub macro_invocations: HashMap<CExprId, Vec<CDeclId>>,
 
@@ -178,6 +182,7 @@ impl TypedAstContext {
             macro_invocations: HashMap::new(),
             macro_expansions: HashMap::new(),
             macro_expansion_text: HashMap::new(),
+            label_names: Default::default(),
 
             comments: vec![],
             prenamed_decls: IndexMap::new(),

c2rust-transpile/src/cfg/loops.rs

@@ -54,7 +54,7 @@ pub fn match_loop_body(
             desired_body.swap_remove(&following);
 
             follow_entries.swap_remove(&following);
-            follow_entries.extend(&bb.successors());
+            follow_entries.extend(bb.successors());
             follow_entries.retain(|e| !body_blocks.contains_key(e));
             body_blocks.insert(following, bb);
         }
@@ -88,7 +88,7 @@ pub fn heuristic_loop_body(
 ) -> () {
     if follow_entries.len() > 1 {
         for follow_entry in follow_entries.clone().iter() {
-            let mut following: Label = *follow_entry;
+            let mut following: Label = follow_entry.clone();
 
             loop {
                 // If this block might have come from 2 places, give up
@@ -104,16 +104,16 @@ pub fn heuristic_loop_body(
                 };
                 let succs = bb.successors();
 
-                body_blocks.insert(following, bb);
+                body_blocks.insert(following.clone(), bb);
                 follow_entries.swap_remove(&following);
-                follow_entries.extend(&succs);
+                follow_entries.extend(succs.clone());
 
                 // If it has more than one successor, don't try following the successor
                 if succs.len() != 1 {
                     break;
                 }
 
-                following = *succs.iter().next().unwrap();
+                following = succs.iter().next().unwrap().clone();
             }
         }
     }