maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Initialize AggValueSlot's flags along all paths, plus minor beautification. 

Prospective fix for broken commit in r114045.

llvm-svn: 114060
This commit is contained in:
John McCall 2010-09-16 03:13:23 +00:00
parent 561cd86acf
commit 58649dc609
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
clang/lib/CodeGen/CGExprAgg.cpp
View File

@ -39,7 +39,7 @@ class AggExprEmitter : public StmtVisitor<AggExprEmitter> {
// If the destination slot requires garbage collection, we can't
// use the real return value slot, because we have to use the GC
// API.
if (Dest.isRequiresGCollection()) return ReturnValueSlot();
if (Dest.requiresGCollection()) return ReturnValueSlot();
return ReturnValueSlot(Dest.getAddr(), Dest.isVolatile());
}
@ -177,7 +177,7 @@ bool AggExprEmitter::TypeRequiresGCollection(QualType T) {
/// directly into the return value slot. If GC does interfere, a final
/// move will be performed.
void AggExprEmitter::EmitGCMove(const Expr *E, RValue Src) {
if (Dest.isRequiresGCollection()) {
if (Dest.requiresGCollection()) {
std::pair<uint64_t, unsigned> TypeInfo =
CGF.getContext().getTypeInfo(E->getType());
unsigned long size = TypeInfo.first/8;
@ -210,7 +210,7 @@ void AggExprEmitter::EmitFinalDestCopy(const Expr *E, RValue Src, bool Ignore) {
Dest = CGF.CreateAggTemp(E->getType(), "agg.tmp");
}
if (Dest.isRequiresGCollection()) {
if (Dest.requiresGCollection()) {
std::pair<uint64_t, unsigned> TypeInfo =
CGF.getContext().getTypeInfo(E->getType());
unsigned long size = TypeInfo.first/8;

14
clang/lib/CodeGen/CGValue.h
View File

@ -347,14 +347,16 @@ public:
/// \param LifetimeExternallyManaged - true if the slot's lifetime
/// is being externally managed; false if a destructor should be
/// registered for any temporaries evaluated into the slot
/// \param RequiresGCollection - true if the slot is located
/// somewhere that ObjC GC calls should be emitted for
static AggValueSlot forAddr(llvm::Value *Addr, bool Volatile,
bool LifetimeExternallyManaged,
bool RequiresGCollection=false) {
AggValueSlot AV;
AV.AddrAndFlags = reinterpret_cast<uintptr_t>(Addr);
if (Volatile) AV.VolatileFlag = 1;
if (LifetimeExternallyManaged) AV.LifetimeFlag = 1;
if (RequiresGCollection) AV.RequiresGCollection = 1;
AV.VolatileFlag = Volatile;
AV.LifetimeFlag = LifetimeExternallyManaged;
AV.RequiresGCollection = RequiresGCollection;
return AV;
}
@ -368,18 +370,18 @@ public:
return LifetimeFlag;
}
void setLifetimeExternallyManaged() {
LifetimeFlag = 1;
LifetimeFlag = true;
}
bool isVolatile() const {
return VolatileFlag;
}
bool isRequiresGCollection() const {
bool requiresGCollection() const {
return RequiresGCollection;
}
void setRequiresGCollection() {
RequiresGCollection = 1;
RequiresGCollection = true;
}
llvm::Value *getAddr() const {