8259729: Missed JNFInstanceOf -> IsInstanceOf conversion #2066

prrace · 2021-01-13T20:35:55Z

One line fix of a missed update

Progress

Change must not contain extraneous whitespace
Commit message must refer to an issue
Change must be properly reviewed

Issue

JDK-8259729: Missed JNFInstanceOf -> IsInstanceOf conversion

Reviewers

Sergey Bylokhov (@mrserb - Reviewer)
Prasanta Sadhukhan (@prsadhuk - Reviewer)
Alexander Zuev (@azuev-java - Reviewer)

Download

$ git fetch https://git.openjdk.java.net/jdk pull/2066/head:pull/2066
$ git checkout pull/2066

bridgekeeper · 2021-01-13T20:36:54Z

👋 Welcome back prr! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

openjdk · 2021-01-13T20:37:50Z

@prrace The following label will be automatically applied to this pull request:

awt

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

mlbridge · 2021-01-13T20:41:08Z

Webrevs

00: Full (6503ecc)

mrserb · 2021-01-13T21:10:46Z

src/java.desktop/macosx/native/libawt_lwawt/awt/JavaComponentAccessibility.m

@@ -1453,7 +1453,7 @@ - (id)accessibilityHitTest:(NSPoint)point withEnv:(JNIEnv *)env
    jobject jparent = fComponent;

    id value = nil;
