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

Change self() to protected in Method, SymbolReferenceTable, AliasBuilder #5803

Merged
merged 4 commits into from
Feb 26, 2021
Merged

Change self() to protected in Method, SymbolReferenceTable, AliasBuilder #5803

merged 4 commits into from
Feb 26, 2021

Conversation

AAbhiJ
Copy link
Contributor

@AAbhiJ AAbhiJ commented Feb 8, 2021

The self() instance method is not supposed to be publicly visible in
extensible classes like OMR::AliasBuilder, OMR::Method, OMR::SymbolReferenceTable ; It should be made protected

Issue: #5780

@AAbhiJ
Copy link
Contributor Author

AAbhiJ commented Feb 8, 2021

For reference, this PR relates to issue #5780

@0xdaryl
Copy link
Contributor

0xdaryl commented Feb 16, 2021

Would you mind rebasing this change to bring it up to date with the latest master? I want to verify it builds on a downstream project, but it is currently failing to build because it needs changes committed after this PR was created. Thanks.

@AAbhiJ
Copy link
Contributor Author

AAbhiJ commented Feb 21, 2021

Sorry, @0xdaryl for replying this late.

Would you mind rebasing this change to bring it up to date with the latest master?

And sure I will do that.

@AAbhiJ
Copy link
Contributor Author

AAbhiJ commented Feb 22, 2021

Hey @0xdaryl
I have rebased these commits, please check.

@0xdaryl
Copy link
Contributor

0xdaryl commented Feb 22, 2021

Thanks. Downstream testing was successful.

Sorry I didn't notice this before, but you have to update the forward copyright date in all the files you changed to 2021 (please).

@0xdaryl 0xdaryl self-assigned this Feb 22, 2021
@AAbhiJ
Copy link
Contributor Author

AAbhiJ commented Feb 23, 2021

Just to confirm that means only In 4 files I have to change to 2021
and should I add another commit for these changes because I don't know how to squash a commit to a particular commit?

@0xdaryl
Copy link
Contributor

0xdaryl commented Feb 23, 2021

You changed three files in three separate commits. The copyright updates shouldn't be in a separate commit as it is easy enough to amend your existing ones. Something like this should work:

  • rebase -i
    • For each of your commits, change pick to edit. Save. The rebase will stop at each of your commits for editing.
  • Each time the rebase stops, do the following:
    • Edit the forward copyright date in the file you changed in that commit to 2021.
    • git commit -a -s --amend
    • git rebase --continue
  • Push your new commits

@AAbhiJ

This comment has been minimized.

Signed-off-by: Abhi <abhiasawale510@gmail.com>
Signed-off-by: Abhi <abhiasawale510@gmail.com>
Signed-off-by: Abhi <abhiasawale510@gmail.com>
@AAbhiJ
Copy link
Contributor Author

AAbhiJ commented Feb 25, 2021

Hey @0xdaryl, @mstoodle, Please verify these changes and just want to confirm, I did not change OMRCompilation.hpp copyright date here as told that no other commit to be made in this PR.
And sorry in advance if I made any mistakes.

@mstoodle
Copy link
Contributor

Heh, I hadn't noticed the copyright date for OMRCompilation.cpp either @ABHI12800 ; thanks for pointing it out!

I think it would be ok to add a separate commit to this PR to update the copyright for that file. @0xdaryl agree?

@0xdaryl
Copy link
Contributor

0xdaryl commented Feb 25, 2021

The PR looks fine. Apologies, but I don't understand the comment about OMRCompilation.cpp/hpp. How is that related to this PR?

@0xdaryl
Copy link
Contributor

0xdaryl commented Feb 25, 2021

@genie-omr build all

@AAbhiJ
Copy link
Contributor Author

AAbhiJ commented Feb 25, 2021

I don't understand the comment about OMRCompilation.cpp/hpp. How is that related to this PR?

@0xdaryl I had updated the self() to protected of OMRCompilation.hpp and the PR is merged too (#5793)
So the copyright year is not updated in that merge.
Can I add another commit to this PR, this is what I am asking.

@0xdaryl
Copy link
Contributor

0xdaryl commented Feb 25, 2021

OK, sure. Please add as a separate commit here.

Signed-off-by: Abhi <abhiasawale510@gmail.com>
@AAbhiJ
Copy link
Contributor Author

AAbhiJ commented Feb 25, 2021

I have pushed a commit for OMRCompilation.hpp copyright date.
and why linux_riscv64_cross check failed.

Copy link
Contributor

@0xdaryl 0xdaryl left a comment

Choose a reason for hiding this comment

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

Previous set of commits passed CI testing. Latest change was a comment change only. Skipping CI.

@0xdaryl 0xdaryl changed the title Change self() to protected in OMR::Method, OMR::SymbolReferenceTable, OMR::AliasBuilder Change self() to protected in Method, SymbolReferenceTable, AliasBuilder Feb 26, 2021
@0xdaryl 0xdaryl merged commit c254685 into eclipse-omr:master Feb 26, 2021
@AAbhiJ
Copy link
Contributor Author

AAbhiJ commented Feb 26, 2021

Thanks, @0xdaryl, and @mstoodle.
Both of you were very helpful in my first contribution. : )

@0xdaryl
Copy link
Contributor

0xdaryl commented Feb 26, 2021

np. Thanks for the contribution. Please keep them coming! :-)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants