RequirementMachine: Store the rewrite system in the property map

Author: slavapestov

lib/AST/RequirementMachine/PropertyMap.h

@@ -139,6 +139,7 @@ class PropertyBag {
 /// Out-of-line methods are documented in PropertyMap.cpp.
 class PropertyMap {
   RewriteContext &Context;
+  RewriteSystem &System;
   std::vector<PropertyBag *> Entries;
   Trie<PropertyBag *, MatchKind::Longest> Trie;
 
@@ -156,10 +157,11 @@ class PropertyMap {
   PropertyMap &operator=(PropertyMap &&) = delete;
 
 public:
-  explicit PropertyMap(RewriteContext &ctx,
-                       const ProtocolGraph &protos)
-      : Context(ctx), Protos(protos) {
-    Debug = ctx.getDebugOptions();
+  explicit PropertyMap(RewriteSystem &system)
+      : Context(system.getRewriteContext()),
+        System(system),
+        Protos(system.getProtocols()) {
+    Debug = Context.getDebugOptions();
   }
 
   ~PropertyMap();

lib/AST/RequirementMachine/RequirementMachine.cpp

@@ -371,7 +371,7 @@ void RequirementMachine::dump(llvm::raw_ostream &out) const {
 }
 
 RequirementMachine::RequirementMachine(RewriteContext &ctx)
-    : Context(ctx), System(ctx), Map(ctx, System.getProtocols()) {
+    : Context(ctx), System(ctx), Map(System) {
   auto &langOpts = ctx.getASTContext().LangOpts;
   Dump = langOpts.DumpRequirementMachine;
   RequirementMachineStepLimit = langOpts.RequirementMachineStepLimit;