aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/Target/CBackend/CBackend.cpp12
1 files changed, 5 insertions, 7 deletions
diff --git a/lib/Target/CBackend/CBackend.cpp b/lib/Target/CBackend/CBackend.cpp
index 334f6fe54f..d01c2ab74a 100644
--- a/lib/Target/CBackend/CBackend.cpp
+++ b/lib/Target/CBackend/CBackend.cpp
@@ -1198,12 +1198,12 @@ void CWriter::writeOperandRaw(Value *Operand) {
}
void CWriter::writeOperand(Value *Operand) {
- if (isa<GlobalVariable>(Operand) || isDirectAlloca(Operand))
+ if (isa<GlobalVariable>(Operand) || isDirectAlloca(Operand) || ByValParams.count(Operand))
Out << "(&"; // Global variables are referenced as their addresses by llvm
writeOperandInternal(Operand);
- if (isa<GlobalVariable>(Operand) || isDirectAlloca(Operand))
+ if (isa<GlobalVariable>(Operand) || isDirectAlloca(Operand) || ByValParams.count(Operand))
Out << ')';
}
@@ -2723,13 +2723,11 @@ void CWriter::visitCallInst(CallInst &I) {
// Check if the argument is expected to be passed by value.
bool isOutByVal = PAL && PAL->paramHasAttr(ArgNo+1, ParamAttr::ByVal);
// Check if this argument itself is passed in by reference.
- bool isInByVal = ByValParams.count(*AI);
- if (isOutByVal && !isInByVal)
+ //bool isInByVal = ByValParams.count(*AI);
+ if (isOutByVal)
Out << "*(";
- else if (!isOutByVal && isInByVal)
- Out << "&(";
writeOperand(*AI);
- if (isOutByVal ^ isInByVal)
+ if (isOutByVal)
Out << ")";
PrintedArg = true;
}