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

Revert "Update to LLVM's use of WeakTrackingVH; NFC" 

This reverts commit r301427.

llvm-svn: 301430
This commit is contained in:
Sanjoy Das 2017-04-26 16:37:51 +00:00
parent 2cbeb00f38
commit a84ae0b943
5 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
clang/lib/CodeGen/CGDeclCXX.cpp
View File

@ -571,10 +571,9 @@ CodeGenFunction::GenerateCXXGlobalInitFunc(llvm::Function *Fn,
FinishFunction(); FinishFunction();
} }
void CodeGenFunction::GenerateCXXGlobalDtorsFunc( void CodeGenFunction::GenerateCXXGlobalDtorsFunc(llvm::Function *Fn,
llvm::Function *Fn, const std::vector<std::pair<llvm::WeakVH, llvm::Constant*> >
const std::vector<std::pair<llvm::WeakTrackingVH, llvm::Constant *>> &DtorsAndObjects) {
&DtorsAndObjects) {
{ {
auto NL = ApplyDebugLocation::CreateEmpty(*this); auto NL = ApplyDebugLocation::CreateEmpty(*this);
StartFunction(GlobalDecl(), getContext().VoidTy, Fn, StartFunction(GlobalDecl(), getContext().VoidTy, Fn,

2
clang/lib/CodeGen/CGObjCMac.cpp
View File

@ -886,7 +886,7 @@ protected:
/// Cached reference to the class for constant strings. This value has type /// Cached reference to the class for constant strings. This value has type
/// int * but is actually an Obj-C class pointer. /// int * but is actually an Obj-C class pointer.
llvm::WeakTrackingVH ConstantStringClassRef; llvm::WeakVH ConstantStringClassRef;
/// \brief The LLVM type corresponding to NSConstantString. /// \brief The LLVM type corresponding to NSConstantString.
llvm::StructType *NSConstantStringType = nullptr; llvm::StructType *NSConstantStringType = nullptr;

7
clang/lib/CodeGen/CodeGenFunction.h
View File

@ -3470,10 +3470,9 @@ public:
/// GenerateCXXGlobalDtorsFunc - Generates code for destroying global /// GenerateCXXGlobalDtorsFunc - Generates code for destroying global
/// variables. /// variables.
void GenerateCXXGlobalDtorsFunc( void GenerateCXXGlobalDtorsFunc(llvm::Function *Fn,
llvm::Function *Fn, const std::vector<std::pair<llvm::WeakVH,
const std::vector<std::pair<llvm::WeakTrackingVH, llvm::Constant *>> llvm::Constant*> > &DtorsAndObjects);
&DtorsAndObjects);
void GenerateCXXGlobalVarDeclInitFunc(llvm::Function *Fn, void GenerateCXXGlobalVarDeclInitFunc(llvm::Function *Fn,
const VarDecl *D, const VarDecl *D,

2
clang/lib/CodeGen/CodeGenModule.cpp
View File

@ -1150,7 +1150,7 @@ void CodeGenModule::addCompilerUsedGlobal(llvm::GlobalValue *GV) {
} }
static void emitUsed(CodeGenModule &CGM, StringRef Name, static void emitUsed(CodeGenModule &CGM, StringRef Name,
std::vector<llvm::WeakTrackingVH> &List) { std::vector<llvm::WeakVH> &List) {
// Don't create llvm.used if there is no need. // Don't create llvm.used if there is no need.
if (List.empty()) if (List.empty())
return; return;

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

@ -349,8 +349,8 @@ private:
/// List of global values which are required to be present in the object file; /// List of global values which are required to be present in the object file;
/// bitcast to i8*. This is used for forcing visibility of symbols which may /// bitcast to i8*. This is used for forcing visibility of symbols which may
/// otherwise be optimized out. /// otherwise be optimized out.
std::vector<llvm::WeakTrackingVH> LLVMUsed; std::vector<llvm::WeakVH> LLVMUsed;
std::vector<llvm::WeakTrackingVH> LLVMCompilerUsed; std::vector<llvm::WeakVH> LLVMCompilerUsed;
/// Store the list of global constructors and their respective priorities to /// Store the list of global constructors and their respective priorities to
/// be emitted when the translation unit is complete. /// be emitted when the translation unit is complete.
@ -421,7 +421,7 @@ private:
SmallVector<GlobalInitData, 8> PrioritizedCXXGlobalInits; SmallVector<GlobalInitData, 8> PrioritizedCXXGlobalInits;
/// Global destructor functions and arguments that need to run on termination. /// Global destructor functions and arguments that need to run on termination.
std::vector<std::pair<llvm::WeakTrackingVH, llvm::Constant *>> CXXGlobalDtors; std::vector<std::pair<llvm::WeakVH,llvm::Constant*> > CXXGlobalDtors;
/// \brief The complete set of modules that has been imported. /// \brief The complete set of modules that has been imported.
llvm::SetVector<clang::Module *> ImportedModules; llvm::SetVector<clang::Module *> ImportedModules;
@ -438,7 +438,7 @@ private:
/// Cached reference to the class for constant strings. This value has type /// Cached reference to the class for constant strings. This value has type
/// int * but is actually an Obj-C class pointer. /// int * but is actually an Obj-C class pointer.
llvm::WeakTrackingVH CFConstantStringClassRef; llvm::WeakVH CFConstantStringClassRef;
/// \brief The type used to describe the state of a fast enumeration in /// \brief The type used to describe the state of a fast enumeration in
/// Objective-C's for..in loop. /// Objective-C's for..in loop.