forked from OSchip/llvm-project
parent
cebcb3b52f
commit
b54db52a7b
|
@ -205,11 +205,9 @@ void CodeGenModule::addReplacement(StringRef Name, llvm::Constant *C) {
|
|||
}
|
||||
|
||||
void CodeGenModule::applyReplacements() {
|
||||
for (ReplacementsTy::iterator I = Replacements.begin(),
|
||||
E = Replacements.end();
|
||||
I != E; ++I) {
|
||||
StringRef MangledName = I->first();
|
||||
llvm::Constant *Replacement = I->second;
|
||||
for (auto &I : Replacements) {
|
||||
StringRef MangledName = I.first();
|
||||
llvm::Constant *Replacement = I.second;
|
||||
llvm::GlobalValue *Entry = GetGlobalValue(MangledName);
|
||||
if (!Entry)
|
||||
continue;
|
||||
|
@ -261,9 +259,7 @@ void CodeGenModule::checkAliases() {
|
|||
// and aliases during codegen.
|
||||
bool Error = false;
|
||||
DiagnosticsEngine &Diags = getDiags();
|
||||
for (std::vector<GlobalDecl>::iterator I = Aliases.begin(),
|
||||
E = Aliases.end(); I != E; ++I) {
|
||||
const GlobalDecl &GD = *I;
|
||||
for (const GlobalDecl &GD : Aliases) {
|
||||
const auto *D = cast<ValueDecl>(GD.getDecl());
|
||||
const AliasAttr *AA = D->getAttr<AliasAttr>();
|
||||
StringRef MangledName = getMangledName(GD);
|
||||
|
@ -310,9 +306,7 @@ void CodeGenModule::checkAliases() {
|
|||
if (!Error)
|
||||
return;
|
||||
|
||||
for (std::vector<GlobalDecl>::iterator I = Aliases.begin(),
|
||||
E = Aliases.end(); I != E; ++I) {
|
||||
const GlobalDecl &GD = *I;
|
||||
for (const GlobalDecl &GD : Aliases) {
|
||||
StringRef MangledName = getMangledName(GD);
|
||||
llvm::GlobalValue *Entry = GetGlobalValue(MangledName);
|
||||
auto *Alias = cast<llvm::GlobalAlias>(Entry);
|
||||
|
@ -637,15 +631,14 @@ void CodeGenModule::EmitCtorList(const CtorList &Fns, const char *GlobalName) {
|
|||
Int32Ty, llvm::PointerType::getUnqual(CtorFTy), VoidPtrTy, nullptr);
|
||||
|
||||
// Construct the constructor and destructor arrays.
|
||||
SmallVector<llvm::Constant*, 8> Ctors;
|
||||
for (CtorList::const_iterator I = Fns.begin(), E = Fns.end(); I != E; ++I) {
|
||||
SmallVector<llvm::Constant *, 8> Ctors;
|
||||
for (const auto &I : Fns) {
|
||||
llvm::Constant *S[] = {
|
||||
llvm::ConstantInt::get(Int32Ty, I->Priority, false),
|
||||
llvm::ConstantExpr::getBitCast(I->Initializer, CtorPFTy),
|
||||
(I->AssociatedData
|
||||
? llvm::ConstantExpr::getBitCast(I->AssociatedData, VoidPtrTy)
|
||||
: llvm::Constant::getNullValue(VoidPtrTy))
|
||||
};
|
||||
llvm::ConstantInt::get(Int32Ty, I.Priority, false),
|
||||
llvm::ConstantExpr::getBitCast(I.Initializer, CtorPFTy),
|
||||
(I.AssociatedData
|
||||
? llvm::ConstantExpr::getBitCast(I.AssociatedData, VoidPtrTy)
|
||||
: llvm::Constant::getNullValue(VoidPtrTy))};
|
||||
Ctors.push_back(llvm::ConstantStruct::get(CtorStructTy, S));
|
||||
}
|
||||
|
||||
|
@ -1029,12 +1022,9 @@ void CodeGenModule::EmitModuleLinkOptions() {
|
|||
SmallVector<clang::Module *, 16> Stack;
|
||||
|
||||
// Seed the stack with imported modules.
|
||||
for (llvm::SetVector<clang::Module *>::iterator M = ImportedModules.begin(),
|
||||
MEnd = ImportedModules.end();
|
||||
M != MEnd; ++M) {
|
||||
if (Visited.insert(*M).second)
|
||||
Stack.push_back(*M);
|
||||
}
|
||||
for (Module *M : ImportedModules)
|
||||
if (Visited.insert(M).second)
|
||||
Stack.push_back(M);
|
||||
|
||||
// Find all of the modules to import, making a little effort to prune
|
||||
// non-leaf modules.
|
||||
|
@ -1070,12 +1060,9 @@ void CodeGenModule::EmitModuleLinkOptions() {
|
|||
// to linker options inserted by things like #pragma comment().
|
||||
SmallVector<llvm::Metadata *, 16> MetadataArgs;
|
||||
Visited.clear();
|
||||
for (llvm::SetVector<clang::Module *>::iterator M = LinkModules.begin(),
|
||||
MEnd = LinkModules.end();
|
||||
M != MEnd; ++M) {
|
||||
if (Visited.insert(*M).second)
|
||||
addLinkOptionsPostorder(*this, *M, MetadataArgs, Visited);
|
||||
}
|
||||
for (Module *M : LinkModules)
|
||||
if (Visited.insert(M).second)
|
||||
addLinkOptionsPostorder(*this, M, MetadataArgs, Visited);
|
||||
std::reverse(MetadataArgs.begin(), MetadataArgs.end());
|
||||
LinkerOptionsMetadata.append(MetadataArgs.begin(), MetadataArgs.end());
|
||||
|
||||
|
@ -3510,11 +3497,9 @@ static void EmitGlobalDeclMetadata(CodeGenModule &CGM,
|
|||
/// to such functions with an unmangled name from inline assembly within the
|
||||
/// same translation unit.
|
||||
void CodeGenModule::EmitStaticExternCAliases() {
|
||||
for (StaticExternCMap::iterator I = StaticExternCValues.begin(),
|
||||
E = StaticExternCValues.end();
|
||||
I != E; ++I) {
|
||||
IdentifierInfo *Name = I->first;
|
||||
llvm::GlobalValue *Val = I->second;
|
||||
for (auto &I : StaticExternCValues) {
|
||||
IdentifierInfo *Name = I.first;
|
||||
llvm::GlobalValue *Val = I.second;
|
||||
if (Val && !getModule().getNamedValue(Name->getName()))
|
||||
addUsedGlobal(llvm::GlobalAlias::create(Name->getName(), Val));
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue