Skip to content

Conversation

jbj
Copy link
Contributor

@jbj jbj commented Jun 22, 2020

There was unfortunately a semantic merge conflict between #3419 and #3587 that caused a performance regression on (at least) OpenJDK.

This was git revert -m 1 982fb388078cf2b0950b10f5ea462c010e77ae2f followed by accepting test changes in cpp/ql/test/library-tests/dataflow/fields.

There was unfortunately a semantic merge conflict between github#3419 and
 github#3587 that caused a performance regression on (at least) OpenJDK.

This reverts commit 982fb38, reversing
changes made to b841cac.
@jbj jbj added the C++ label Jun 22, 2020
@jbj jbj requested a review from MathiasVP June 22, 2020 12:14
@jbj jbj requested a review from a team as a code owner June 22, 2020 12:14
@jbj
Copy link
Contributor Author

jbj commented Jun 22, 2020

I've started https://jenkins.internal.semmle.com/job/Changes/job/CPP-Differences/1209/, comparing this PR to the last version that succeeded in the nightly CPP-Differences.

Copy link
Contributor

@MathiasVP MathiasVP left a comment

Choose a reason for hiding this comment

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

LGTM! (The new CPP-differences results are from #3587)

@MathiasVP MathiasVP merged commit 55ce5ce into github:master Jun 23, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants