Attempt #2 to unbreak bots broken by r273596.
Some of the bots running GCC 4.7 seem to be having trouble with lambdas
that explicitly capture `this`. Relevant-looking bug:
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53137
llvm-svn: 273613
diff --git a/llvm/lib/Analysis/CFLAliasAnalysis.cpp b/llvm/lib/Analysis/CFLAliasAnalysis.cpp
index ac9bb82..e04cea2 100644
--- a/llvm/lib/Analysis/CFLAliasAnalysis.cpp
+++ b/llvm/lib/Analysis/CFLAliasAnalysis.cpp
@@ -764,8 +764,8 @@
// in InterfaceMap: if it is not, we add the correspondence to the map;
// otherwise, an aliasing relation is found and we add it to
// RetParamRelations.
- auto AddToRetParamRelations = [this, &InterfaceMap](
- unsigned InterfaceIndex, StratifiedIndex SetIndex) {
+ auto AddToRetParamRelations = [&](unsigned InterfaceIndex,
+ StratifiedIndex SetIndex) {
unsigned Level = 0;
while (true) {
InterfaceValue CurrValue{InterfaceIndex, Level};
diff --git a/llvm/lib/Analysis/StratifiedSets.h b/llvm/lib/Analysis/StratifiedSets.h
index 8c253c3..d86e188 100644
--- a/llvm/lib/Analysis/StratifiedSets.h
+++ b/llvm/lib/Analysis/StratifiedSets.h
@@ -419,7 +419,7 @@
assert(has(Main));
assert(has(ToAdd));
- auto GetIndexBelow = [this](StratifiedIndex Index, unsigned NumLevel) {
+ auto GetIndexBelow = [&](StratifiedIndex Index, unsigned NumLevel) {
for (unsigned I = 0; I < NumLevel; ++I) {
auto Link = linksAt(Index);
Index = Link.hasBelow() ? Link.getBelow() : addLinkBelow(Index);
@@ -641,4 +641,4 @@
bool inbounds(StratifiedIndex N) const { return N < Links.size(); }
};
}
-#endif // LLVM_ADT_STRATIFIEDSETS_H
\ No newline at end of file
+#endif // LLVM_ADT_STRATIFIEDSETS_H