Skip to content

Commit bd47476

Browse files
pshiptonpshipton
authored
Merge pull request #19710 from tajila/ehcr
Clear breakpts in class redef and fix HCR warning
2 parents 2a2df9f + 0fdb7b9 commit bd47476

File tree

11 files changed

+137
-143
lines changed

11 files changed

+137
-143
lines changed

‎runtime/jvmti/jvmtiClass.c

Lines changed: 121 additions & 118 deletions
Large diffs are not rendered by default.

‎runtime/util/hshelp.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3347,7 +3347,9 @@ verifyMethodsAreSame(J9VMThread * currentThread, J9JVMTIClassPair * classPair, U
33473347
/* If extensions are not enabled, treat any schema change as a real error */
33483348

33493349
if (extensionsEnabled == 0) {
3350-
emitExtendedHCRWarning(currentThread);
3350+
if (JVMTI_ERROR_NONE != rc) {
3351+
emitExtendedHCRWarning(currentThread);
3352+
}
33513353
return rc;
33523354
}
33533355

‎test/functional/IllegalAccessError_for_protected_method/playlist.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
<test>
4545
<testCaseName>IllegalAccessProtectedMethodTest_j9</testCaseName>
4646
<command>$(JAVA_COMMAND) $(JVM_OPTIONS) \
47-
-XX:+EnableExtendedHCR \
4847
-javaagent:$(Q)$(TEST_RESROOT)$(D)IllegalAccessProtectedMethod.jar$(Q) \
4948
-cp $(Q)$(RESOURCES_DIR)$(P)$(TESTNG)$(P)$(LIB_DIR)$(D)asm-all.jar$(P)$(TEST_RESROOT)$(D)IllegalAccessProtectedMethod.jar$(Q) \
5049
org.testng.TestNG -d $(REPORTDIR) $(Q)$(TEST_RESROOT)$(D)testng.xml$(Q) \

‎test/functional/JavaAgentTest/playlist.xml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
<variation>Mode107</variation>
3030
</variations>
3131
<command>$(JAVA_COMMAND) $(JVM_OPTIONS) \
32-
-XX:+EnableExtendedHCR \
3332
--add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/jdk.internal.org.objectweb.asm=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED \
3433
--add-exports=java.base/jdk.internal.org.objectweb.asm.commons=ALL-UNNAMED \
3534
-javaagent:$(Q)$(TEST_RESROOT)$(D)javaagenttest.jar$(Q) \
@@ -59,7 +58,6 @@
5958
<variation>Mode100</variation>
6059
</variations>
6160
<command>$(JAVA_COMMAND) $(JVM_OPTIONS) \
62-
-XX:+EnableExtendedHCR \
6361
--add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/jdk.internal.org.objectweb.asm=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED \
6462
--add-exports=java.base/jdk.internal.org.objectweb.asm.commons=ALL-UNNAMED \
6563
-javaagent:$(Q)$(TEST_RESROOT)$(D)javaagenttest.jar$(Q) \
@@ -88,7 +86,6 @@
8886
<variation>Mode107</variation>
8987
</variations>
9088
<command>$(JAVA_COMMAND) $(JVM_OPTIONS) \
91-
-XX:+EnableExtendedHCR \
9289
--add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/jdk.internal.org.objectweb.asm=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED \
9390
--add-exports=java.base/jdk.internal.org.objectweb.asm.commons=ALL-UNNAMED \
9491
-javaagent:$(Q)$(TEST_RESROOT)$(D)javaagenttest.jar$(Q) \
@@ -119,7 +116,6 @@
119116
<variation>Mode107</variation>
120117
</variations>
121118
<command>$(JAVA_COMMAND) $(JVM_OPTIONS) \
122-
-XX:+EnableExtendedHCR \
123119
--add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/jdk.internal.org.objectweb.asm=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED \
124120
--add-exports=java.base/jdk.internal.org.objectweb.asm.commons=ALL-UNNAMED \
125121
--add-exports=java.base/jdk.internal.org.objectweb.asm.util=ALL-UNNAMED \
@@ -259,7 +255,6 @@
259255
<variation>Mode107</variation>
260256
</variations>
261257
<command>$(JAVA_COMMAND) $(JVM_OPTIONS) \
262-
-XX:+EnableExtendedHCR \
263258
-javaagent:$(Q)$(TEST_RESROOT)$(D)javaagenttest.jar$(Q) \
264259
-cp $(Q)$(RESOURCES_DIR)$(P)$(TESTNG)$(P)$(LIB_DIR)$(D)asm-all.jar$(Q) \
265260
org.testng.TestNG -d $(REPORTDIR) $(Q)$(TEST_RESROOT)$(D)testng.xml$(Q) -testnames Cmvc196982 \
@@ -287,7 +282,6 @@
287282
<variation>Mode100</variation>
288283
</variations>
289284
<command>$(JAVA_COMMAND) $(JVM_OPTIONS) \
290-
-XX:+EnableExtendedHCR \
291285
-javaagent:$(Q)$(TEST_RESROOT)$(D)javaagenttest.jar$(Q) \
292286
-cp $(Q)$(RESOURCES_DIR)$(P)$(TESTNG)$(P)$(LIB_DIR)$(D)asm-all.jar$(Q) \
293287
org.testng.TestNG -d $(REPORTDIR) $(Q)$(TEST_RESROOT)$(D)testng.xml$(Q) -testnames RefreshGCCache_NoBCI_Test \
@@ -314,7 +308,6 @@
314308
<variation>Mode107</variation>
315309
</variations>
316310
<command>$(JAVA_COMMAND) $(JVM_OPTIONS) \
317-
-XX:+EnableExtendedHCR \
318311
-javaagent:$(Q)$(TEST_RESROOT)$(D)javaagenttest.jar$(Q) \
319312
-cp $(Q)$(RESOURCES_DIR)$(P)$(TESTNG)$(P)$(LIB_DIR)$(D)asm-all.jar$(Q) \
320313
org.testng.TestNG -d $(REPORTDIR) $(Q)$(TEST_RESROOT)$(D)testng.xml$(Q) -testnames RefreshGCCache_NoBCI_Test \
@@ -342,7 +335,6 @@
342335
<variation>Mode100</variation>
343336
</variations>
344337
<command>$(JAVA_COMMAND) $(JVM_OPTIONS) \
345-
-XX:+EnableExtendedHCR \
346338
-javaagent:$(Q)$(TEST_RESROOT)$(D)javaagenttest.jar$(Q) \
347339
-cp $(Q)$(RESOURCES_DIR)$(P)$(TESTNG)$(P)$(LIB_DIR)$(D)asm-all.jar$(Q) \
348340
org.testng.TestNG -d $(REPORTDIR) $(Q)$(TEST_RESROOT)$(D)testng.xml$(Q) -testnames RefreshGCCache_FastHCR_Test \
@@ -369,7 +361,6 @@
369361
<variation>Mode107</variation>
370362
</variations>
371363
<command>$(JAVA_COMMAND) $(JVM_OPTIONS) \
372-
-XX:+EnableExtendedHCR \
373364
-javaagent:$(Q)$(TEST_RESROOT)$(D)javaagenttest.jar$(Q) \
374365
-cp $(Q)$(RESOURCES_DIR)$(P)$(TESTNG)$(P)$(LIB_DIR)$(D)asm-all.jar$(Q) \
375366
org.testng.TestNG -d $(REPORTDIR) $(Q)$(TEST_RESROOT)$(D)testng.xml$(Q) -testnames RefreshGCCache_FastHCR_Test \

‎test/functional/cmdLineTests/jvmtitests/decompilationtests.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<!DOCTYPE suite SYSTEM "cmdlinetester.dtd">
2626

2727
<suite id="Decompilation Tests" timeout="600"> <!-- CMVC 161669: some machines take a long time to run decomp002 -->
28-
<variable name="JVM_OPTS" value="-XX:+EnableExtendedHCR -Xdump:system:events=abort " />
28+
<variable name="JVM_OPTS" value="-Xdump:system:events=abort " />
2929
<variable name="AGENTLIB" value="-agentlib:jvmtitest" />
3030
<variable name="TESTRUNNER" value="com.ibm.jvmti.tests.util.TestRunner" />
3131

‎test/functional/cmdLineTests/jvmtitests/fieldwatchtests.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727

2828
<suite id="JVMTI-fieldwatch Tests" timeout="360">
29-
<variable name="JVM_OPTS" value="-XX:+EnableExtendedHCR -Xdump:system:events=abort " />
29+
<variable name="JVM_OPTS" value="-Xdump:system:events=abort " />
3030
<variable name="AGENTLIB" value="-agentlib:jvmtitest" />
3131
<variable name="TESTID" value="testid" />
3232
<variable name="ENABLE_ATTACH" value="-Dcom.ibm.tools.attach.enable=yes" />

‎test/functional/cmdLineTests/jvmtitests/jvmtitests.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
-->
3333

3434
<suite id="JVMTI Tests" timeout="240">
35-
<variable name="JVM_OPTS" value="-XX:+EnableExtendedHCR" />
35+
<variable name="JVM_OPTS" value=" " />
3636
<variable name="JVM_MX512M" value="-Xmx512m" />
3737
<variable name="AGENTLIB" value="-agentlib:jvmtitest" />
3838
<variable name="TESTID" value="testid" />
@@ -392,7 +392,7 @@
392392
</test>
393393

394394
<test id="rnwr001">
395-
<command>$EXE$ $JVM_OPTS$ $AGENTLIB$=test:rnwr001 -cp $Q$$JAR$$Q$ $TESTRUNNER$</command>
395+
<command>$EXE$ $JVM_OPTS$ $AGENTLIB$=test:rnwr001 -XX:+EnableExtendedHCR -cp $Q$$JAR$$Q$ $TESTRUNNER$</command>
396396
<return type="success" value="0"/>
397397
</test>
398398

‎test/functional/cmdLineTests/jvmtitests/jvmtitests_Java11andUp.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
-->
3333

3434
<suite id="JVMTI Tests" timeout="240">
35-
<variable name="JVM_OPTS" value="-XX:+EnableExtendedHCR" />
35+
<variable name="JVM_OPTS" value=" " />
3636
<variable name="AGENTLIB" value="-agentlib:jvmtitest" />
3737
<variable name="TESTRUNNER" value="com.ibm.jvmti.tests.util.TestRunner" />
3838

‎test/functional/cmdLineTests/jvmtitests/jvmtitests_Java21andUp.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
-->
3333

3434
<suite id="JVMTI Tests" timeout="240">
35-
<variable name="JVM_OPTS" value="-XX:+EnableExtendedHCR" />
35+
<variable name="JVM_OPTS" value=" " />
3636
<variable name="AGENTLIB" value="-agentlib:jvmtitest" />
3737
<variable name="TESTRUNNER" value="com.ibm.jvmti.tests.util.TestRunner" />
3838

‎test/functional/cmdLineTests/jvmtitests/jvmtitests_hcr.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<!DOCTYPE suite SYSTEM "cmdlinetester.dtd">
2626

2727
<suite id="JVMTI Tests" timeout="240">
28-
<variable name="JVM_OPTS" value="-XX:+EnableExtendedHCR" />
28+
<variable name="JVM_OPTS" value=" " />
2929
<variable name="AGENTLIB" value="-agentlib:jvmtitest" />
3030
<variable name="TESTRUNNER" value="com.ibm.jvmti.tests.util.TestRunner" />
3131

@@ -44,17 +44,17 @@
4444
</test>
4545

4646
<test id="rc002">
47-
<command>$EXE$ $JVM_OPTS$ $AGENTLIB$=test:rc002 -cp $Q$$JAR$$Q$ $TESTRUNNER$</command>
47+
<command>$EXE$ $JVM_OPTS$ $AGENTLIB$=test:rc002 -XX:+EnableExtendedHCR -cp $Q$$JAR$$Q$ $TESTRUNNER$</command>
4848
<return type="success" value="0"/>
4949
</test>
5050

5151
<test id="rc003">
52-
<command>$EXE$ $JVM_OPTS$ $AGENTLIB$=test:rc003 -cp $Q$$JAR$$Q$ $TESTRUNNER$</command>
52+
<command>$EXE$ $JVM_OPTS$ $AGENTLIB$=test:rc003 -XX:+EnableExtendedHCR -cp $Q$$JAR$$Q$ $TESTRUNNER$</command>
5353
<return type="success" value="0"/>
5454
</test>
5555

5656
<test id="rc004">
57-
<command>$EXE$ $JVM_OPTS$ $AGENTLIB$=test:rc004 -cp $Q$$JAR$$Q$ $TESTRUNNER$</command>
57+
<command>$EXE$ $JVM_OPTS$ $AGENTLIB$=test:rc004 -XX:+EnableExtendedHCR -cp $Q$$JAR$$Q$ $TESTRUNNER$</command>
5858
<return type="success" value="0"/>
5959
</test>
6060

@@ -79,12 +79,12 @@
7979
</test>
8080

8181
<test id="rc009">
82-
<command>$EXE$ $JVM_OPTS$ $AGENTLIB$=test:rc009 -cp $Q$$JAR$$Q$ $TESTRUNNER$</command>
82+
<command>$EXE$ $JVM_OPTS$ $AGENTLIB$=test:rc009 -XX:+EnableExtendedHCR -cp $Q$$JAR$$Q$ $TESTRUNNER$</command>
8383
<return type="success" value="0"/>
8484
</test>
8585

8686
<test id="rc010">
87-
<command>$EXE$ $JVM_OPTS$ $AGENTLIB$=test:rc010 -cp $Q$$JAR$$Q$ $TESTRUNNER$</command>
87+
<command>$EXE$ $JVM_OPTS$ $AGENTLIB$=test:rc010 -XX:+EnableExtendedHCR -cp $Q$$JAR$$Q$ $TESTRUNNER$</command>
8888
<return type="success" value="0"/>
8989
</test>
9090

@@ -99,7 +99,7 @@
9999
</test>
100100

101101
<test id="rc013">
102-
<command>$EXE$ $JVM_OPTS$ $AGENTLIB$=test:rc013 -cp $Q$$JAR$$Q$ $TESTRUNNER$</command>
102+
<command>$EXE$ $JVM_OPTS$ $AGENTLIB$=test:rc013 -XX:+EnableExtendedHCR -cp $Q$$JAR$$Q$ $TESTRUNNER$</command>
103103
<return type="success" value="0"/>
104104
</test>
105105

0 commit comments

Comments
 (0)