Merge #59

59: extend llvm-ir parser to handle libstd's IR r=japaric a=japaric fixes #58 Co-authored-by: Jorge Aparicio <[email protected]>
japaric · Jun 22, 2022 · 6e43fe7 · 6e43fe7
2 parents f03feb6 + 8c6d14a
commit 6e43fe7
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -34,7 +34,7 @@ jobs:
           override: true
           profile: minimal
           target: thumbv7m-none-eabi
-          toolchain: nightly
+          toolchain: nightly-2022-06-18
       - run: cargo install --path . --debug
       - name: Can analyze example firmware
         run: cargo test

diff --git a/src/ir.rs b/src/ir.rs
@@ -350,6 +350,10 @@ mod tests {
         assert_eq!(super::local("%."), Ok(("", Local)));
 
         assert_eq!(super::local("%.9"), Ok(("", Local)));
+
+        assert_eq!(super::local("%f"), Ok(("", Local)));
+
+        assert_eq!(super::local("%_17.0.i.i.i.i.i"), Ok(("", Local)));
     }
 
     #[test]

diff --git a/src/ir/define.rs b/src/ir/define.rs
@@ -228,10 +228,7 @@ fn indirect_call(i: &str) -> IResult<&str, Stmt> {
     .0;
     let (i, output) = alt((map(super::type_, Some), map(tag("void"), |_| None)))(i)?;
     let i = space1(i)?.0;
-    let i = char('%')(i)?.0;
-    let i = opt(char('_'))(i)?.0;
-    let i = digit1(i)?.0;
-    let i = many0(|i| tag(".i")(i))(i)?.0;
+    let i = super::local(i)?.0;
     let (i, inputs) = delimited(
         char('('),
         separated_list(
@@ -517,6 +514,20 @@ mod tests {
         );
     }
 
+    #[test]
+    fn call_gh58() {
+        assert_eq!(
+            super::indirect_call("tail call void %f()"),
+            Ok((
+                "",
+                Stmt::IndirectCall(FnSig {
+                    inputs: vec![],
+                    output: None,
+                })
+            ))
+        );
+    }
+
     #[test]
     fn label() {
         assert_eq!(