Merge r347981 into the 7.0 branch

[llvmbot]

Bugzilla Link	39847
Resolution	FIXED
Resolved on	Dec 05, 2018 11:33
Version	7.0
OS	All
Blocks	#38454
Reporter	LLVM Bugzilla Contributor
CC	@dkrupp,@devincoughlin,@tstellar
Fixed by commit(s)	r348362 r348362

Extended Description

[Analyzer] [HOTFIX!] SValBuilder crash when aggressive-binary-operation-simplification enabled

During the review of D41938 a condition check with an early exit accidentally slipped into a branch, leaving the other branch unprotected. This may result in an assertion later on. This hotfix moves this contition check outside of the branch.

Commit: https://reviews.llvm.org/rC347981

[llvmbot]

assigned to @tstellar

[tstellar]

Artem, is this OK to merge to the release_70 branch?

[tstellar]

Also Devin, since you are the code owner, what do you think?

[haoNoQ]

I approve merging. It looks like a very safe patch to me: it merely disables a new feature in certain scenarios, reverting to the old behavior.

[tstellar]

Ádám are you able to port this test case to the release_70 branch. It looks like it uses some helper functions that aren't in the branch.

[llvmbot]

Oh yes, Artem updated the tests recently using a new feature. I changed it to the old format and committed it to the release_70 branch. However I can only see an LLVM commit (https://reviews.llvm.org/rL348362) but no Clang commit (no https://reviews.llvm.org/rC348362). Also the automatic mail to llvm-branch-commits is waiting for the moderator. I keep this bug open until you confirm that my commit was successful.

[tstellar]

I can confirm this was merged: r348362.