Merge pull request #65393 from DougGregor/revert-semantic-attrs-cycle-break

Author: DougGregor

lib/AST/Decl.cpp

@@ -372,12 +372,10 @@ OrigDeclAttributes Decl::getOriginalAttrs() const {
 }
 
 DeclAttributes Decl::getSemanticAttrs() const {
-  if (!getASTContext().evaluator.hasActiveResolveMacroRequest()) {
-    auto mutableThis = const_cast<Decl *>(this);
-    (void)evaluateOrDefault(getASTContext().evaluator,
-                            ExpandMemberAttributeMacros{mutableThis},
-                            { });
-  }
+  auto mutableThis = const_cast<Decl *>(this);
+  (void)evaluateOrDefault(getASTContext().evaluator,
+                          ExpandMemberAttributeMacros{mutableThis},
+                          { });
 
   return getAttrs();
 }

test/Macros/macro_expand_peers.swift

@@ -149,8 +149,9 @@ struct S2 {
   }
 
   #if TEST_DIAGNOSTICS
-  // expected-error@+1{{cannot find 'nonexistent' in scope}}
-  @addCompletionHandlerArbitrarily(nonexistent)
+  // FIXME: Causes reference cycles
+  // should have error {{cannot find 'nonexistent' in scope}}
+  // @addCompletionHandlerArbitrarily(nonexistent)
   func h(a: Int, for b: String, _ value: Double) async -> String {
     return b
   }