Merge pull request #361 from dcci/infrecursion

Fix a couple of cases of infinite recursion

Author: lattner

include/swift/SILPasses/Utils/Local.h

@@ -571,7 +571,7 @@ class IgnoreExpectUseIterator
 
   Operand *operator*() const { return *CurrentIter; }
   Operand *operator->() const { return *CurrentIter; }
-  SILInstruction *getUser() const { return this->getUser(); }
+  SILInstruction *getUser() const { return CurrentIter->getUser(); }
 
   IgnoreExpectUseIterator &operator++() {
     assert(**this && "increment past end()!");

lib/IRGen/GenMeta.cpp

@@ -2039,8 +2039,9 @@ namespace {
 #define BEGIN_METADATA_SEARCHER_0(SEARCHER, DECLKIND)                   \
   struct SEARCHER                                                       \
     : MetadataSearcher<DECLKIND##MetadataScanner<SEARCHER>> {           \
+    using super = MetadataSearcher;                                     \
     SEARCHER(IRGenModule &IGM, DECLKIND##Decl *target)                  \
-      : MetadataSearcher(IGM, target) {}
+      : super(IGM, target) {}
 #define BEGIN_METADATA_SEARCHER_1(SEARCHER, DECLKIND, TYPE_1, NAME_1)   \
   struct SEARCHER                                                       \
       : MetadataSearcher<DECLKIND##MetadataScanner<SEARCHER>> {         \
@@ -3790,7 +3791,7 @@ namespace {
   BEGIN_METADATA_SEARCHER_0(FindClassParentIndex, Class)
     void addParentMetadataRef(ClassDecl *forClass) {
       if (forClass == Target) setTargetOffset();
-      addParentMetadataRef(forClass);
+      super::addParentMetadataRef(forClass);
     }
   END_METADATA_SEARCHER()
 }