Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8289049: x86_32 build fails with GCC 11 due to newString646_US warning #9702

Closed
wants to merge 5 commits into from

Conversation

shipilev
Copy link
Member

@shipilev shipilev commented Aug 1, 2022

See bug report for reproducer and error message. The warning looks quite superficial, and I initially suspected that it complains about int len = (int)strlen(str) cast of size_t. But what is confusing is nearly the similar code in newStringCp1252 apparently does not produce the warning:

static jstring
newStringCp1252(JNIEnv *env, const char *str)
{
int len = (int) strlen(str);
jchar buf[512];
jchar *str1;
jstring result;
int i;
if ((*env)->EnsureLocalCapacity(env, 1) < 0)
return NULL;
if (len > 512) {
str1 = (jchar *)malloc(len * sizeof(jchar));
if (str1 == 0) {
JNU_ThrowOutOfMemoryError(env, 0);
return 0;
}
} else
str1 = buf;
for (i=0; i<len; i++) {
unsigned char c = (unsigned char)str[i];
if ((c >= 0x80) && (c <= 0x9f))
str1[i] = cp1252c1chars[c-128];
else
str1[i] = c;
}
result = (*env)->NewString(env, str1, len);
if (str1 != buf)
free(str1);
return result;
}

I propose we chalk it up to false/odd compiler warning and sync up unproblematic newStringCp1252 and newString646_US implementation to dodge it.

Additional testing:

  • Linux x86_32 build with GCC 11
  • Linux x86_32 tier1 test with GCC 9
  • Linux x86_64 tier1 test with GCC 9

Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8289049: x86_32 build fails with GCC 11 due to newString646_US warning

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk pull/9702/head:pull/9702
$ git checkout pull/9702

Update a local copy of the PR:
$ git checkout pull/9702
$ git pull https://git.openjdk.org/jdk pull/9702/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 9702

View PR using the GUI difftool:
$ git pr show -t 9702

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/9702.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 1, 2022

👋 Welcome back shade! 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 openjdk bot added the rfr Pull request is ready for review label Aug 1, 2022
@openjdk
Copy link

openjdk bot commented Aug 1, 2022

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

  • core-libs

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.

@openjdk openjdk bot added the core-libs core-libs-dev@openjdk.org label Aug 1, 2022
@mlbridge
Copy link

mlbridge bot commented Aug 1, 2022

Webrevs

@shipilev
Copy link
Member Author

Any thoughts?

@openjdk
Copy link

openjdk bot commented Aug 15, 2022

@shipilev 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:

8289049: x86_32 build fails with GCC 11 due to newString646_US warning

Reviewed-by: alanb, stuefe

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 28 new commits pushed to the master branch:

  • f75da22: 8292395: [testbug] VectorGatherScatterTest.java fails on SVE with -XX:MaxVectorSize=8 after JDK-8288397
  • 802ef38: 8292327: java.io.EOFException in InflaterInputStream after JDK-8281962
  • e61f6fc: 8292362: java/lang/Thread/jni/AttachCurrentThread/AttachTest.java#id1 failed on some platforms
  • 0bfb121: 8292051: jdk/internal/misc/TerminatingThreadLocal/TestTerminatingThreadLocal.java failed "AssertionError: Expected terminated values: [666] but got: []"
  • 1d9c2f7: 8292279: (fs) Use try-with-resources to release NativeBuffer
  • a25e1dc: 8292285: C2: remove unreachable block after NeverBranch-to-Goto conversion
  • 1ef4e48: 8273860: Javadoc Deprecated API list should not use italic font for description column
  • 0cc66ae: 8285790: AArch64: Merge C2 NEON and SVE matching rules
  • da477b1: 8292509: ProblemList java/lang/invoke/lambda/LogGeneratedClassesTest.java on windows
  • 01b87ba: 8289616: Drop use of Thread.stop in AppContext
  • ... and 18 more: https://git.openjdk.org/jdk/compare/e89abb7d2d902c6e6b3c9953fc6663de10db77b9...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.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Aug 15, 2022
@shipilev
Copy link
Member Author

Thank you! Any other comments? I'll be integrating it soon otherwise.

@tstuefe
Copy link
Member

tstuefe commented Aug 17, 2022

I'm confused. How does adding EnsureCapacity in newString646_US fix the compiler warning mentioned in JBS?

@shipilev
Copy link
Member Author

I'm confused. How does adding EnsureCapacity in newString646_US fix the compiler warning mentioned in JBS?

I think this is a bona-fide compiler static analyzer bug. GCC 12 compiles this code fine. So, we have two options: a) disable the warnings for this code block; b) harmonize all code blocks to use the same style, which is also incidentally avoids the false warning. This PR does (b).

Copy link
Member

@tstuefe tstuefe left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good.

@tstuefe
Copy link
Member

tstuefe commented Aug 17, 2022

I'm confused. How does adding EnsureCapacity in newString646_US fix the compiler warning mentioned in JBS?

I think this is a bona-fide compiler static analyzer bug. GCC 12 compiles this code fine. So, we have two options: a) disable the warnings for this code block; b) harmonize all code blocks to use the same style, which is also incidentally avoids the false warning. This PR does (b).

Okay, fair enough.

@shipilev
Copy link
Member Author

Thanks!

/integrate

@openjdk
Copy link

openjdk bot commented Aug 17, 2022

Going to push as commit 0c67fba.
Since your change was applied there have been 30 commits pushed to the master branch:

  • bf7d6d3: 7132413: [macosx] closed/javax/swing/AbstractButton/5049549/bug5049549.java fails on MacOS
  • e230719: 8292448: Convert BitMapFragmentTable to ResourceHashtable
  • f75da22: 8292395: [testbug] VectorGatherScatterTest.java fails on SVE with -XX:MaxVectorSize=8 after JDK-8288397
  • 802ef38: 8292327: java.io.EOFException in InflaterInputStream after JDK-8281962
  • e61f6fc: 8292362: java/lang/Thread/jni/AttachCurrentThread/AttachTest.java#id1 failed on some platforms
  • 0bfb121: 8292051: jdk/internal/misc/TerminatingThreadLocal/TestTerminatingThreadLocal.java failed "AssertionError: Expected terminated values: [666] but got: []"
  • 1d9c2f7: 8292279: (fs) Use try-with-resources to release NativeBuffer
  • a25e1dc: 8292285: C2: remove unreachable block after NeverBranch-to-Goto conversion
  • 1ef4e48: 8273860: Javadoc Deprecated API list should not use italic font for description column
  • 0cc66ae: 8285790: AArch64: Merge C2 NEON and SVE matching rules
  • ... and 20 more: https://git.openjdk.org/jdk/compare/e89abb7d2d902c6e6b3c9953fc6663de10db77b9...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Aug 17, 2022
@openjdk openjdk bot closed this Aug 17, 2022
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Aug 17, 2022
@openjdk
Copy link

openjdk bot commented Aug 17, 2022

@shipilev Pushed as commit 0c67fba.

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

@shipilev shipilev deleted the JDK-8289049-gcc11-x86-32 branch September 5, 2022 13:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
core-libs core-libs-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

3 participants