Skip to content

Commit 537a94b

Browse files
authored
Revert "[NewPM] Add pass options for InternalizePass to preserve GVs." (#92321)
Reverts #91334 This broke the gcc7 build. I suspect the issue is a mismatch on user-defined move constructor on the return: `return PreservedGVs;` does not match the return type of the function.
1 parent 1daa7fd commit 537a94b

File tree

3 files changed

+1
-37
lines changed

3 files changed

+1
-37
lines changed

llvm/lib/Passes/PassBuilder.cpp

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1142,24 +1142,6 @@ Expected<GlobalMergeOptions> parseGlobalMergeOptions(StringRef Params) {
11421142
return Result;
11431143
}
11441144

1145-
Expected<SmallVector<std::string, 0>> parseInternalizeGVs(StringRef Params) {
1146-
SmallVector<std::string, 1> PreservedGVs;
1147-
while (!Params.empty()) {
1148-
StringRef ParamName;
1149-
std::tie(ParamName, Params) = Params.split(';');
1150-
1151-
if (ParamName.consume_front("preserve-gv=")) {
1152-
PreservedGVs.push_back(ParamName.str());
1153-
} else {
1154-
return make_error<StringError>(
1155-
formatv("invalid Internalize pass parameter '{0}' ", ParamName).str(),
1156-
inconvertibleErrorCode());
1157-
}
1158-
}
1159-
1160-
return PreservedGVs;
1161-
}
1162-
11631145
} // namespace
11641146

11651147
/// Tests whether a pass name starts with a valid prefix for a default pipeline

llvm/lib/Passes/PassRegistry.def

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ MODULE_PASS("insert-gcov-profiling", GCOVProfilerPass())
7878
MODULE_PASS("instrorderfile", InstrOrderFilePass())
7979
MODULE_PASS("instrprof", InstrProfilingLoweringPass())
8080
MODULE_PASS("ctx-instr-lower", PGOCtxProfLoweringPass())
81+
MODULE_PASS("internalize", InternalizePass())
8182
MODULE_PASS("invalidate<all>", InvalidateAllAnalysesPass())
8283
MODULE_PASS("iroutliner", IROutlinerPass())
8384
MODULE_PASS("jmc-instrumenter", JMCInstrumenterPass())
@@ -174,20 +175,6 @@ MODULE_PASS_WITH_PARAMS(
174175
"hwasan", "HWAddressSanitizerPass",
175176
[](HWAddressSanitizerOptions Opts) { return HWAddressSanitizerPass(Opts); },
176177
parseHWASanPassOptions, "kernel;recover")
177-
MODULE_PASS_WITH_PARAMS(
178-
"internalize", "InternalizePass",
179-
[](SmallVector<std::string, 0> PreservedGVs) {
180-
if (PreservedGVs.empty())
181-
return InternalizePass();
182-
auto MustPreserveGV = [=](const GlobalValue &GV) {
183-
for (auto &PreservedGV : PreservedGVs)
184-
if (GV.getName() == PreservedGV)
185-
return true;
186-
return false;
187-
};
188-
return InternalizePass(MustPreserveGV);
189-
},
190-
parseInternalizeGVs, "preserve-gv=GV")
191178
MODULE_PASS_WITH_PARAMS(
192179
"ipsccp", "IPSCCPPass", [](IPSCCPOptions Opts) { return IPSCCPPass(Opts); },
193180
parseIPSCCPOptions, "no-func-spec;func-spec")

llvm/test/Transforms/Internalize/lists.ll

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,6 @@
1313
; -file and -list options should be merged, the apifile contains foo and j
1414
; RUN: opt < %s -passes=internalize -internalize-public-api-list bar -internalize-public-api-file %S/apifile -S | FileCheck --check-prefix=FOO_J_AND_BAR %s
1515

16-
; specifying through pass builder option
17-
; RUN: opt < %s -passes='internalize<preserve-gv=foo;preserve-gv=j>' -S | FileCheck --check-prefix=FOO_AND_J %s
18-
; RUN: opt < %s -passes='internalize<preserve-gv=foo;preserve-gv=bar>' -S | FileCheck --check-prefix=FOO_AND_BAR %s
19-
; RUN: opt < %s -passes='internalize<preserve-gv=foo;preserve-gv=j;preserve-gv=bar>' -S | FileCheck --check-prefix=FOO_J_AND_BAR %s
20-
2116
; ALL: @i = internal global
2217
; FOO_AND_J: @i = internal global
2318
; FOO_AND_BAR: @i = internal global

0 commit comments

Comments
 (0)