@@ -349,7 +349,6 @@ struct ICallBranchFunnel final
349349
350350struct ScopedSaveAliaseesAndUsed {
351351 Module &M;
352- std::set<GlobalAlias *> *ExcludedAliases;
353352 SmallVector<GlobalValue *, 4 > Used, CompilerUsed;
354353 std::vector<std::pair<GlobalAlias *, Function *>> FunctionAliases;
355354 std::vector<std::pair<GlobalIFunc *, Function *>> ResolverIFuncs;
@@ -378,9 +377,7 @@ struct ScopedSaveAliaseesAndUsed {
378377 Vec.resize (NonFuncBegin - Vec.begin ());
379378 }
380379
381- ScopedSaveAliaseesAndUsed (Module &M,
382- std::set<GlobalAlias *> *ExcludedAliases = nullptr )
383- : M(M), ExcludedAliases(ExcludedAliases) {
380+ ScopedSaveAliaseesAndUsed (Module &M) : M(M) {
384381 // The users of this class want to replace all function references except
385382 // for aliases and llvm.used/llvm.compiler.used with references to a jump
386383 // table. We avoid replacing aliases in order to avoid introducing a double
@@ -399,9 +396,8 @@ struct ScopedSaveAliaseesAndUsed {
399396 for (auto &GA : M.aliases ()) {
400397 // FIXME: This should look past all aliases not just interposable ones,
401398 // see discussion on D65118.
402- if (!ExcludedAliases || !ExcludedAliases->count (&GA))
403- if (auto *F = dyn_cast<Function>(GA.getAliasee ()->stripPointerCasts ()))
404- FunctionAliases.push_back ({&GA, F});
399+ if (auto *F = dyn_cast<Function>(GA.getAliasee ()->stripPointerCasts ()))
400+ FunctionAliases.push_back ({&GA, F});
405401 }
406402
407403 for (auto &GI : M.ifuncs ())
@@ -2251,7 +2247,6 @@ bool LowerTypeTestsModule::lower() {
22512247
22522248 // Parse alias data to replace stand-in function declarations for aliases
22532249 // with an alias to the intended target.
2254- std::set<GlobalAlias *> ExcludedAliases;
22552250 if (ExportSummary) {
22562251 if (NamedMDNode *AliasesMD = M.getNamedMetadata (" aliases" )) {
22572252 for (auto *AliasMD : AliasesMD->operands ()) {
@@ -2428,7 +2423,7 @@ bool LowerTypeTestsModule::lower() {
24282423 return false ;
24292424
24302425 {
2431- ScopedSaveAliaseesAndUsed S (M, &ExcludedAliases );
2426+ ScopedSaveAliaseesAndUsed S (M);
24322427 // For each disjoint set we found...
24332428 for (const auto &C : GlobalClasses) {
24342429 if (!C->isLeader ())
0 commit comments