nicolas/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor refactoring: compute the return value separately from emitting the

Browse Source 
ret.

llvm-svn: 51403
This commit is contained in:
Eli Friedman
2008-05-22 01:22:33 +00:00
parent e53d15386f
commit c7460b1011
1 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
clang/lib/CodeGen/CGStmt.cpp
View File

@@ -360,18 +360,21 @@ void CodeGenFunction::EmitReturnStmt(const ReturnStmt &S) {
// Emit the result value, even if unused, to evalute the side effects.
const Expr *RV = S.getRetValue();
llvm::Value* RetValue = 0;
if (FnRetTy->isVoidType()) {
// If the function returns void, emit ret void.
Builder.CreateRetVoid();
// Make sure not to return anything
if (RV) {
// Evaluate the expression for side effects
EmitAnyExpr(RV);
}
} else if (RV == 0) {
// Handle "return;" in a function that returns a value.
const llvm::Type *RetTy = CurFn->getFunctionType()->getReturnType();
if (RetTy == llvm::Type::VoidTy)
Builder.CreateRetVoid(); // struct return etc.
else
Builder.CreateRet(llvm::UndefValue::get(RetTy));
if (RetTy != llvm::Type::VoidTy) {
// Handle "return;" in a function that returns a value.
RetValue = llvm::UndefValue::get(RetTy);
}
} else if (!hasAggregateLLVMType(RV->getType())) {
Builder.CreateRet(EmitScalarExpr(RV));
RetValue = EmitScalarExpr(RV);
} else if (RV->getType()->isAnyComplexType()) {
llvm::Value *SRetPtr = CurFn->arg_begin();
EmitComplexExprIntoAddr(RV, SRetPtr, false);
@@ -379,6 +382,12 @@ void CodeGenFunction::EmitReturnStmt(const ReturnStmt &S) {
llvm::Value *SRetPtr = CurFn->arg_begin();
EmitAggExpr(RV, SRetPtr, false);
}
if (RetValue) {
Builder.CreateRet(RetValue);
} else {
Builder.CreateRetVoid();
}
// Emit a block after the branch so that dead code after a return has some
// place to go.