get deoptimization count only on default compilation

Author: mur47x111

compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/CountedLoopOverflowTest.java

@@ -129,6 +129,11 @@ public void testDownOverflow() {
         }
     }
 
+    @Override
+    protected boolean installAsDefault() {
+        return true;
+    }
+
     @Test
     public void testDownOverflowUnsigned() {
         try {

compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/GraalCompilerTest.java

@@ -902,12 +902,16 @@ protected Result executeActual(ResolvedJavaMethod method, Object receiver, Objec
     }
 
     protected Result executeActual(OptionValues options, ResolvedJavaMethod method, Object receiver, Object... args) {
+        return executeActual(options, method, false, receiver, args);
+    }
+
+    protected Result executeActual(OptionValues options, ResolvedJavaMethod method, boolean installAsDefault, Object receiver, Object... args) {
         before(method);
         Object[] executeArgs = argsWithReceiver(receiver, args);
 
         checkArgs(method, executeArgs);
 
-        InstalledCode compiledMethod = getCode(method, options);
+        InstalledCode compiledMethod = getCode(method, null, false, installAsDefault, options);
         try {
             return new Result(compiledMethod.executeVarargs(executeArgs), null);
         } catch (Throwable e) {
@@ -1053,7 +1057,7 @@ protected Result executeActualCheckDeopt(OptionValues options, ResolvedJavaMetho
         for (DeoptimizationReason reason : shouldNotDeopt) {
             deoptCounts.put(reason, profile.getDeoptimizationCount(reason));
         }
-        Result actual = executeActual(options, method, receiver, args);
+        Result actual = executeActual(options, method, !shouldNotDeopt.isEmpty(), receiver, args);
         profile = method.getProfilingInfo(); // profile can change after execution
         for (DeoptimizationReason reason : shouldNotDeopt) {
             Assert.assertEquals("wrong number of deopt counts for " + reason, (int) deoptCounts.get(reason), profile.getDeoptimizationCount(reason));
@@ -1162,7 +1166,7 @@ protected InstalledCode getCode(final ResolvedJavaMethod installedCodeOwner, Str
                 try (DebugContext.Scope _ = debug.scope("CodeInstall", getCodeCache(), installedCodeOwner, compResult);
                                 DebugContext.Activation _ = debug.activate()) {
                     try {
-                        if (installAsDefault) {
+                        if (installAsDefault || installAsDefault()) {
                             installedCode = addDefaultMethod(debug, installedCodeOwner, compResult);
                         } else {
                             installedCode = addMethod(debug, installedCodeOwner, compResult);
@@ -1195,6 +1199,14 @@ protected InstalledCode getCode(final ResolvedJavaMethod installedCodeOwner, Str
         throw GraalError.shouldNotReachHere("Bailout limit reached"); // ExcludeFromJacocoGeneratedReport
     }
 
+    /**
+     * Allows subclasses to override and install compiled code as the default. Note that since
+     * JDK26+5, deoptimization counts are only updated for default compiled code.
+     */
+    protected boolean installAsDefault() {
+        return false;
+    }
+
     private static boolean optionsMapDeepEquals(UnmodifiableEconomicMap<OptionKey<?>, Object> map1, UnmodifiableEconomicMap<OptionKey<?>, Object> map2) {
         if (map1.size() != map2.size()) {
             return false;

compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/DeoptimizeReasonAccountingTest.java

@@ -131,4 +131,9 @@ public void testDeoptimize() {
             }
         }
     }
+
+    @Override
+    protected boolean installAsDefault() {
+        return true;
+    }
 }

compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/RangeCheckPredicatesTest.java

@@ -1142,4 +1142,9 @@ public static int rangeCheckPredicatesGuardAboveExitTest(int[] array, int start,
     public void testGuardAboveExitTest() {
         verifyRangeCheckInLoop("rangeCheckPredicatesGuardAboveExitTest");
     }
+
+    @Override
+    protected boolean installAsDefault() {
+        return true;
+    }
 }

compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/ArrayCopyExceptionSeenTest.java

@@ -98,4 +98,9 @@ public void testFailingCopy() throws InvalidInstalledCodeException {
         code.executeVarargs(new Object[3], -1, new Object[3], 0, 1);
         Assert.assertEquals("No more deopts expected after recompile with explicit exception edge.", 1, method.getProfilingInfo().getDeoptimizationCount(DeoptimizationReason.BoundsCheckException));
     }
+
+    @Override
+    protected boolean installAsDefault() {
+        return true;
+    }
 }

compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/DeoptimizeOnExceptionTest.java

@@ -220,4 +220,9 @@ public static boolean test3Snippet(boolean rethrowException) throws Exception {
 
         return GraalDirectives.inCompiledCode();
     }
+
+    @Override
+    protected boolean installAsDefault() {
+        return true;
+    }
 }