mirrors/JetBrainsRuntime
1
0
Fork 0
mirror of https://github.com/JetBrains/JetBrainsRuntime.git synced 2025-12-06 09:29:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

8317818: Combinatorial explosion during 'this' escape analysis

Browse Source 
Backport-of: 17535c34bc
This commit is contained in:
Archie Cobbs
2023-10-19 18:37:08 +00:00
committed by Vitaly Provodin
parent 8f07717a0d
commit ad721336d6
2 changed files with 32 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/jdk.compiler/share/classes/com/sun/tools/javac/comp/ThisEscapeAnalyzer.java
View File

@@ -167,7 +167,7 @@ class ThisEscapeAnalyzer extends TreeScanner {
/** Used to terminate recursion in {@link #invokeInvokable invokeInvokable()}.
*/
private final Set<Pair<JCTree, RefSet<Ref>>> invocations = new HashSet<>();
private final Set<Pair<JCMethodDecl, RefSet<Ref>>> invocations = new HashSet<>();
/** Snapshot of {@link #callStack} where a possible 'this' escape occurs.
* If non-null, a 'this' escape warning has been found in the current
@@ -590,7 +590,7 @@ class ThisEscapeAnalyzer extends TreeScanner {
return;
// Stop infinite recursion here
Pair<JCTree, RefSet<Ref>> invocation = Pair.of(site, refs.clone());
Pair<JCMethodDecl, RefSet<Ref>> invocation = Pair.of(methodInfo.declaration, refs.clone());
if (!invocations.add(invocation))
return;

30
test/langtools/tools/javac/warnings/ThisEscape.java
View File

@@ -617,4 +617,34 @@ public class ThisEscape {
;
}
}
// Verify no infinite recursion loop occurs (JDK-8317818)
public static class ThisEscapeRecursionExplosion {
private Object obj;
public ThisEscapeRecursionExplosion() {
getObject();
}
private Object getObject() {
if (this.obj == null) {
this.obj = new Object();
getObject().hashCode();
getObject().hashCode();
getObject().hashCode();
getObject().hashCode();
getObject().hashCode();
getObject().hashCode();
getObject().hashCode();
getObject().hashCode();
getObject().hashCode();
getObject().hashCode();
getObject().hashCode();
getObject().hashCode();
getObject().hashCode();
getObject().hashCode();
getObject().hashCode();
getObject().hashCode();
}
return this.obj;
}
}
}