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

8239095: Upgrade libFFI to the latest 3.3 version #242

Closed
wants to merge 2 commits into from

Conversation

@sashamatveev
Copy link
Member

sashamatveev commented May 29, 2020

  • Updated libffi to 3.3.

Progress

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

Issue

  • JDK-8239095: Upgrade libFFI to the latest 3.3 version

Reviewers

  • Johan Vos (jvos - Reviewer)
  • Kevin Rushforth (kcr - Reviewer)

Download

$ git fetch https://git.openjdk.java.net/jfx pull/242/head:pull/242
$ git checkout pull/242

@bridgekeeper
Copy link

bridgekeeper bot commented May 29, 2020

👋 Welcome back almatvee! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request.

@kevinrushforth
Copy link
Member

kevinrushforth commented May 29, 2020

/reviewers 2

@openjdk
Copy link

openjdk bot commented May 29, 2020

@kevinrushforth
The number of required reviews for this PR is now set to 2 (with at least 1 of role reviewers).

@openjdk openjdk bot added the rfr label May 29, 2020
@mlbridge
Copy link

mlbridge bot commented May 29, 2020

Webrevs

@kevinrushforth kevinrushforth self-requested a review May 29, 2020
@kevinrushforth
Copy link
Member

kevinrushforth commented May 29, 2020

@arapte Can you review as well?

@kevinrushforth
Copy link
Member

kevinrushforth commented May 29, 2020

Initial testing looks good. I'll finish my testing & review on Monday.

@@ -50,7 +50,9 @@
#endif

#define FFI_TARGET_SPECIFIC_STACK_SPACE_ALLOCATION
//#define FFI_TARGET_HAS_COMPLEX_TYPE

This comment has been minimized.

@arapte

arapte Jun 1, 2020 Member

In the original release of libffi 3.2.1, this line is not commented. which means it was commented in JavaFX. I cannot trace when and why was it commented. Should it be reasoned to whether enable it or not ?

This comment has been minimized.

@johanvos

johanvos Jun 1, 2020 Collaborator

That's a good question. The commented line was there from the first commit (in 9, changeset 9231:241f9696e3ad, https://bugs.openjdk.java.net/browse/JDK-8043352) but I don't see a reason on why it was disabled.

libffi is also built in the GraalVM project, and that line is not commented there.

@sashamatveev or @kevinrushforth do you remember the reason?

This comment has been minimized.

@kevinrushforth

kevinrushforth Jun 1, 2020 Member

No, I don't remember.

This comment has been minimized.

@sashamatveev

sashamatveev Jun 1, 2020 Author Member

No, I don't remember as well.

Copy link
Collaborator

johanvos left a comment

I tested this and couldn't find issues. The uncommented line worries me a bit, though, but I can't see a reason why it should be commented again.

Copy link
Member

kevinrushforth left a comment

Looks good to me.

@openjdk
Copy link

openjdk bot commented Jun 2, 2020

@sashamatveev This change now passes all automated pre-integration checks. When the change also fulfills all project specific requirements, type /integrate in a new comment to proceed. After integration, the commit message will be:

8239095: Upgrade libFFI to the latest 3.3 version

Reviewed-by: jvos, kcr
  • If you would like to add a summary, use the /summary command.
  • To credit additional contributors, use the /contributor command.
  • To add additional solved issues, use the /issue command.

Since the source branch of this PR was last updated there have been 7 commits pushed to the master branch:

  • 853ac78: 8245282: Button/Combo Behavior: memory leak on dispose
  • a78b3fb: 8242523: Update the animation and clip envelope classes
  • 1ab653c: 8244657: ChoiceBox/ToolBarSkin: misbehavior on switching skin
  • 804ccce: 8244195: [TEST_BUG] Convert the system tests TabPanePermuteGetTabsTest to unit test
  • 9edba9c: 8243110: SVGTest.testSVGRenderingWithPattern fails intermittently
  • 168b7f7: 8246099: Intermittent test failures in SandboxAppTest
  • c41777e: 8245634: [TestBug] Enable and fix tests ignored with message "impl_cssSet API removed"

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid automatic rebasing, please merge master into your branch, and then specify the current head hash when integrating, like this: /integrate 853ac78ad5099ebda00dc401b3ead67cafa59aa8.

➡️ 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 label Jun 2, 2020
@sashamatveev
Copy link
Member Author

sashamatveev commented Jun 2, 2020

/integrate

@openjdk openjdk bot closed this Jun 2, 2020
@openjdk openjdk bot added integrated and removed ready rfr labels Jun 2, 2020
@openjdk
Copy link

openjdk bot commented Jun 2, 2020

@sashamatveev The following commits have been pushed to master since your change was applied:

  • 853ac78: 8245282: Button/Combo Behavior: memory leak on dispose
  • a78b3fb: 8242523: Update the animation and clip envelope classes
  • 1ab653c: 8244657: ChoiceBox/ToolBarSkin: misbehavior on switching skin
  • 804ccce: 8244195: [TEST_BUG] Convert the system tests TabPanePermuteGetTabsTest to unit test
  • 9edba9c: 8243110: SVGTest.testSVGRenderingWithPattern fails intermittently
  • 168b7f7: 8246099: Intermittent test failures in SandboxAppTest
  • c41777e: 8245634: [TestBug] Enable and fix tests ignored with message "impl_cssSet API removed"

Your commit was automatically rebased without conflicts.

Pushed as commit 6bd0e22.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
You can’t perform that action at this time.