report loop count only when loop finishes

timfel · timfel · commit 47d777c2c7a7 · 2022-04-08T11:30:20.000+02:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/lib/PySequenceContainsNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/lib/PySequenceContainsNode.java
@@ -124,15 +124,17 @@ boolean contains(Frame frame, Object container, Object key,
                 }
                 try {
                     if (eqNode.execute(frame, callNext.executeObject(frame, next, iterator), key)) {
+                        if (CompilerDirectives.hasNextTier()) {
+                            LoopNode.reportLoopCount(this, i);
+                        }
                         return true;
                     }
                 } catch (PException e) {
                     e.expectStopIteration(stopIterationProfile);
-                    return false;
-                } finally {
                     if (CompilerDirectives.hasNextTier()) {
                         LoopNode.reportLoopCount(this, i);
                     }
+                    return false;
                 }
             }
         } else {

Original file line number	Diff line number	Diff line change
`@@ -124,15 +124,17 @@ boolean contains(Frame frame, Object container, Object key,`
`124`	`124`	`}`
`125`	`125`	`try {`
`126`	`126`	`if (eqNode.execute(frame, callNext.executeObject(frame, next, iterator), key)) {`
	`127`	`+ if (CompilerDirectives.hasNextTier()) {`
	`128`	`+ LoopNode.reportLoopCount(this, i);`
	`129`	`+ }`
`127`	`130`	`return true;`
`128`	`131`	`}`
`129`	`132`	`} catch (PException e) {`
`130`	`133`	`e.expectStopIteration(stopIterationProfile);`
`131`		`- return false;`
`132`		`- } finally {`
`133`	`134`	`if (CompilerDirectives.hasNextTier()) {`
`134`	`135`	`LoopNode.reportLoopCount(this, i);`
`135`	`136`	`}`
	`137`	`+ return false;`
`136`	`138`	`}`
`137`	`139`	`}`
`138`	`140`	`} else {`