Merge pull request #45 from A-Mavericks/main

Author: genedna

collector/src/mir_analyze/mir/mir.lalrpop

@@ -187,10 +187,6 @@ pub fn dfc(mir_file: &MIRs) -> i32 {
     let depths_count = depths.len();
     let depths_sum: usize = depths.values().sum();
 
-    if funcname_call_count == 0 {
-        return 0;
-    }
-
     let result = funcname_call_count - depths_count + depths_sum / funcname_call_count;
     // println!("Result: {}", result);
     result as i32

collector/src/mir_analyze/mir/oop_pattern.rs

@@ -1,4 +1,8 @@
-use super::{mir::LocalID, mir::ModuledIdentifier, ty::Ty};
+use super::{
+    mir::{LocalID, ModuledIdentifier},
+    operand::Operand,
+    ty::Ty,
+};
 use std::str::FromStr;
 
 #[derive(Debug)]

collector/src/mir_analyze/mir/place.rs

@@ -214,6 +214,138 @@ pub const TEST_FILES: [TestFile; 46] = [
     },
 ];
 
+pub const TEST_RUSTC: [TestFile; 28] = [
+    TestFile {
+        name: "encoding",
+        path: "test/rustperf/encoding.mir",
+    },
+    TestFile {
+        name: "rayon",
+        path: "test/rustperf/rayon.mir",
+    },
+    TestFile {
+        name: "unicode",
+        path: "test/rustperf/unicode.mir",
+    },
+    /*TestFile {
+        name: "tuple_stress",
+        path: "test/rustperf/tuple_stress.mir",
+    },*/
+    TestFile {
+        name: "piston_image",
+        path: "test/rustperf/piston_image.mir",
+    },
+    /*TestFile {
+        name: "cranelift",
+        path: "test/rustperf/cranelift.mir",
+    },
+
+    TestFile {
+        name: "diesel",
+        path: "test/rustperf/diesel.mir",
+    },*/
+    TestFile {
+        name: "wg_grammer",
+        path: "test/rustperf/wg_grammer.mir",
+    },
+    TestFile {
+        name: "many_assoc",
+        path: "test/rustperf/many_assoc.mir",
+    },
+    TestFile {
+        name: "serde",
+        path: "test/rustperf/serde.mir",
+    },
+    TestFile {
+        name: "serde_drive",
+        path: "test/rustperf/serde_drive.mir",
+    },
+    /*TestFile {
+        name: "coercions",
+        path: "test/rustperf/coercions.mir",
+    },*/
+    TestFile {
+        name: "regress",
+        path: "test/rustperf/regress.mir",
+    },
+    TestFile {
+        name: "regex",
+        path: "test/rustperf/regex.mir",
+    },
+    TestFile {
+        name: "match_stress",
+        path: "test/rustperf/match_stress.mir",
+    },
+    TestFile {
+        name: "exa",
+        path: "test/rustperf/exa.mir",
+    },
+    TestFile {
+        name: "libc",
+        path: "test/rustperf/libc.mir",
+    },
+    TestFile {
+        name: "html5ever2",
+        path: "test/rustperf/html5ever2.mir",
+    },
+    TestFile {
+        name: "html5ever",
+        path: "test/rustperf/html5ever.mir",
+    },
+    TestFile {
+        name: "clap",
+        path: "test/rustperf/clap.mir",
+    },
+    TestFile {
+        name: "await-call-tree",
+        path: "test/rustperf/await_call_tree.mir",
+    },
+    TestFile {
+        name: "deeply_nested_multi",
+        path: "test/rustperf/deeply_nested_multi.mir",
+    },
+    TestFile {
+        name: "issue_1",
+        path: "test/rustperf/issue_1.mir",
+    },
+    TestFile {
+        name: "projection_caching",
+        path: "test/rustperf/projection_caching.mir",
+    },
+    TestFile {
+        name: "wf_projection",
+        path: "test/rustperf/wf_projection.mir",
+    },
+    TestFile {
+        name: "tt_munther",
+        path: "test/rustperf/tt_munther.mir",
+    },
+    TestFile {
+        name: "webpush",
+        path: "test/rustperf/webpush.mir",
+    },
+    TestFile {
+        name: "token_stream",
+        path: "test/rustperf/token_stream.mir",
+    },
+    TestFile {
+        name: "issue_2",
+        path: "test/rustperf/issue_2.mir",
+    },
+    TestFile {
+        name: "inflate",
+        path: "test/rustperf/inflate.mir",
+    },
+    TestFile {
+        name: "syn_1",
+        path: "test/rustperf/syn_1.mir",
+    },
+    TestFile {
+        name: "syn_2",
+        path: "test/rustperf/syn_2.mir",
+    },
+];
+
 fn run_test(file_path: &str) {
     let test_file = File::open(file_path).unwrap();
     let result = parse_mir(test_file).unwrap();
@@ -228,3 +360,18 @@ fn test_files() {
         println!();
     }
 }
+
+#[test]
+fn test_rustc() {
+    for test_file in TEST_RUSTC.iter() {
+        println!("Running test for {}", test_file.name);
+        run_test(test_file.path);
+        println!();
+    }
+}
+
+#[test]
+fn test_dev() {
+    run_test("test/mir_analyze/mir/dev.mir");
+    println!();
+}