intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-01-27 06:06:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Wdeprecated: ByrefHelpers are copy constructed by the ::buildByrefHelpers helper, make sure they're safely copyable

Browse Source 
Make the copy/move ctors protected and defaulted in the base, make the
derived classes final to avoid exposing any slicing-prone APIs.

Also, while I'm here, simplify the use of buildByrefHelpers by taking
the parameter by value instead of non-const ref. None of the callers
care aobut observing the state after the call.

llvm-svn: 244990
This commit is contained in:
David Blaikie
2015-08-13 23:53:09 +00:00
parent 2dcef9e0a4
commit 9255161665
2 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
clang/lib/CodeGen/CGBlocks.cpp
View File

@@ -1599,7 +1599,7 @@ CodeGenFunction::GenerateDestroyHelperFunction(const CGBlockInfo &blockInfo) {
namespace {
/// Emits the copy/dispose helper functions for a __block object of id type.
class ObjectByrefHelpers : public CodeGenModule::ByrefHelpers {
class ObjectByrefHelpers final : public CodeGenModule::ByrefHelpers {
BlockFieldFlags Flags;
public:
@@ -1635,7 +1635,7 @@ public:
};
/// Emits the copy/dispose helpers for an ARC __block __weak variable.
class ARCWeakByrefHelpers : public CodeGenModule::ByrefHelpers {
class ARCWeakByrefHelpers final : public CodeGenModule::ByrefHelpers {
public:
ARCWeakByrefHelpers(CharUnits alignment) : ByrefHelpers(alignment) {}
@@ -1656,7 +1656,7 @@ public:
/// Emits the copy/dispose helpers for an ARC __block __strong variable
/// that's not of block-pointer type.
class ARCStrongByrefHelpers : public CodeGenModule::ByrefHelpers {
class ARCStrongByrefHelpers final : public CodeGenModule::ByrefHelpers {
public:
ARCStrongByrefHelpers(CharUnits alignment) : ByrefHelpers(alignment) {}
@@ -1697,7 +1697,7 @@ public:
/// Emits the copy/dispose helpers for an ARC __block __strong
/// variable that's of block-pointer type.
class ARCStrongBlockByrefHelpers : public CodeGenModule::ByrefHelpers {
class ARCStrongBlockByrefHelpers final : public CodeGenModule::ByrefHelpers {
public:
ARCStrongBlockByrefHelpers(CharUnits alignment) : ByrefHelpers(alignment) {}
@@ -1727,7 +1727,7 @@ public:
/// Emits the copy/dispose helpers for a __block variable with a
/// nontrivial copy constructor or destructor.
class CXXByrefHelpers : public CodeGenModule::ByrefHelpers {
class CXXByrefHelpers final : public CodeGenModule::ByrefHelpers {
QualType VarType;
const Expr *CopyExpr;
@@ -1894,10 +1894,9 @@ static llvm::Constant *buildByrefDisposeHelper(CodeGenModule &CGM,
/// Lazily build the copy and dispose helpers for a __block variable
/// with the given information.
template <class T> static T *buildByrefHelpers(CodeGenModule &CGM,
llvm::StructType &byrefTy,
unsigned byrefValueIndex,
T &byrefInfo) {
template <class T>
static T *buildByrefHelpers(CodeGenModule &CGM, llvm::StructType &byrefTy,
unsigned byrefValueIndex, T byrefInfo) {
// Increase the field's alignment to be at least pointer alignment,
// since the layout of the byref struct will guarantee at least that.
byrefInfo.Alignment = std::max(byrefInfo.Alignment,
@@ -1916,7 +1915,7 @@ template <class T> static T *buildByrefHelpers(CodeGenModule &CGM,
byrefInfo.DisposeHelper =
buildByrefDisposeHelper(CGM, byrefTy, byrefValueIndex,byrefInfo);
T *copy = new (CGM.getContext()) T(byrefInfo);
T *copy = new (CGM.getContext()) T(std::move(byrefInfo));
CGM.ByrefHelpersCache.InsertNode(copy, insertPos);
return copy;
}
@@ -1936,8 +1935,9 @@ CodeGenFunction::buildByrefHelpers(llvm::StructType &byrefType,
const Expr *copyExpr = CGM.getContext().getBlockVarCopyInits(&var);
if (!copyExpr && record->hasTrivialDestructor()) return nullptr;
CXXByrefHelpers byrefInfo(emission.Alignment, type, copyExpr);
return ::buildByrefHelpers(CGM, byrefType, byrefValueIndex, byrefInfo);
return ::buildByrefHelpers(
CGM, byrefType, byrefValueIndex,
CXXByrefHelpers(emission.Alignment, type, copyExpr));
}
// Otherwise, if we don't have a retainable type, there's nothing to do.
@@ -1960,24 +1960,24 @@ CodeGenFunction::buildByrefHelpers(llvm::StructType &byrefType,
// Tell the runtime that this is ARC __weak, called by the
// byref routines.
case Qualifiers::OCL_Weak: {
ARCWeakByrefHelpers byrefInfo(emission.Alignment);
return ::buildByrefHelpers(CGM, byrefType, byrefValueIndex, byrefInfo);
}
case Qualifiers::OCL_Weak:
return ::buildByrefHelpers(CGM, byrefType, byrefValueIndex,
ARCWeakByrefHelpers(emission.Alignment));
// ARC __strong __block variables need to be retained.
case Qualifiers::OCL_Strong:
// Block pointers need to be copied, and there's no direct
// transfer possible.
if (type->isBlockPointerType()) {
ARCStrongBlockByrefHelpers byrefInfo(emission.Alignment);
return ::buildByrefHelpers(CGM, byrefType, byrefValueIndex, byrefInfo);
return ::buildByrefHelpers(
CGM, byrefType, byrefValueIndex,
ARCStrongBlockByrefHelpers(emission.Alignment));
// Otherwise, we transfer ownership of the retain from the stack
// to the heap.
} else {
ARCStrongByrefHelpers byrefInfo(emission.Alignment);
return ::buildByrefHelpers(CGM, byrefType, byrefValueIndex, byrefInfo);
return ::buildByrefHelpers(CGM, byrefType, byrefValueIndex,
ARCStrongByrefHelpers(emission.Alignment));
}
}
llvm_unreachable("fell out of lifetime switch!");
@@ -1996,8 +1996,8 @@ CodeGenFunction::buildByrefHelpers(llvm::StructType &byrefType,
if (type.isObjCGCWeak())
flags |= BLOCK_FIELD_IS_WEAK;
ObjectByrefHelpers byrefInfo(emission.Alignment, flags);
return ::buildByrefHelpers(CGM, byrefType, byrefValueIndex, byrefInfo);
return ::buildByrefHelpers(CGM, byrefType, byrefValueIndex,
ObjectByrefHelpers(emission.Alignment, flags));
}
std::pair<llvm::Type *, unsigned>

1
clang/lib/CodeGen/CodeGenModule.h
View File

@@ -766,6 +766,7 @@ public:
CharUnits Alignment;
ByrefHelpers(CharUnits alignment) : Alignment(alignment) {}
ByrefHelpers(const ByrefHelpers &) = default;
virtual ~ByrefHelpers();
void Profile(llvm::FoldingSetNodeID &id) const {