Skip to content

Merge master into next.#669

Merged
xiemaisi merged 161 commits into
github:nextfrom
adityasharad:merge/master-next-111218
Dec 13, 2018
Merged

Merge master into next.#669
xiemaisi merged 161 commits into
github:nextfrom
adityasharad:merge/master-next-111218

Conversation

@adityasharad

Copy link
Copy Markdown
Collaborator

No conflicts. Should be merged just before the corresponding internal PR.

geoffw0 and others added 30 commits November 22, 2018 16:31
On 03e69e9, I updated the guards library to account
for control flow graph splitting. However, the logic that relates SSA qualifiers for
the guard and the guarded expression was not updated accordingly.
Just like syntax elements can be split in the control flow graph, so can SSA
definitions. To make this clear, and to make debugging easier, this commit
adds the splits as a prefix in the textual representation of SSA definitions.
jbj and others added 2 commits December 10, 2018 16:59
@adityasharad adityasharad added depends on internal PR This PR should only be merged in sync with an internal Semmle PR Mergeback labels Dec 11, 2018
@adityasharad adityasharad requested review from a team as code owners December 11, 2018 18:54
calumgrant and others added 3 commits December 12, 2018 16:58
Conflict in `cpp/ql/test/library-tests/sideEffects/functions/sideEffects.expected`,
resolved by accepting test output (combining changes).
@adityasharad adityasharad force-pushed the merge/master-next-111218 branch from 60e1f05 to f92456f Compare December 12, 2018 17:27
@adityasharad

Copy link
Copy Markdown
Collaborator Author

@geoffw0 could you please check cpp/ql/test/library-tests/sideEffects/functions/sideEffects.expected? I accepted the expected output.

@geoffw0

geoffw0 commented Dec 12, 2018

Copy link
Copy Markdown
Contributor

could you please check cpp/ql/test/library-tests/sideEffects/functions/sideEffects.expected?

It looks fine, it's just the changes from https://github.com/Semmle/ql/pull/641/files#diff-8b15d8396dfc1508c279afaf5b668802

@geoffw0 geoffw0 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

👍

@xiemaisi

Copy link
Copy Markdown

LGTM, merging.

@xiemaisi xiemaisi merged commit 3f18536 into github:next Dec 13, 2018
cklin pushed a commit that referenced this pull request May 23, 2022
Release preparation for version 2.7.6
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

depends on internal PR This PR should only be merged in sync with an internal Semmle PR Mergeback

Projects

None yet

Development

Successfully merging this pull request may close these issues.