Track volatile aggregate copies better. I'm hoping someone else will decide

how to get the backend to know that the operation is volatile.

llvm-svn: 72348
This commit is contained in:
Mike Stump 2009-05-23 22:29:41 +00:00
parent 332ec2ce81
commit 5e9e61b8d2
2 changed files with 11 additions and 4 deletions

View File

@ -144,7 +144,8 @@ void AggExprEmitter::EmitFinalDestCopy(const Expr *E, RValue Src) {
// FIXME: Pass VolatileDest as well. I think we also need to merge volatile
// from the source as well, as we can't eliminate it if either operand
// is volatile, unless copy has volatile for both source and destination..
CGF.EmitAggregateCopy(DestPtr, Src.getAggregateAddr(), E->getType());
CGF.EmitAggregateCopy(DestPtr, Src.getAggregateAddr(), E->getType(),
VolatileDest|Src.isVolatileQualified());
}
/// EmitFinalDestCopy - Perform the final copy to DestPtr, if desired.
@ -484,7 +485,8 @@ void CodeGenFunction::EmitAggregateClear(llvm::Value *DestPtr, QualType Ty) {
}
void CodeGenFunction::EmitAggregateCopy(llvm::Value *DestPtr,
llvm::Value *SrcPtr, QualType Ty) {
llvm::Value *SrcPtr, QualType Ty,
bool isVolatile) {
assert(!Ty->isAnyComplexType() && "Shouldn't happen for complex");
// Aggregate assignment turns into llvm.memcpy. This is almost valid per
@ -520,7 +522,8 @@ void CodeGenFunction::EmitAggregateCopy(llvm::Value *DestPtr,
// }
//
// either, we need to use a differnt call here, or the backend needs to be
// taught to not do this.
// taught to not do this. We use isVolatile to indicate when either the
// source or the destination is volatile.
Builder.CreateCall4(CGM.getMemCpyFn(),
DestPtr, SrcPtr,
// TypeInfo.first describes size in bits.

View File

@ -419,8 +419,12 @@ public:
RValue EmitAnyExprToTemp(const Expr *E, llvm::Value *AggLoc = 0,
bool isAggLocVolatile = false);
/// EmitAggregateCopy - Emit an aggrate copy.
///
/// \param isVolatile - True iff either the source or the destination is
/// volatile.
void EmitAggregateCopy(llvm::Value *DestPtr, llvm::Value *SrcPtr,
QualType EltTy);
QualType EltTy, bool isVolatile=false);
void EmitAggregateClear(llvm::Value *DestPtr, QualType Ty);