[llvm] r222203 - Revert r222040 because of bot failure.

[David Majnemer]

Reverting r222040 didn't seem to help things, the bot is still failing:
http://lab.llvm.org:8080/green/job/clang-Rlto_master_build/449/consoleFull#64550831649ba4694-19c4-4d7e-bec5-911270d8a58c

I'm having trouble finding a mistake in r222040.

On Mon, Nov 17, 2014 at 4:33 PM, Manman Ren <manman.ren at gmail.com> wrote:

> Author: mren
> Date: Mon Nov 17 18:33:22 2014
> New Revision: 222203
>
> URL: http://llvm.org/viewvc/llvm-project?rev=222203&view=rev
> Log:
> Revert r222040 because of bot failure.
>
> http://lab.llvm.org:8080/green/job/clang-Rlto_master/298/
> Hopefully, bot will be green.
>
> Modified:
>     llvm/trunk/lib/Transforms/InstCombine/InstCombineCasts.cpp
>     llvm/trunk/test/Transforms/InstCombine/fpcast.ll
>
> Modified: llvm/trunk/lib/Transforms/InstCombine/InstCombineCasts.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/InstCombine/InstCombineCasts.cpp?rev=222203&r1=222202&r2=222203&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/Transforms/InstCombine/InstCombineCasts.cpp (original)
> +++ llvm/trunk/lib/Transforms/InstCombine/InstCombineCasts.cpp Mon Nov 17
> 18:33:22 2014
> @@ -1269,17 +1269,14 @@ Instruction *InstCombiner::visitFPTrunc(
>          // type of OpI doesn't enter into things at all.  We simply
> evaluate
>          // in whichever source type is larger, then convert to the
>          // destination type.
> -        Value *NewLHS = LHSOrig, *NewRHS = RHSOrig;
>          if (LHSWidth < SrcWidth)
> -          NewLHS = Builder->CreateFPExt(NewLHS, RHSOrig->getType());
> +          LHSOrig = Builder->CreateFPExt(LHSOrig, RHSOrig->getType());
>          else if (RHSWidth <= SrcWidth)
> -          NewRHS = Builder->CreateFPExt(NewRHS, LHSOrig->getType());
> -        if (NewLHS != LHSOrig || NewRHS != RHSOrig) {
> -          Value *ExactResult = Builder->CreateFRem(NewLHS, NewRHS);
> -          if (Instruction *RI = dyn_cast<Instruction>(ExactResult))
> -            RI->copyFastMathFlags(OpI);
> -          return CastInst::CreateFPCast(ExactResult, CI.getType());
> -        }
> +          RHSOrig = Builder->CreateFPExt(RHSOrig, LHSOrig->getType());
> +        Value *ExactResult = Builder->CreateFRem(LHSOrig, RHSOrig);
> +        if (Instruction *RI = dyn_cast<Instruction>(ExactResult))
> +          RI->copyFastMathFlags(OpI);
> +        return CastInst::CreateFPCast(ExactResult, CI.getType());
>      }
>
>      // (fptrunc (fneg x)) -> (fneg (fptrunc x))
>
> Modified: llvm/trunk/test/Transforms/InstCombine/fpcast.ll
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/fpcast.ll?rev=222203&r1=222202&r2=222203&view=diff
>
> ==============================================================================
> --- llvm/trunk/test/Transforms/InstCombine/fpcast.ll (original)
> +++ llvm/trunk/test/Transforms/InstCombine/fpcast.ll Mon Nov 17 18:33:22
> 2014
> @@ -53,13 +53,3 @@ define half @test5(float %a, float %b, f
>  }
>
>  declare float @llvm.fabs.f32(float) nounwind readonly
> -
> -define <1 x float> @test6(<1 x double> %V) {
> -  %frem = frem <1 x double> %V, %V
> -  %trunc = fptrunc <1 x double> %frem to <1 x float>
> -  ret <1 x float> %trunc
> -; CHECK-LABEL: @test6
> -; CHECK-NEXT: %[[frem:.*]]  = frem <1 x double> %V, %V
> -; CHECK-NEXT: %[[trunc:.*]] = fptrunc <1 x double> %[[frem]] to <1 x
> float>
> -; CHECK-NEXT: ret <1 x float> %trunc
> -}
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20141117/0aa9bb19/attachment.html>