diff --git a/lib/CodeGen/CGExprAgg.cpp b/lib/CodeGen/CGExprAgg.cpp
index a67f659..902bf16 100644
--- a/lib/CodeGen/CGExprAgg.cpp
+++ b/lib/CodeGen/CGExprAgg.cpp
@@ -619,7 +619,7 @@
         // Zero-initialize.  (Strictly speaking, we only need to intialize
         // the padding at the end, but this is simpler.)
         if (!Dest.isZeroed())
-          CGF.EmitNullInitialization(Dest.getAddr(), type);
+          CGF.EmitNullInitialization(Dest.getAddr(), atomicType);
 
         // Build a GEP to refer to the subobject.
         llvm::Value *valueAddr =
@@ -633,7 +633,7 @@
                                           AggValueSlot::IsZeroed);
       }
       
-      CGF.EmitAggExpr(E->getSubExpr(), valueDest.getDest());
+      CGF.EmitAggExpr(E->getSubExpr(), valueDest);
       return;
     }