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.

Sign up for GitHub

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

Jump to bottom

Revert "Remove incorrect transformation of getAndSet" #2940

Merged
merged 1 commit into from
Sep 20, 2018
Merged

Revert "Remove incorrect transformation of getAndSet" #2940

merged 1 commit into from
Sep 20, 2018

Conversation

liqunl
Copy link
Contributor

@liqunl liqunl commented Sep 19, 2018

This reverts commit a6ea96e.

The original transformation is correct thus put it back.

Revert "Remove incorrect transformation of getAndSet"
08e88a6 
This reverts commit a6ea96e.

The original commit is correct thus put it back.

Signed-off-by: Liqun Liu <liqunl@ca.ibm.com>
@andrewcraik
Copy link
Contributor

Jenkins test sanity xlinux,win jdk8,jdk11

@liqunl
Copy link
Contributor Author

liqunl commented Sep 19, 2018

@AdamBrousseau Are the infra failures related to adoptium/aqa-tests#567?

@andrewcraik
Copy link
Contributor

In hindsight Travis is probably enough since this is a direct revert.

@andrewcraik
Copy link
Contributor

Jenkins test sanity xlinux,win jdk8,jdk11

@liqunl liqunl mentioned this pull request Sep 19, 2018
Closed
@liqunl
Copy link
Contributor Author

liqunl commented Sep 19, 2018

The windows failure is

===============================================
Running test StringPeepholeTest_0 ...
===============================================
StringPeepholeTest_0 Start Time: Wed Sep 19 15:26:53 2018 Epoch Time (ms): 1537388813071
test with -XX:-EnableHCR -Xjit:count=0,optLevel=hot
Exception in thread "main" java/lang/NullPointerException
	at java/lang/ThreadLocal.set (java.base@9/ThreadLocal.java:222)
	at java/lang/StringCoding.set (java.base@9/StringCoding.java:83)
	at java/lang/StringCoding.encode (java.base@9/StringCoding.java:500)
	at java/lang/System.afterClinitInitialization (java.base@9/System.java:157)
	at java/lang/Thread.initialize (java.base@9/Thread.java:371)
	at java/lang/Thread.<init> (java.base@9/Thread.java:153)

StringPeepholeTest_0_FAILED

I don't think any of the methods called getAndSet. We might have a bug elsewhere.

andrewcraik
andrewcraik approved these changes Sep 20, 2018
View reviewed changes
Copy link
Contributor

@andrewcraik andrewcraik left a comment

Choose a reason for hiding this comment

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

LGTM

@andrewcraik andrewcraik merged commit 844f515 into eclipse-openj9:master Sep 20, 2018
@liqunl liqunl deleted the getandset branch January 24, 2019 17:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@andrewcraik andrewcraik andrewcraik approved these changes

Assignees
No one assigned
Labels
comp:jit
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@liqunl @andrewcraik @pshipton