Sema: Fix TypeRefinementNode kind for unavailable/deprecated decls.

Author: tshortli

lib/Sema/TypeCheckAvailability.cpp

@@ -695,7 +695,7 @@ class TypeRefinementContextBuilder : private ASTWalker {
       return nullptr;
 
     // Declarations with explicit availability attributes always get a TRC.
-    if (AvailabilityInference::attrForAnnotatedAvailableRange(D)) {
+    if (hasActiveAvailableAttribute(D, Context)) {
       return TypeRefinementContext::createForDecl(
           Context, D, getCurrentTRC(),
           getEffectiveAvailabilityForDeclSignature(D),

test/Sema/availability_refinement_contexts.swift

@@ -311,7 +311,7 @@ func testStringInterpolation() {
     """
 }
 
-// CHECK-NEXT: {{^}}  (decl_implicit version=50 unavailable=macOS decl=unavailableOnMacOS()
+// CHECK-NEXT: {{^}}  (decl version=50 unavailable=macOS decl=unavailableOnMacOS()
 // CHECK-NEXT: {{^}}    (decl_implicit version=50 unavailable=macOS decl=x
 
 @available(macOS, unavailable)
@@ -322,18 +322,18 @@ func unavailableOnMacOS() {
 // CHECK-NEXT: {{^}}  (decl_implicit version=50 decl=extension.SomeEnum
 // CHECK-NEXT: {{^}}    (decl version=51 decl=extension.SomeEnum
 // CHECK-NEXT: {{^}}      (decl_implicit version=51 decl=unavailableOnMacOS
-// CHECK-NEXT: {{^}}        (decl_implicit version=51 unavailable=macOS decl=unavailableOnMacOS
+// CHECK-NEXT: {{^}}        (decl version=51 unavailable=macOS decl=unavailableOnMacOS
 @available(OSX 51, *)
 extension SomeEnum {
   @available(macOS, unavailable)
   var unavailableOnMacOS: Int { 1 }
 }
 
 // CHECK-NEXT: {{^}}  (decl_implicit version=50 decl=extension.SomeEnum
-// CHECK-NEXT: {{^}}    (decl_implicit version=50 unavailable=macOS decl=extension.SomeEnum
+// CHECK-NEXT: {{^}}    (decl version=50 unavailable=macOS decl=extension.SomeEnum
 // CHECK-NEXT: {{^}}      (decl_implicit version=50 unavailable=macOS decl=availableMacOS_52
 // CHECK-NEXT: {{^}}        (decl version=52 unavailable=macOS decl=availableMacOS_52
-// CHECK-NEXT: {{^}}      (decl_implicit version=50 unavailable=* decl=neverAvailable()
+// CHECK-NEXT: {{^}}      (decl version=50 unavailable=* decl=neverAvailable()
 
 @available(macOS, unavailable)
 extension SomeEnum {
@@ -347,15 +347,16 @@ extension SomeEnum {
   func neverAvailable() {}
 }
 
-// CHECK-NEXT: {{^}}  (decl_implicit version=50 unavailable=* decl=NeverAvailable
+// CHECK-NEXT: {{^}}  (decl version=50 unavailable=* decl=NeverAvailable
+// CHECK-NEXT: {{^}}    (decl version=50 unavailable=* decl=unavailableOnMacOS()
 
 @available(*, unavailable)
 struct NeverAvailable {
   @available(macOS, unavailable)
   func unavailableOnMacOS() {}
 }
 
-// CHECK-NEXT: {{^}}  (decl_implicit version=50 deprecated decl=deprecatedOnMacOS()
+// CHECK-NEXT: {{^}}  (decl version=50 deprecated decl=deprecatedOnMacOS()
 // CHECK-NEXT: {{^}}    (decl_implicit version=50 deprecated decl=x
 
 @available(macOS, deprecated)