Merge pull request swiftlang#16312 from compnerd/disambiguation

Disambiguation

Author: compnerd

include/swift/AST/ClangNode.h

@@ -111,7 +111,7 @@ class ClangNode {
 namespace llvm {
 template <typename T>
 struct PointerLikeTypeTraits<swift::detail::ClangNodeBox<T>> {
-  using Box = swift::detail::ClangNodeBox<T>;
+  using Box = ::swift::detail::ClangNodeBox<T>;
 
   static inline void *getAsVoidPointer(Box P) {
     return const_cast<void *>(static_cast<const void *>(P.value));

include/swift/SIL/SILInstruction.h

@@ -153,6 +153,9 @@ class SILInstructionResultArray {
 
   class iterator;
 
+  friend bool operator==(iterator, iterator);
+  friend bool operator!=(iterator, iterator);
+
   iterator begin() const;
   iterator end() const;
 
@@ -997,17 +1000,16 @@ class NonValueInstruction : public SILInstruction {
   }
 
 /// A helper class for defining some basic boilerplate.
-template <SILInstructionKind Kind, typename Base,
+template <SILInstructionKind Kind, typename InstBase,
           bool IsSingleResult =
-            std::is_base_of<SingleValueInstruction, Base>::value>
+              std::is_base_of<SingleValueInstruction, InstBase>::value>
 class InstructionBase;
 
-template <SILInstructionKind Kind, typename Base>
-class InstructionBase<Kind, Base, /*HasResult*/ true> : public Base {
+template <SILInstructionKind Kind, typename InstBase>
+class InstructionBase<Kind, InstBase, /*HasResult*/ true> : public InstBase {
 protected:
   template <typename... As>
-  InstructionBase(As &&...args)
-    : Base(Kind, std::forward<As>(args)...) {}
+  InstructionBase(As &&... args) : InstBase(Kind, std::forward<As>(args)...) {}
 
 public:
   /// Override to statically return the kind.
@@ -1023,12 +1025,11 @@ class InstructionBase<Kind, Base, /*HasResult*/ true> : public Base {
   }
 };
 
-template <SILInstructionKind Kind, typename Base>
-class InstructionBase<Kind, Base, /*HasResult*/ false> : public Base {
+template <SILInstructionKind Kind, typename InstBase>
+class InstructionBase<Kind, InstBase, /*HasResult*/ false> : public InstBase {
 protected:
   template <typename... As>
-  InstructionBase(As &&...args)
-    : Base(Kind, std::forward<As>(args)...) {}
+  InstructionBase(As &&... args) : InstBase(Kind, std::forward<As>(args)...) {}
 
 public:
   static constexpr SILInstructionKind getKind() {