IRgen: Switch 'retval' to use CreateIRTemp.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@96376 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/CodeGen/CodeGenFunction.cpp b/lib/CodeGen/CodeGenFunction.cpp
index 5a4f94e3e092c61a4bcab31ff8ab77d399d48eb4..febffc96973e4c4c592b0f7b490087080daeb794 100644 (file)
--- a/lib/CodeGen/CodeGenFunction.cpp
+++ b/lib/CodeGen/CodeGenFunction.cpp
@@ -216,10 +216,10 @@ void CodeGenFunction::StartFunction(GlobalDecl GD, QualType RetTy,
   } else if (CurFnInfo->getReturnInfo().getKind() == ABIArgInfo::Indirect &&
              hasAggregateLLVMType(CurFnInfo->getReturnType())) {
     // Indirect aggregate return; emit returned value directly into sret slot.
-    // This reduces code size, and is also affects correctness in C++.
+    // This reduces code size, and affects correctness in C++.
     ReturnValue = CurFn->arg_begin();
   } else {
-    ReturnValue = CreateTempAlloca(ConvertType(RetTy), "retval");
+    ReturnValue = CreateIRTemp(RetTy, "retval");
   }
 
   EmitStartEHSpec(CurCodeDecl);

diff --git a/test/CodeGenCXX/alloca-align.cpp b/test/CodeGenCXX/alloca-align.cpp
index b496e039e95aabf021e7ee0f76cb4c6ee6641797..b70e366f4cfbd66ba92f98ba58241afd1f58e8f0 100644 (file)
--- a/test/CodeGenCXX/alloca-align.cpp
+++ b/test/CodeGenCXX/alloca-align.cpp
@@ -1,19 +1,28 @@
 // RUN: %clang_cc1 -triple x86_64-unknown-unknown -emit-llvm -o - %s | FileCheck %s
-//
-// CHECK: define void @f0
-// CHECK: alloca %struct.s0, align 16
-// CHECK: define void @f1
-// CHECK: alloca %struct.s0, align 16
 
 struct s0 {
   int Start, End;
   unsigned Alignment;
   int TheStores __attribute__((aligned(16)));
 };
+
+// CHECK: define void @f0
+// CHECK: alloca %struct.s0, align 16
 extern "C" void f0() {
   (void) s0();
 }
 
+// CHECK: define void @f1
+// CHECK: alloca %struct.s0, align 16
 extern "C" void f1() {
-  (struct s0) { 0, 0, 0, 0 };
+  (void) (struct s0) { 0, 0, 0, 0 };
+}
+
+// CHECK: define i64 @f2
+// CHECK: alloca %struct.s1, align 2
+struct s1 { short x; short y; };
+extern "C" struct s1 f2(int a, struct s1 *x, struct s1 *y) {
+  if (a)
+    return *x;
+  return *y;
 }