[sil] Teach VariableNameInferrer how to look through /all/ accessors.

include/swift/SILOptimizer/Utils/VariableNameUtils.h

@@ -17,6 +17,7 @@
 #ifndef SWIFT_SILOPTIMIZER_UTILS_VARIABLENAMEUTILS_H
 #define SWIFT_SILOPTIMIZER_UTILS_VARIABLENAMEUTILS_H
 
+#include "swift/Basic/OptionSet.h"
 #include "swift/SIL/ApplySite.h"
 #include "swift/SIL/DebugUtils.h"
 #include "swift/SIL/MemAccessUtils.h"
@@ -26,6 +27,19 @@
 namespace swift {
 
 class VariableNameInferrer {
+public:
+  enum class Flag {
+    /// If set then we should look through get and set accessors and infer their
+    /// name from self.
+    ///
+    /// DISCUSSION: This may not be the correct semantics for all name inference
+    /// since we may want to consider computed properties to be tied to self.
+    InferSelfThroughAllAccessors = 0x1,
+  };
+
+  using Options = OptionSet<Flag>;
+
+private:
   /// The stacklist that we use to process from use->
   StackList<PointerUnion<SILInstruction *, SILValue>> variableNamePath;
 
@@ -37,10 +51,21 @@ class VariableNameInferrer {
   /// The final string we computed.
   SmallString<64> &resultingString;
 
+  /// Options that control how we do our walk.
+  ///
+  /// Example: In certain cases we may want to impute self as a name for
+  /// computed getters/setters and in other cases we may not want to.
+  Options options;
+
 public:
   VariableNameInferrer(SILFunction *fn, SmallString<64> &resultingString)
       : variableNamePath(fn), resultingString(resultingString) {}
 
+  VariableNameInferrer(SILFunction *fn, Options options,
+                       SmallString<64> &resultingString)
+      : variableNamePath(fn), resultingString(resultingString),
+        options(options) {}
+
   /// Attempts to infer a name from just uses of \p searchValue.
   ///
   /// Returns true if we found a name.