1 files changed, 2 insertions, 4 deletions
diff --git a/CodeGen/CGDecl.cpp b/CodeGen/CGDecl.cpp
index bbfad651cc..9fd0673db1 100644
--- a/CodeGen/CGDecl.cpp
+++ b/CodeGen/CGDecl.cpp
@@ -87,13 +87,11 @@ void CodeGenFunction::EmitLocalBlockVarDecl(const BlockVarDecl &D) {
   if (const Expr *Init = D.getInit()) {
     if (!hasAggregateLLVMType(Init->getType())) {
       llvm::Value *V = EmitScalarExpr(Init);
-      // FIXME: Handle volatile.
-      Builder.CreateStore(V, DeclPtr);
+      Builder.CreateStore(V, DeclPtr, D.getType().isVolatileQualified());
     } else if (Init->getType()->isComplexType()) {
       EmitComplexExprIntoAddr(Init, DeclPtr);
     } else {
-      // FIXME: Handle volatile.
-      EmitAggExpr(Init, DeclPtr, false);
+      EmitAggExpr(Init, DeclPtr, D.getType().isVolatileQualified());
     }
   }
 }