-    if (JNFIsInstanceOf(env, jparent, &jc_Container)) {
+    if ((*env)->IsInstanceOf(env, jparent, jc_Container)) {


Not sure, but do we need to check the jparent to NULL? "A NULL object can be cast to any class."

Fair question but there was no NULL check there before so I assume it isn't expected to be NULL.
I could add a NULL check but then we'd skip over the following code and maybe hide something that could be a problem. I don't mind either way.

I do not know how exactly the JNFIsInstanceOf works for NULL parameters, will it return true or false?

I just hacked a usage in A11Y in JDK 16 :
printf("OBJ %d\n", JNFIsInstanceOf(env, NULL, &sjc_CAccessible));

it returns TRUE for NULL - same as JNI.

openjdk · 2021-01-13T23:00:36Z

@prrace This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8259729: Missed JNFInstanceOf -> IsInstanceOf conversion

Reviewed-by: serb, psadhukhan, kizune

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 64 new commits pushed to the master branch:

2c8e337: 8259622: TreeMap.computeIfAbsent deviates from spec
d701bab: Merge
4307fa6: 8253505: JFR: onFlush invoked out of order with a sorted event stream
0148adf: 8255120: C2: assert(outer->outcnt() >= phis + 2 && outer->outcnt() <= phis + 2 + stores + 1) failed: only phis
90960c5: 8252657: JVMTI agent is not unloaded when Agent_OnAttach is failed
e3b548a: 8257736: InputStream from BodyPublishers.ofInputStream() leaks when IOE happens
978bed6: 8259522: Apply java.io.Serial annotations in java.desktop
bf28f92: 8259713: Fix comments about ResetNoHandleMark in deoptimization
4f881ba: 8258652: Assert in JvmtiThreadState::cur_stack_depth() can noticeably slow down debugging single stepping
d18d26e: 8259350: Add some internal debugging APIs to the debug agent
... and 54 more: https://git.openjdk.java.net/jdk/compare/5f7ccce0c03b2b814c0bae132d359d9903708496...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

prrace · 2021-01-14T17:24:07Z

/integrate

openjdk · 2021-01-14T17:25:22Z

@prrace Since your change was applied there have been 52 commits pushed to the master branch:

aba3431: 8258956: Memory Leak in StringCoding on ThreadLocal resultCached StringCoding.Result
8554fe6: 8253866: Security Libs Terminology Refresh
c2a3c7e: 8259727: Remove redundant "target" arguments to methods in Links
1620664: 8259723: Move Table class to formats.html package
38a1201: 8258912: Remove JVM options CountJNICalls and CountJVMCalls
be57cf1: 8226416: MonitorUsedDeflationThreshold can cause repeated async deflation requests
c822eda: 8259699: Reduce char[] copying in URLEncoder.encode(String, Charset)
ff3e6e4: 8259773: Incorrect encoding of AVX-512 kmovq instruction
b8ef2ba: 8259563: The CPU model name is printed multiple times when using -Xlog:os+cpu
b040a3d: 8259631: Reapply pattern match instanceof use in HttpClientImpl
... and 42 more: https://git.openjdk.java.net/jdk/compare/5f7ccce0c03b2b814c0bae132d359d9903708496...master

Your commit was automatically rebased without conflicts.

Pushed as commit dff59d42b42effe1c2c78e74703c98a7c12a4c0b.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.
An unexpected error occurred during integration. No push attempt will be made. The error has been logged and will be investigated. It is possible that this error is caused by a transient issue; feel free to retry the operation.

prrace · 2021-01-15T17:01:33Z

/integrate

openjdk · 2021-01-15T17:02:28Z

@prrace Since your change was applied there have been 72 commits pushed to the master branch:

b78cd63: 8259846: [BACKOUT] JDK-8259278 Optimize Vector API slice and unslice operations
eb7fa00: 8259216: javadoc omits method receiver for any nested type annotation
bcf20a0: 8259777: Incorrect predication condition generated by ADLC
bbac91a: 8257959: Add gtest run with -XX:+UseLargePages
707bce0: 8257212: (bf spec) Clarify byte order of the buffer returned by CharBuffer.subsequence(int,int)
0ec2c96: 8259820: JShell does not handle -source 8 properly
b01a15e: 8258884: [TEST_BUG] Convert applet-based test open/test/jdk/javax/swing/JMenuItem/8031573/bug8031573.java to a regular java test
6d4a593: 8259627: Potential memory leaks in JVMTI after JDK-8227745
2c8e337: 8259622: TreeMap.computeIfAbsent deviates from spec
d701bab: Merge
... and 62 more: https://git.openjdk.java.net/jdk/compare/5f7ccce0c03b2b814c0bae132d359d9903708496...master

Your commit was automatically rebased without conflicts.

Pushed as commit 360c722.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

8259729: Missed JNFInstanceOf -> IsInstanceOf conversion

6503ecc

openjdk bot added the rfr Pull request is ready for review label Jan 13, 2021

openjdk bot added the awt client-libs-dev@openjdk.org label Jan 13, 2021

mrserb reviewed Jan 13, 2021

View changes

mrserb approved these changes Jan 13, 2021

View changes

openjdk bot added the ready Pull request is ready to be integrated label Jan 13, 2021

prsadhuk approved these changes Jan 15, 2021

View changes

azuev-java approved these changes Jan 15, 2021

View changes

openjdk bot closed this Jan 15, 2021

openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jan 15, 2021

prrace deleted the jnfinstanceof branch February 10, 2021 19:37

8259729: Missed JNFInstanceOf -> IsInstanceOf conversion #2066

8259729: Missed JNFInstanceOf -> IsInstanceOf conversion #2066

prrace commented Jan 13, 2021 •

edited by openjdk bot

bridgekeeper bot commented Jan 13, 2021

openjdk bot commented Jan 13, 2021

mlbridge bot commented Jan 13, 2021

mrserb Jan 13, 2021

prrace Jan 13, 2021

mrserb Jan 13, 2021

prrace Jan 13, 2021

openjdk bot commented Jan 13, 2021 •

edited

prrace commented Jan 14, 2021

openjdk bot commented Jan 14, 2021

prrace commented Jan 15, 2021

openjdk bot commented Jan 15, 2021

8259729: Missed JNFInstanceOf -> IsInstanceOf conversion #2066

8259729: Missed JNFInstanceOf -> IsInstanceOf conversion #2066

Conversation

prrace commented Jan 13, 2021 • edited by openjdk bot

Progress

Issue

Reviewers

Download

bridgekeeper bot commented Jan 13, 2021

openjdk bot commented Jan 13, 2021

mlbridge bot commented Jan 13, 2021

Webrevs

mrserb Jan 13, 2021

Choose a reason for hiding this comment

prrace Jan 13, 2021

Choose a reason for hiding this comment

mrserb Jan 13, 2021

Choose a reason for hiding this comment

prrace Jan 13, 2021

Choose a reason for hiding this comment

openjdk bot commented Jan 13, 2021 • edited

prrace commented Jan 14, 2021

openjdk bot commented Jan 14, 2021

prrace commented Jan 15, 2021

openjdk bot commented Jan 15, 2021

prrace commented Jan 13, 2021 •

edited by openjdk bot

openjdk bot commented Jan 13, 2021 •

edited