diff --git a/lib/CodeGen/CGExpr.cpp b/lib/CodeGen/CGExpr.cpp
index 830954f..01820c7 100644
--- a/lib/CodeGen/CGExpr.cpp
+++ b/lib/CodeGen/CGExpr.cpp
@@ -1520,9 +1520,7 @@
 }
 
 LValue CodeGenFunction::EmitCompoundLiteralLValue(const CompoundLiteralExpr* E){
-  llvm::Value *DeclPtr = CreateTempAlloca(ConvertTypeForMem(E->getType()),
-                                          ".compoundliteral");
-
+  llvm::Value *DeclPtr = CreateMemTemp(E->getType(), ".compoundliteral");
   const Expr* InitExpr = E->getInitializer();
   LValue Result = LValue::MakeAddr(DeclPtr, MakeQualifiers(E->getType()));
 
diff --git a/test/CodeGenCXX/alloca-align.cpp b/test/CodeGenCXX/alloca-align.cpp
index de6b34d..b496e03 100644
--- a/test/CodeGenCXX/alloca-align.cpp
+++ b/test/CodeGenCXX/alloca-align.cpp
@@ -1,12 +1,19 @@
 // RUN: %clang_cc1 -triple x86_64-unknown-unknown -emit-llvm -o - %s | FileCheck %s
 //
-// CHECK: alloca %struct.MemsetRange, align 16
+// CHECK: define void @f0
+// CHECK: alloca %struct.s0, align 16
+// CHECK: define void @f1
+// CHECK: alloca %struct.s0, align 16
 
-struct MemsetRange {
+struct s0 {
   int Start, End;
   unsigned Alignment;
   int TheStores __attribute__((aligned(16)));
 };
-void foobar() {
-  (void) MemsetRange();
+extern "C" void f0() {
+  (void) s0();
+}
+
+extern "C" void f1() {
+  (struct s0) { 0, 0, 0, 0 };
 }