Subject: Backport JDK-8337334 Test tools/javac/7142086/T7142086.java timeout with fastdebug binary

---
 test/langtools/TEST.ROOT                         |  3 ++-
 test/langtools/tools/javac/7142086/T7142086.java | 12 ++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/test/langtools/TEST.ROOT b/test/langtools/TEST.ROOT
index da884dee1..938c7674b 100644
--- a/test/langtools/TEST.ROOT
+++ b/test/langtools/TEST.ROOT
@@ -42,4 +42,5 @@ requires.extraPropDefns.vmOpts = \
     -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI \
     --add-exports java.base/jdk.internal.foreign=ALL-UNNAMED
 requires.properties= \
-    vm.continuations
+    vm.continuations \
+    vm.debug
diff --git a/test/langtools/tools/javac/7142086/T7142086.java b/test/langtools/tools/javac/7142086/T7142086.java
index bc8260bd4..b6521b7ff 100644
--- a/test/langtools/tools/javac/7142086/T7142086.java
+++ b/test/langtools/tools/javac/7142086/T7142086.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,12 +23,20 @@
 
 /*
  * @test
- * @bug 7142086
+ * @bug 7142086 8337334
+ * @requires vm.debug == false
  * @summary performance problem in Check.checkOverrideClashes(...)
  * @modules jdk.compiler
  * @run main/timeout=10 T7142086
  */
 
+/*
+ * @test
+ * @requires vm.debug == true
+ * @modules jdk.compiler
+ * @run main/timeout=20 T7142086
+ */
+
 import com.sun.source.util.JavacTask;
 import java.net.URI;
 import java.util.List;
-- 
2.33.0