Generation

src/query.cc

@@ -769,6 +769,7 @@ void QueryDatabase::RemoveUsrs(SymbolKind usr_kind,
         if (type.symbol_idx)
           symbols[type.symbol_idx->id].kind = SymbolKind::Invalid;
         type.gen++;
+        //type.def = QueryType::Def();
         type.def = nullopt;
       }
       break;
@@ -779,6 +780,7 @@ void QueryDatabase::RemoveUsrs(SymbolKind usr_kind,
         if (func.symbol_idx)
           symbols[func.symbol_idx->id].kind = SymbolKind::Invalid;
         func.gen++;
+        //func.def = QueryFunc::Def();
         func.def = nullopt;
       }
       break;
@@ -789,6 +791,7 @@ void QueryDatabase::RemoveUsrs(SymbolKind usr_kind,
         if (var.symbol_idx)
           symbols[var.symbol_idx->id].kind = SymbolKind::Invalid;
         var.gen++;
+        //var.def = QueryVar::Def();
         var.def = nullopt;
       }
       break;

src/query.h

@@ -478,18 +478,6 @@ struct IdMap {
   QueryFuncRef ToQuery(IndexFuncRef ref) const;
   QueryLocation ToQuery(IndexFunc::Declaration decl) const;
   template <typename I>
-  optional<typename IndexToQuery<I>::type> ToQuery(optional<I> id) const {
-    if (!id)
-      return nullopt;
-    return ToQuery(*id);
-  }
-  template <typename I>
-  optional<WithGen<typename IndexToQuery<I>::type>> ToQuery(optional<I> id, int) const {
-    if (!id)
-      return nullopt;
-    return ToQuery(*id, 0);
-  }
-  template <typename I>
   Maybe<typename IndexToQuery<I>::type> ToQuery(Maybe<I> id) const {
     if (!id)
       return nullopt;

src/query_utils.h

@@ -77,7 +77,8 @@ template <typename Q>
 void EachWithGen(std::vector<Q>& collection, WithGen<Id<Q>> x, std::function<void(Q&)> fn) {
   Q& obj = collection[x.value.id];
   // FIXME Deprecate optional<Def> def
-  if (obj.gen == x.gen && obj.def)
+  //  if (obj.gen == x.gen && obj.def)
+  if (obj.def)
     fn(obj);
 }
 
@@ -86,7 +87,7 @@ void EachWithGen(std::vector<Q>& collection, std::vector<WithGen<Id<Q>>>& ids, s
   size_t j = 0;
   for (WithGen<Id<Q>> x : ids) {
     Q& obj = collection[x.value.id];
-    if (obj.gen == x.gen) {
+    if (1 /*obj.gen == x.gen*/) {
       if (obj.def) // FIXME Deprecate optional<Def> def
         fn(obj);
       ids[j++] = x;