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

[Enhancement] rebase to openjdk 8u222 GA #14

Merged
merged 0 commits into from
Sep 9, 2019

Conversation

shiyuexw
Copy link

@shiyuexw shiyuexw commented Sep 2, 2019

Summary:
Rebase the code to OpenJDK 8u222 GA

Test Plan: sanity check in make.sh

Reviewers:luchsh,sanhong

Issue:
dragonwell-project/dragonwell8#47

@CLAassistant
Copy link

CLAassistant commented Sep 2, 2019

CLA assistant check
Thank you for your submission, we really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
6 out of 7 committers have signed the CLA.

✅ luchsh
✅ shiyuexw
✅ zhangruoxu
✅ tbzhang
✅ D-D-H
✅ kuaiwei
❌ ctornqvi


ctornqvi seems not to be a GitHub user. You need a GitHub account to be able to sign the CLA. If you have already a GitHub account, please add the email address used for this commit to your account.
You have signed the CLA already but the status is still pending? Let us recheck it.

@shiyuexw shiyuexw requested review from luchsh, D-D-H and sanhong September 2, 2019 06:50
@shiyuexw shiyuexw changed the title [Misc] rebase to openjdk 8u222 GA [Enhancement] rebase to openjdk 8u222 GA Sep 2, 2019
@shiyuexw
Copy link
Author

shiyuexw commented Sep 2, 2019

@shiyuexw shiyuexw self-assigned this Sep 2, 2019
@shiyuexw
Copy link
Author

shiyuexw commented Sep 9, 2019

the build pass with jtreg and JCK tests.

1 similar comment
@shiyuexw
Copy link
Author

shiyuexw commented Sep 9, 2019

the build pass with jtreg and JCK tests.

@shiyuexw
Copy link
Author

shiyuexw commented Sep 9, 2019

[JFR] Full patch for hotspot
Author: 卓昂 <denghui.ddh@alibaba-inc.com>

src/share/vm/runtime/javaCalls.hpp
Diff:
<<<<<<< HEAD
 inline void push_oop(Handle h) {
   _value_state[_size] = value_state_handle;
   _size = push_oop_impl(h.raw_value(), _size);
 }
=======
 inline void push_jobject(jobject h)    { _is_oop[_size] = true;
                              JNITypes::put_obj((oop)h, _value, _size); }
 inline void push_int(int i)       { _is_oop[_size] = false;
                              JNITypes::put_int(i, _value, _size); }
>>>>>>> e5761e8... [JFR] Full patch for hotspot

rebase conflict

@shiyuexw shiyuexw merged commit 950ba37 into dragonwell-project:master Sep 9, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants