implement support for asm outputs targetting non-simple lvalue destinations
like bitfields. incidentally llvm-gcc crashes on this sort of thing also. :)
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@70675 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/CGStmt.cpp b/lib/CodeGen/CGStmt.cpp
index f435f9c..aefb3e5 100644
--- a/lib/CodeGen/CGStmt.cpp
+++ b/lib/CodeGen/CGStmt.cpp
@@ -803,7 +803,9 @@
std::string Constraints;
- std::vector<llvm::Value *> ResultAddrs;
+ std::vector<LValue> ResultRegDests;
+ std::vector<QualType> ResultRegQualTys;
+
std::vector<const llvm::Type *> ResultTypes;
std::vector<const llvm::Type*> ArgTypes;
@@ -827,15 +829,13 @@
OutExpr = OutExpr->IgnoreParenNoopCasts(getContext());
LValue Dest = EmitLValue(OutExpr);
- const llvm::Type *DestValueType =
- cast<llvm::PointerType>(Dest.getAddress()->getType())->getElementType();
-
- if (i != 0)
+ if (!Constraints.empty())
Constraints += ',';
- if (!Info.allowsMemory() && DestValueType->isSingleValueType()) {
- ResultAddrs.push_back(Dest.getAddress());
- ResultTypes.push_back(DestValueType);
+ if (!Info.allowsMemory() && !hasAggregateLLVMType(OutExpr->getType())) {
+ ResultRegQualTys.push_back(OutExpr->getType());
+ ResultRegDests.push_back(Dest);
+ ResultTypes.push_back(ConvertTypeForMem(OutExpr->getType()));
Constraints += "=" + OutputConstraint;
} else {
ArgTypes.push_back(Dest.getAddress()->getType());
@@ -867,7 +867,7 @@
TargetInfo::ConstraintInfo &Info = InputConstraintInfos[i];
- if (i != 0 || S.getNumOutputs() > 0)
+ if (!Constraints.empty())
Constraints += ',';
// Simplify the input constraint.
@@ -952,11 +952,13 @@
Result->addAttribute(~0, llvm::Attribute::NoUnwind);
if (ResultTypes.size() == 1) {
- Builder.CreateStore(Result, ResultAddrs[0]);
+ EmitStoreThroughLValue(RValue::get(Result), ResultRegDests[0],
+ ResultRegQualTys[0]);
} else {
for (unsigned i = 0, e = ResultTypes.size(); i != e; ++i) {
llvm::Value *Tmp = Builder.CreateExtractValue(Result, i, "asmresult");
- Builder.CreateStore(Tmp, ResultAddrs[i]);
+ EmitStoreThroughLValue(RValue::get(Tmp), ResultRegDests[i],
+ ResultRegQualTys[i]);
}
}
}