[llvm] r273613 - Attempt #2 to unbreak bots broken by r273596.

[George Burgess IV via llvm-commits]

Author: gbiv
Date: Thu Jun 23 15:59:13 2016
New Revision: 273613

URL: http://llvm.org/viewvc/llvm-project?rev=273613&view=rev
Log:
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

Modified:
    llvm/trunk/lib/Analysis/CFLAliasAnalysis.cpp
    llvm/trunk/lib/Analysis/StratifiedSets.h

Modified: llvm/trunk/lib/Analysis/CFLAliasAnalysis.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/CFLAliasAnalysis.cpp?rev=273613&r1=273612&r2=273613&view=diff
==============================================================================
--- llvm/trunk/lib/Analysis/CFLAliasAnalysis.cpp (original)
+++ llvm/trunk/lib/Analysis/CFLAliasAnalysis.cpp Thu Jun 23 15:59:13 2016
@@ -764,8 +764,8 @@ CFLAAResult::FunctionInfo::FunctionInfo(
   // 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};

Modified: llvm/trunk/lib/Analysis/StratifiedSets.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/StratifiedSets.h?rev=273613&r1=273612&r2=273613&view=diff
==============================================================================
--- llvm/trunk/lib/Analysis/StratifiedSets.h (original)
+++ llvm/trunk/lib/Analysis/StratifiedSets.h Thu Jun 23 15:59:13 2016
@@ -419,7 +419,7 @@ public:
     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 @@ private:
   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