#7016: Fix control flow of break/continue expanded from a macro

intellij-rust · Mar 24, 2021 · 8164858 · 8164858
1 parent 23ab684
commit 8164858
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 1 deletion.
diff --git a/src/main/kotlin/org/rust/lang/core/dfa/CFGBuilder.kt b/src/main/kotlin/org/rust/lang/core/dfa/CFGBuilder.kt
@@ -135,7 +135,7 @@ class CFGBuilder(
             }
         } else {
             // otherwise, try to find the corresponding loop
-            val exprBlock = expr.ancestors.filterIsInstance<RsLooplikeExpr>().firstOrNull()?.block
+            val exprBlock = expr.contexts.filterIsInstance<RsLooplikeExpr>().firstOrNull()?.block
 
             for ((loop, continueNode, breakNode) in loopScopes) {
                 if (loop.block == exprBlock) {

diff --git a/src/test/kotlin/org/rust/lang/core/dfa/RsControlFlowGraphTest.kt b/src/test/kotlin/org/rust/lang/core/dfa/RsControlFlowGraphTest.kt
@@ -1066,6 +1066,32 @@ class RsControlFlowGraphTest : RsTestBase() {
         Termination
     """)
 
+    fun `test break expanded from macro`() = testCFG("""
+        macro_rules! break_macro {
+            () => { break };
+        }
+        fn main() {
+            1;
+            loop {
+                break_macro!();
+            }
+            2;
+        }
+    """, """
+        Entry
+        1
+        1;
+        Dummy
+        break
+        LOOP
+        LOOP;
+        2
+        2;
+        BLOCK
+        Exit
+        Termination
+    """)
+
     private fun testCFG(@Language("Rust") code: String, expectedIndented: String) {
         InlineFile(code)
         val function = myFixture.file.descendantsOfType<RsFunction>().firstOrNull() ?: return