[GR-32637] [GR-22733] [GR-14736] In agent, filter lambda classes heur…

…istically. PullRequest: graal/11947
oracle · Jun 10, 2022 · 18c276f · 18c276f
2 parents 00657a1 + a3ca043
commit 18c276f
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/...ratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/trace/AccessAdvisor.java b/...ratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/trace/AccessAdvisor.java
@@ -26,6 +26,7 @@
 
 import java.util.regex.Pattern;
 
+import org.graalvm.compiler.java.LambdaUtils;
 import org.graalvm.compiler.phases.common.LazyValue;
 
 import com.oracle.svm.configure.filters.ConfigurationFilter;
@@ -169,7 +170,13 @@ public boolean shouldIgnore(LazyValue<String> queriedClass, LazyValue<String> ca
         if (accessFilter != null && queriedClass.get() != null && !accessFilter.includes(queriedClass.get())) {
             return true;
         }
-        return heuristicsEnabled && queriedClass.get() != null && PROXY_CLASS_NAME_PATTERN.matcher(queriedClass.get()).matches();
+        if (heuristicsEnabled && queriedClass.get() != null) {
+            if (queriedClass.get().contains(LambdaUtils.LAMBDA_CLASS_NAME_SUBSTRING) ||
+                            PROXY_CLASS_NAME_PATTERN.matcher(queriedClass.get()).matches()) {
+                return true;
+            }
+        }
+        return false;
     }
 
     public boolean shouldIgnoreJniMethodLookup(LazyValue<String> queriedClass, LazyValue<String> name, LazyValue<String> signature, LazyValue<String> callerClass) {