[polly] r231268 - Add support for conditional 'and' and 'or' expressions

[Johannes Doerfert]

See r231607 and the comment below.

On 03/04, Tobias Grosser wrote:
> Author: grosser
> Date: Wed Mar  4 12:14:59 2015
> New Revision: 231268
> 
> URL: http://llvm.org/viewvc/llvm-project?rev=231268&view=rev
> Log:
> Add support for conditional 'and' and 'or' expressions

> Modified: polly/trunk/lib/CodeGen/IslCodeGeneration.cpp
> URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/CodeGen/IslCodeGeneration.cpp?rev=231268&r1=231267&r2=231268&view=diff
> ==============================================================================
> --- polly/trunk/lib/CodeGen/IslCodeGeneration.cpp (original)
> +++ polly/trunk/lib/CodeGen/IslCodeGeneration.cpp Wed Mar  4 12:14:59 2015
> @@ -65,8 +65,8 @@ public:
>                   DominatorTree &DT, Scop &S)
>        : S(S), Builder(Builder), Annotator(Annotator),
>          Rewriter(new SCEVExpander(SE, "polly")),
> -        ExprBuilder(Builder, IDToValue, *Rewriter),
> -        BlockGen(Builder, LI, SE, DT, &ExprBuilder), RegionGen(BlockGen), P(P),
> +        ExprBuilder(Builder, IDToValue, *Rewriter, DT, LI),
> +        BlockGen(Builder, LI, SE, DT, &ExprBuilder), RegionGen(BlockGen),
The P(P) was dropped and neither tests nor buildbots picked it up,..
fortunately merge conflicts give us a second opportunity to check what
was changed.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 213 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20150308/f609581e/attachment.sig>