Index: lib/CodeGen/SelectionDAG/LegalizeTypesGeneric.cpp
===================================================================
--- lib/CodeGen/SelectionDAG/LegalizeTypesGeneric.cpp
+++ lib/CodeGen/SelectionDAG/LegalizeTypesGeneric.cpp
@@ -336,7 +336,8 @@
 
 SDValue DAGTypeLegalizer::ExpandOp_BITCAST(SDNode *N) {
   SDLoc dl(N);
-  if (N->getValueType(0).isVector()) {
+  if (N->getValueType(0).isVector() &&
+      N->getOperand(0).getValueType().isInteger()) {
     // An illegal expanding type is being converted to a legal vector type.
     // Make a two element vector out of the expanded parts and convert that
     // instead, but only if the new vector type is legal (otherwise there
Index: test/CodeGen/PowerPC/pr30715.ll
===================================================================
--- test/CodeGen/PowerPC/pr30715.ll
+++ test/CodeGen/PowerPC/pr30715.ll
@@ -0,0 +1,74 @@
+; RUN: llc -verify-machineinstrs -mcpu=pwr8 -mtriple=powerpc64le-unknown-linux-gnu < %s | FileCheck %s
+
+%class.FullMatrix = type { i8 }
+%class.Vector = type { float* }
+
+$_ZNK10FullMatrixIgE5m_fn2IfEEvR6VectorIT_ERKS4_b = comdat any
+
+define weak_odr void @_ZNK10FullMatrixIgE5m_fn2IfEEvR6VectorIT_ERKS4_b(%class.FullMatrix* %this, %class.Vector* dereferenceable(8) %p1, %class.Vector* dereferenceable(8), i1 zeroext) {
+entry:
+  %call = tail call signext i32 @_ZNK10FullMatrixIgE5m_fn1Ev(%class.FullMatrix* %this)
+  %cmp10 = icmp sgt i32 %call, 0
+  br i1 %cmp10, label %for.body.lr.ph, label %for.cond.cleanup
+
+for.body.lr.ph:                                   ; preds = %entry
+  %val.i = getelementptr inbounds %class.Vector, %class.Vector* %p1, i64 0, i32 0
+  %2 = load float*, float** %val.i, align 8
+  %wide.trip.count = zext i32 %call to i64
+  %min.iters.check = icmp ult i32 %call, 4
+  br i1 %min.iters.check, label %for.body.preheader, label %min.iters.checked
+
+for.body.preheader:                               ; preds = %middle.block, %min.iters.checked, %for.body.lr.ph
+  %indvars.iv.ph = phi i64 [ 0, %min.iters.checked ], [ 0, %for.body.lr.ph ], [ %n.vec, %middle.block ]
+  br label %for.body
+
+min.iters.checked:                                ; preds = %for.body.lr.ph
+  %3 = and i32 %call, 3
+  %n.mod.vf = zext i32 %3 to i64
+  %n.vec = sub nsw i64 %wide.trip.count, %n.mod.vf
+  %cmp.zero = icmp eq i64 %n.vec, 0
+  br i1 %cmp.zero, label %for.body.preheader, label %vector.body.preheader
+
+vector.body.preheader:                            ; preds = %min.iters.checked
+  br label %vector.body
+
+vector.body:                                      ; preds = %vector.body.preheader, %vector.body
+  %index = phi i64 [ %index.next, %vector.body ], [ 0, %vector.body.preheader ]
+  %4 = getelementptr inbounds float, float* %2, i64 %index
+  %5 = bitcast float* %4 to <4 x float>*
+  %wide.load = load <4 x float>, <4 x float>* %5, align 4
+  %6 = fpext <4 x float> %wide.load to <4 x ppc_fp128>
+  %7 = fadd <4 x ppc_fp128> %6, undef
+  %8 = fptrunc <4 x ppc_fp128> %7 to <4 x float>
+  %9 = bitcast float* %4 to <4 x float>*
+  store <4 x float> %8, <4 x float>* %9, align 4
+  %index.next = add i64 %index, 4
+  %10 = icmp eq i64 %index.next, %n.vec
+  br i1 %10, label %middle.block, label %vector.body
+
+middle.block:                                     ; preds = %vector.body
+  %cmp.n = icmp eq i32 %3, 0
+  br i1 %cmp.n, label %for.cond.cleanup, label %for.body.preheader
+
+for.cond.cleanup.loopexit:                        ; preds = %for.body
+  br label %for.cond.cleanup
+
+for.cond.cleanup:                                 ; preds = %for.cond.cleanup.loopexit, %middle.block, %entry
+  ret void
+
+for.body:                                         ; preds = %for.body.preheader, %for.body
+  %indvars.iv = phi i64 [ %indvars.iv.next, %for.body ], [ %indvars.iv.ph, %for.body.preheader ]
+  %arrayidx.i = getelementptr inbounds float, float* %2, i64 %indvars.iv
+  %11 = load float, float* %arrayidx.i, align 4
+  %conv = fpext float %11 to ppc_fp128
+  %add = fadd ppc_fp128 %conv, undef
+  %conv4 = fptrunc ppc_fp128 %add to float
+  store float %conv4, float* %arrayidx.i, align 4
+  %indvars.iv.next = add nuw nsw i64 %indvars.iv, 1
+  %exitcond = icmp eq i64 %indvars.iv.next, %wide.trip.count
+  br i1 %exitcond, label %for.cond.cleanup.loopexit, label %for.body
+; CHECK: stxsdx
+; CHECK: lxvd2x
+}
+
+declare signext i32 @_ZNK10FullMatrixIgE5m_fn1Ev(%class.FullMatrix*) local_unnamed_addr #1