---

yaml
---
r: 286714
b: refs/heads/master-next
c: 3cb1b6a
h: refs/heads/master

Author: xymus

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: a67ffadd758dfc7a0f10a8afde063b8864663208
-refs/heads/master-next: be4ac2cf68c7b724f6c573bdf0c8a54120b1d529
+refs/heads/master-next: 3cb1b6a96faa2b634f3746461e132c27f14a5db5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-b: 66d897bfcf64a82cb9a87f5e663d889189d06d07

branches/master-next/include/swift/AST/Evaluator.h

@@ -309,6 +309,12 @@ class Evaluator {
   /// caching.
   void clearCache() { cache.clear(); }
 
+  /// Is the given request, or an equivalent, currently being evaluated?
+  template <typename Request>
+  bool hasActiveRequest(const Request &request) const {
+    return activeRequests.count(AnyRequest(request));
+  }
+
 private:
   template <typename Request>
   const AnyRequest &getCanonicalRequest(const Request &request) {