Index: llvm/trunk/lib/CodeGen/CodeGenPrepare.cpp
===================================================================
--- llvm/trunk/lib/CodeGen/CodeGenPrepare.cpp
+++ llvm/trunk/lib/CodeGen/CodeGenPrepare.cpp
@@ -6657,6 +6657,10 @@
       DL.getTypeSizeInBits(SplitStoreType))
     return false;
 
+  // Don't split the store if it is volatile.
+  if (SI.isVolatile())
+    return false;
+
   // Match the following patterns:
   // (store (or (zext LValue to i64),
   //            (shl (zext HValue to i64), 32)), HalfValBitSize)
Index: llvm/trunk/test/CodeGen/PowerPC/splitstore-check-volatile.ll
===================================================================
--- llvm/trunk/test/CodeGen/PowerPC/splitstore-check-volatile.ll
+++ llvm/trunk/test/CodeGen/PowerPC/splitstore-check-volatile.ll
@@ -0,0 +1,17 @@
+; Test that CodeGenPrepare respect the volatile flag when splitting a store.
+;
+; RUN: opt -S -codegenprepare -force-split-store < %s  | FileCheck %s
+
+define void @fun(i16* %Src, i16* %Dst) {
+; CHECK: store volatile i16 %8, i16* %Dst 
+  %1 = load i16, i16* %Src
+  %2 = trunc i16 %1 to i8
+  %3 = lshr i16 %1, 8
+  %4 = trunc i16 %3 to i8
+  %5 = zext i8 %2 to i16
+  %6 = zext i8 %4 to i16
+  %7 = shl nuw i16 %6, 8
+  %8 = or i16 %7, %5
+  store volatile i16 %8, i16* %Dst
+  ret void
+}