Merge pull request #571 from rustcoreutils/updates

CC cleanups

Author: jgarzik

bugs.md

@@ -34,6 +34,8 @@ Key source files:
 | `parse/parser.rs` | Recursive descent parser producing AST |
 | `parse/ast.rs` | AST node definitions |
 | `types.rs` | C type system |
+| `strings.rs` | String interning (StringId), pre-interns keywords at startup |
+| `kw.rs` | Pre-interned keyword constants and tag-based classification |
 | `symbol.rs` | Symbol table with scope management |
 | `ir/linearize.rs` | AST → IR conversion, SSA construction |
 | `ir/mod.rs` | Intermediate representation definitions |

cc/README.md

@@ -1019,7 +1019,8 @@ impl RegAlloc {
 
                             // Stack slot reuse uses block-level interference checks
                             // (live_in/live_out from dataflow fixpoint) which are correct
-                            // for all CFG shapes. Addr-taken syms need stable addresses.
+                            // for all CFG shapes. Addr-taken syms need stable addresses
+                            // because symaddr-derived pointers may escape to callees.
                             let reusable = !self.addr_taken_syms.contains(&interval.pseudo);
 
                             self.alloc_stack_slot(&interval, aligned_size, alignment, reusable);

cc/arch/aarch64/regalloc.rs

@@ -1838,7 +1838,7 @@ mod tests {
     fn test_run_mapping_empty() {
         let target = Target::new(Arch::X86_64, Os::Linux);
         let types = TypeTable::new(&target);
-        let mut module = Module::new();
+        let mut module = Module::default();
 
         run_mapping(&mut module, &types, &target);
     }
@@ -1848,7 +1848,7 @@ mod tests {
         let target = Target::new(Arch::X86_64, Os::Linux);
         let types = TypeTable::new(&target);
 
-        let mut module = Module::new();
+        let mut module = Module::default();
         module.add_function(make_test_func(&types));
         module.add_function(make_test_func(&types));
 
@@ -1860,7 +1860,7 @@ mod tests {
         let target = Target::new(Arch::X86_64, Os::Linux);
         let types = TypeTable::new(&target);
 
-        let mut module = Module::new();
+        let mut module = Module::default();
         module.add_function(make_test_func(&types));
 
         run_mapping(&mut module, &types, &target);
@@ -1879,7 +1879,7 @@ mod tests {
 
         for target in &targets {
             let types = TypeTable::new(target);
-            let mut module = Module::new();
+            let mut module = Module::default();
             module.add_function(make_test_func(&types));
             run_mapping(&mut module, &types, target);
         }
@@ -1890,7 +1890,7 @@ mod tests {
         let target = Target::new(Arch::X86_64, Os::Linux);
         let types = TypeTable::new(&target);
 
-        let mut module = Module::new();
+        let mut module = Module::default();
         module.add_function(make_test_func(&types));
         let orig_insn_count = module.functions[0].blocks[0].insns.len();
 
@@ -1905,7 +1905,7 @@ mod tests {
         let target = Target::new(Arch::Aarch64, Os::Linux);
         let types = TypeTable::new(&target);
 
-        let mut module = Module::new();
+        let mut module = Module::default();
         module.add_function(make_test_func(&types));
         let orig_insn_count = module.functions[0].blocks[0].insns.len();
 
@@ -1943,7 +1943,7 @@ mod tests {
         func.add_block(bb);
         func.entry = BasicBlockId(0);
 
-        let mut module = Module::new();
+        let mut module = Module::default();
         module.add_function(func);
         run_mapping(&mut module, &types, &target);
 
@@ -1984,7 +1984,7 @@ mod tests {
         func.add_block(bb);
         func.entry = BasicBlockId(0);
 
-        let mut module = Module::new();
+        let mut module = Module::default();
         module.add_function(func);
         run_mapping(&mut module, &types, &target);
 

cc/arch/mapping.rs

@@ -1052,7 +1052,8 @@ impl RegAlloc {
 
                             // Stack slot reuse uses block-level interference checks
                             // (live_in/live_out from dataflow fixpoint) which are correct
-                            // for all CFG shapes. Addr-taken syms need stable addresses.
+                            // for all CFG shapes. Addr-taken syms need stable addresses
+                            // because symaddr-derived pointers may escape to callees.
                             let reusable = !self.addr_taken_syms.contains(&interval.pseudo);
 
                             self.alloc_stack_slot(&interval, aligned_size, alignment, reusable);

cc/arch/x86_64/regalloc.rs

@@ -77,20 +77,14 @@ struct SymbolRef {
 }
 
 /// Information about a symbol across files
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Default)]
 struct SymbolInfo {
     /// References organized by file, then by function scope
     /// Map: file -> Map: function (or empty for global) -> refs
     refs: BTreeMap<String, BTreeMap<String, BTreeSet<SymbolRef>>>,
 }
 
 impl SymbolInfo {
-    fn new() -> Self {
-        Self {
-            refs: BTreeMap::new(),
-        }
-    }
-
     fn add_ref(&mut self, file: &str, function: &str, line: u32, is_definition: bool) {
         self.refs
             .entry(file.to_string())
@@ -105,6 +99,7 @@ impl SymbolInfo {
 }
 
 /// Cross-reference table
+#[derive(Default)]
 struct CrossRef {
     /// All symbols: name -> info
     symbols: BTreeMap<String, SymbolInfo>,
@@ -115,14 +110,6 @@ struct CrossRef {
 }
 
 impl CrossRef {
-    fn new() -> Self {
-        Self {
-            symbols: BTreeMap::new(),
-            current_file: String::new(),
-            current_function: String::new(),
-        }
-    }
-
     fn set_file(&mut self, file: &str) {
         self.current_file = file.to_string();
     }
@@ -132,17 +119,21 @@ impl CrossRef {
     }
 
     fn add_definition(&mut self, name: &str, line: u32) {
-        self.symbols
-            .entry(name.to_string())
-            .or_insert_with(SymbolInfo::new)
-            .add_ref(&self.current_file, &self.current_function, line, true);
+        self.symbols.entry(name.to_string()).or_default().add_ref(
+            &self.current_file,
+            &self.current_function,
+            line,
+            true,
+        );
     }
 
     fn add_reference(&mut self, name: &str, line: u32) {
-        self.symbols
-            .entry(name.to_string())
-            .or_insert_with(SymbolInfo::new)
-            .add_ref(&self.current_file, &self.current_function, line, false);
+        self.symbols.entry(name.to_string()).or_default().add_ref(
+            &self.current_file,
+            &self.current_function,
+            line,
+            false,
+        );
     }
 }
 
@@ -561,7 +552,7 @@ fn main() -> ExitCode {
     }
 
     // Build cross-reference
-    let mut xref = CrossRef::new();
+    let mut xref = CrossRef::default();
     let mut streams = StreamTable::new();
 
     for file in &args.files {
@@ -586,7 +577,7 @@ fn main() -> ExitCode {
                 // In non-combined mode, print and reset after each file
                 if !args.combined {
                     print_xref(&xref, args.width, args.silent, &mut *output_file);
-                    xref = CrossRef::new();
+                    xref = CrossRef::default();
                 }
             }
             _ => {