Re-commit r208025, reverted in r208030, with a fix for a conformance issue

which GCC detects and Clang does not!


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@208033 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Richard Smith
2014-05-06 01:44:26 +00:00
parent f3a199b2ae
commit 36ecb2ee9d
9 changed files with 227 additions and 46 deletions

View File

@ -132,8 +132,8 @@ GlobalVariable *findGlobalCtors(Module &M) {
/// Call "ShouldRemove" for every entry in M's global_ctor list and remove the
/// entries for which it returns true. Return true if anything changed.
bool optimizeGlobalCtorsList(Module &M, ShouldRemoveCtor ShouldRemove,
void *Context) {
bool optimizeGlobalCtorsList(Module &M,
function_ref<bool(Function *)> ShouldRemove) {
GlobalVariable *GlobalCtors = findGlobalCtors(M);
if (!GlobalCtors)
return false;
@ -163,7 +163,7 @@ bool optimizeGlobalCtorsList(Module &M, ShouldRemoveCtor ShouldRemove,
continue;
// If we can evaluate the ctor at compile time, do.
if (ShouldRemove(Context, F)) {
if (ShouldRemove(F)) {
Ctors.erase(Ctors.begin() + i);
MadeChange = true;
--i;