Merge pull request #8405 from slavapestov/gardening-from-sil-serialization-inlineable-work

slavapestov · web-flow · commit 7408ac378650 · 2017-03-29T01:37:33.000-07:00
Gardening from SIL serialization inlineable work
diff --git a/lib/AST/Decl.cpp b/lib/AST/Decl.cpp
@@ -3790,8 +3790,7 @@ bool AbstractStorageDecl::requiresForeignGetterAndSetter() const {
     return true;
   // Otherwise, we only dispatch by @objc if the declaration is dynamic or
   // NSManaged.
-  return getAttrs().hasAttribute<DynamicAttr>() ||
-         getAttrs().hasAttribute<NSManagedAttr>();
+  return isDynamic() || getAttrs().hasAttribute<NSManagedAttr>();
 }
 
 
diff --git a/lib/SIL/SILDeclRef.cpp b/lib/SIL/SILDeclRef.cpp
@@ -54,7 +54,7 @@ swift::getMethodDispatch(AbstractFunctionDecl *method) {
       if (fd->isAccessor() && fd->getAccessorStorageDecl()->hasClangNode())
         return MethodDispatch::Class;
     }
-    if (method->getAttrs().hasAttribute<DynamicAttr>())
+    if (method->isDynamic())
       return MethodDispatch::Class;
   }
 
@@ -96,20 +96,20 @@ bool swift::requiresForeignEntryPoint(ValueDecl *vd) {
     if (fd->isGetterOrSetter())
       return requiresForeignEntryPoint(fd->getAccessorStorageDecl());
 
-    return fd->getAttrs().hasAttribute<DynamicAttr>();
+    return fd->isDynamic();
   }
 
   if (auto *cd = dyn_cast<ConstructorDecl>(vd)) {
     if (cd->hasClangNode())
       return true;
 
-    return cd->getAttrs().hasAttribute<DynamicAttr>();
+    return cd->isDynamic();
   }
 
   if (auto *asd = dyn_cast<AbstractStorageDecl>(vd))
     return asd->requiresForeignGetterAndSetter();
 
-  return vd->getAttrs().hasAttribute<DynamicAttr>();
+  return vd->isDynamic();
 }
 
 /// TODO: We should consult the cached LoweredLocalCaptures the SIL
diff --git a/lib/SILGen/SILGenFunction.cpp b/lib/SILGen/SILGenFunction.cpp
@@ -136,7 +136,7 @@ SILGenFunction::emitSiblingMethodRef(SILLocation loc,
   // If the method is dynamic, access it through runtime-hookable virtual
   // dispatch (viz. objc_msgSend for now).
   if (methodConstant.hasDecl()
-      && methodConstant.getDecl()->getAttrs().hasAttribute<DynamicAttr>())
+      && methodConstant.getDecl()->isDynamic())
     methodValue = emitDynamicMethodRef(loc, methodConstant,
                                      SGM.Types.getConstantInfo(methodConstant));
   else
diff --git a/lib/SILGen/SILGenLValue.cpp b/lib/SILGen/SILGenLValue.cpp
@@ -720,7 +720,7 @@ namespace {
         return false;
 
       // If the declaration is dynamic, there's no materializeForSet.
-      if (decl->getAttrs().hasAttribute<DynamicAttr>())
+      if (decl->isDynamic())
         return false;
 
       // If the declaration was imported from C, we won't gain anything
diff --git a/lib/SILGen/SILGenPoly.cpp b/lib/SILGen/SILGenPoly.cpp
@@ -3164,7 +3164,7 @@ getWitnessDispatchKind(Type selfType, SILDeclRef witness, bool isFree) {
   auto *decl = witness.getDecl();
 
   // If the witness is dynamic, go through dynamic dispatch.
-  if (decl->getAttrs().hasAttribute<DynamicAttr>())
+  if (decl->isDynamic())
     return WitnessDispatchKind::Dynamic;
 
   bool isFinal = (decl->isFinal() || C->isFinal());
diff --git a/lib/SILGen/SILGenProfiling.cpp b/lib/SILGen/SILGenProfiling.cpp
@@ -123,8 +123,6 @@ struct MapRegionCounters : public ASTWalker {
       CounterMap[WS->getBody()] = NextCounter++;
     } else if (auto *RWS = dyn_cast<RepeatWhileStmt>(S)) {
       CounterMap[RWS->getBody()] = NextCounter++;
-    } else if (auto *FS = dyn_cast<ForStmt>(S)) {
-      CounterMap[FS->getBody()] = NextCounter++;
     } else if (auto *FES = dyn_cast<ForEachStmt>(S)) {
       CounterMap[FES->getBody()] = NextCounter++;
       walkPatternForProfiling(FES->getIterator(), *this);
@@ -536,14 +534,6 @@ struct CoverageMapping : public ASTWalker {
       assignCounter(RWS->getCond(), CounterExpr::Ref(BodyCounter));
       RepeatWhileStack.push_back(RWS);
 
-    } else if (auto *FS = dyn_cast<ForStmt>(S)) {
-      assignCounter(FS, CounterExpr::Zero());
-      if (Expr *E = FS->getCond().getPtrOrNull())
-        assignCounter(E, CounterExpr::Ref(getCurrentCounter()));
-      if (Expr *E = FS->getIncrement().getPtrOrNull())
-        assignCounter(E, CounterExpr::Zero());
-      assignCounter(FS->getBody());
-
     } else if (auto *FES = dyn_cast<ForEachStmt>(S)) {
       assignCounter(FES, CounterExpr::Zero());
       assignCounter(FES->getBody());
@@ -593,23 +583,14 @@ struct CoverageMapping : public ASTWalker {
       (void) RWS;
       RepeatWhileStack.pop_back();
 
-    } else if (auto *FS = dyn_cast<ForStmt>(S)) {
-      // Both the condition and the increment are reached through the backedge.
-      if (Expr *E = FS->getCond().getPtrOrNull())
-        addToCounter(E, getExitCounter());
-      if (Expr *E = FS->getIncrement().getPtrOrNull())
-        addToCounter(E, getExitCounter());
-
     } else if (auto *CS = dyn_cast<ContinueStmt>(S)) {
       // Continues create extra backedges, add them to the appropriate counters.
       if (!isa<RepeatWhileStmt>(CS->getTarget()))
         addToCounter(CS->getTarget(), getCurrentCounter());
       if (auto *WS = dyn_cast<WhileStmt>(CS->getTarget())) {
         if (auto *E = getConditionNode(WS->getCond()))
           addToCounter(E, getCurrentCounter());
-      } else if (auto *FS = dyn_cast<ForStmt>(CS->getTarget()))
-        if (Expr *E = FS->getCond().getPtrOrNull())
-          addToCounter(E, getCurrentCounter());
+      }
       terminateRegion(S);
 
     } else if (auto *BS = dyn_cast<BreakStmt>(S)) {
diff --git a/lib/Sema/TypeCheckDecl.cpp b/lib/Sema/TypeCheckDecl.cpp
@@ -6016,7 +6016,7 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
     }
 
     void visitDynamicAttr(DynamicAttr *attr) {
-      if (!Override->getAttrs().hasAttribute<DynamicAttr>())
+      if (!Override->isDynamic())
         // Dynamic is inherited.
         Override->getAttrs().add(
                                 new (TC.Context) DynamicAttr(/*implicit*/true));
diff --git a/test/Inputs/clang-importer-sdk/swift-modules-without-ns/Foundation.swift b/test/Inputs/clang-importer-sdk/swift-modules-without-ns/Foundation.swift
@@ -2,11 +2,11 @@
 @_exported import CoreGraphics
 @_exported import Foundation
 
-@_silgen_name("swift_StringToNSString") internal
-func _convertStringToNSString(_ string: String) -> NSString
+@_silgen_name("swift_StringToNSString")
+public func _convertStringToNSString(_ string: String) -> NSString
 
-@_silgen_name("swift_NSStringToString") internal
-func _convertNSStringToString(_ nsstring: NSString?) -> String
+@_silgen_name("swift_NSStringToString")
+public func _convertNSStringToString(_ nsstring: NSString?) -> String
 
 public func == (lhs: NSObject, rhs: NSObject) -> Bool {
   return lhs.isEqual(rhs)
@@ -15,33 +15,33 @@ public func == (lhs: NSObject, rhs: NSObject) -> Bool {
 public let NSUTF8StringEncoding: UInt = 8
 
 // NSArray bridging entry points
-func _convertNSArrayToArray<T>(_ nsarr: NSArray?) -> [T] {
+public func _convertNSArrayToArray<T>(_ nsarr: NSArray?) -> [T] {
   return [T]()
 }
 
-func _convertArrayToNSArray<T>(_ arr: [T]) -> NSArray {
+public func _convertArrayToNSArray<T>(_ arr: [T]) -> NSArray {
   return NSArray()
 }
 
 // NSDictionary bridging entry points
-internal func _convertDictionaryToNSDictionary<Key, Value>(
+public func _convertDictionaryToNSDictionary<Key, Value>(
     _ d: Dictionary<Key, Value>
 ) -> NSDictionary {
   return NSDictionary()
 }
 
-internal func _convertNSDictionaryToDictionary<K: NSObject, V: AnyObject>(
+public func _convertNSDictionaryToDictionary<K: NSObject, V: AnyObject>(
        _ d: NSDictionary?
      ) -> Dictionary<K, V> {
   return Dictionary<K, V>()
 }
 
 // NSSet bridging entry points
-internal func _convertSetToNSSet<T : Hashable>(_ s: Set<T>) -> NSSet {
+public func _convertSetToNSSet<T>(_ s: Set<T>) -> NSSet {
   return NSSet()
 }
 
-internal func _convertNSSetToSet<T : Hashable>(_ s: NSSet?) -> Set<T> {
+public func _convertNSSetToSet<T>(_ s: NSSet?) -> Set<T> {
   return Set<T>()
 }
 
@@ -207,7 +207,7 @@ extension NSError : Error {
 }
 
 @_silgen_name("swift_convertNSErrorToError")
-func _convertNSErrorToError(_ string: NSError?) -> Error
+public func _convertNSErrorToError(_ string: NSError?) -> Error
 
 @_silgen_name("swift_convertErrorToNSError")
-func _convertErrorToNSError(_ string: Error) -> NSError
+public func _convertErrorToNSError(_ string: Error) -> NSError
diff --git a/test/Inputs/clang-importer-sdk/swift-modules-without-ns/ObjectiveC.swift b/test/Inputs/clang-importer-sdk/swift-modules-without-ns/ObjectiveC.swift
@@ -61,11 +61,11 @@ public struct NSZone {
   public var pointer : OpaquePointer
 }
 
-internal func _convertBoolToObjCBool(_ x: Bool) -> ObjCBool {
+public func _convertBoolToObjCBool(_ x: Bool) -> ObjCBool {
   return ObjCBool(x)
 }
 
-internal func _convertObjCBoolToBool(_ x: ObjCBool) -> Bool {
+public func _convertObjCBoolToBool(_ x: ObjCBool) -> Bool {
   return x.boolValue
 }
 
diff --git a/test/Inputs/clang-importer-sdk/swift-modules/Foundation.swift b/test/Inputs/clang-importer-sdk/swift-modules/Foundation.swift
@@ -2,11 +2,11 @@
 @_exported import CoreGraphics
 @_exported import Foundation
 
-@_silgen_name("swift_StringToNSString") internal
-func _convertStringToNSString(_ string: String) -> NSString
+@_silgen_name("swift_StringToNSString")
+public func _convertStringToNSString(_ string: String) -> NSString
 
-@_silgen_name("swift_NSStringToString") internal
-func _convertNSStringToString(_ nsstring: NSString?) -> String
+@_silgen_name("swift_NSStringToString")
+public func _convertNSStringToString(_ nsstring: NSString?) -> String
 
 public func == (lhs: NSObject, rhs: NSObject) -> Bool {
   return lhs.isEqual(rhs)
@@ -15,33 +15,33 @@ public func == (lhs: NSObject, rhs: NSObject) -> Bool {
 public let NSUTF8StringEncoding: UInt = 8
 
 // NSArray bridging entry points
-func _convertNSArrayToArray<T>(_ nsarr: NSArray?) -> [T] {
+public func _convertNSArrayToArray<T>(_ nsarr: NSArray?) -> [T] {
   return [T]()
 }
 
-func _convertArrayToNSArray<T>(_ arr: [T]) -> NSArray {
+public func _convertArrayToNSArray<T>(_ arr: [T]) -> NSArray {
   return NSArray()
 }
 
 // NSDictionary bridging entry points
-internal func _convertDictionaryToNSDictionary<Key, Value>(
+public func _convertDictionaryToNSDictionary<Key, Value>(
     _ d: Dictionary<Key, Value>
 ) -> NSDictionary {
   return NSDictionary()
 }
 
-internal func _convertNSDictionaryToDictionary<K: NSObject, V: AnyObject>(
+public func _convertNSDictionaryToDictionary<K: NSObject, V: AnyObject>(
        _ d: NSDictionary?
      ) -> Dictionary<K, V> {
   return Dictionary<K, V>()
 }
 
 // NSSet bridging entry points
-internal func _convertSetToNSSet<T>(_ s: Set<T>) -> NSSet {
+public func _convertSetToNSSet<T>(_ s: Set<T>) -> NSSet {
   return NSSet()
 }
 
-internal func _convertNSSetToSet<T>(_ s: NSSet?) -> Set<T> {
+public func _convertNSSetToSet<T>(_ s: NSSet?) -> Set<T> {
   return Set<T>()
 }
 
@@ -272,10 +272,10 @@ extension NSArray {
 }
 
 @_silgen_name("swift_convertNSErrorToError")
-func _convertNSErrorToError(_ string: NSError?) -> Error
+public func _convertNSErrorToError(_ string: NSError?) -> Error
 
 @_silgen_name("swift_convertErrorToNSError")
-func _convertErrorToNSError(_ string: Error) -> NSError
+public func _convertErrorToNSError(_ string: Error) -> NSError
 
 /// An internal protocol to represent Swift error enums that map to standard
 /// Cocoa NSError domains.
diff --git a/test/Inputs/clang-importer-sdk/swift-modules/ObjectiveC.swift b/test/Inputs/clang-importer-sdk/swift-modules/ObjectiveC.swift
@@ -75,11 +75,11 @@ public struct NSZone {
   public var pointer : OpaquePointer
 }
 
-internal func _convertBoolToObjCBool(_ x: Bool) -> ObjCBool {
+public func _convertBoolToObjCBool(_ x: Bool) -> ObjCBool {
   return ObjCBool(x)
 }
 
-internal func _convertObjCBoolToBool(_ x: ObjCBool) -> Bool {
+public func _convertObjCBoolToBool(_ x: ObjCBool) -> Bool {
   return x.boolValue
 }
 
diff --git a/test/SILGen/Inputs/Foundation.swift b/test/SILGen/Inputs/Foundation.swift
@@ -32,11 +32,11 @@ func _convertNSDictionaryToDictionary<K: NSObject, V: AnyObject>(
 }
 
 // NSSet bridging entry points
-func _convertSetToNSSet<T: Hashable>(s: Set<T>) -> NSSet {
+func _convertSetToNSSet<T>(s: Set<T>) -> NSSet {
   return NSSet()
 }
 
-func _convertNSSetToSet<T: NSObject>(s: NSSet?) -> Set<T> {
+func _convertNSSetToSet<T>(s: NSSet?) -> Set<T> {
   return Set<T>()
 }
 
diff --git a/test/SILGen/Inputs/ObjectiveC.swift b/test/SILGen/Inputs/ObjectiveC.swift
@@ -12,10 +12,10 @@ public struct ObjCBool {
 }
 
 @_silgen_name("swift_BoolToObjCBool")
-func _convertBoolToObjCBool(_ x: Bool) -> ObjCBool
+public func _convertBoolToObjCBool(_ x: Bool) -> ObjCBool
 
 @_silgen_name("swift_ObjCBoolToBool")
-func _convertObjCBoolToBool(_ x: ObjCBool) -> Bool
+public func _convertObjCBoolToBool(_ x: ObjCBool) -> Bool
 
 
 public struct Selector : ExpressibleByStringLiteral {

Original file line number	Diff line number	Diff line change
`@@ -3790,8 +3790,7 @@ bool AbstractStorageDecl::requiresForeignGetterAndSetter() const {`
`3790`	`3790`	`return true;`
`3791`	`3791`	`// Otherwise, we only dispatch by @objc if the declaration is dynamic or`
`3792`	`3792`	`// NSManaged.`
`3793`		`- return getAttrs().hasAttribute<DynamicAttr>() \|\|`
`3794`		`- getAttrs().hasAttribute<NSManagedAttr>();`
	`3793`	`+ return isDynamic() \|\| getAttrs().hasAttribute<NSManagedAttr>();`
`3795`	`3794`	`}`
`3796`	`3795`
`3797`	`3796`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ swift::getMethodDispatch(AbstractFunctionDecl *method) {`
`54`	`54`	`if (fd->isAccessor() && fd->getAccessorStorageDecl()->hasClangNode())`
`55`	`55`	`return MethodDispatch::Class;`
`56`	`56`	`}`
`57`		`- if (method->getAttrs().hasAttribute<DynamicAttr>())`
	`57`	`+ if (method->isDynamic())`
`58`	`58`	`return MethodDispatch::Class;`
`59`	`59`	`}`
`60`	`60`
`@@ -96,20 +96,20 @@ bool swift::requiresForeignEntryPoint(ValueDecl *vd) {`
`96`	`96`	`if (fd->isGetterOrSetter())`
`97`	`97`	`return requiresForeignEntryPoint(fd->getAccessorStorageDecl());`
`98`	`98`
`99`		`- return fd->getAttrs().hasAttribute<DynamicAttr>();`
	`99`	`+ return fd->isDynamic();`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`if (auto *cd = dyn_cast<ConstructorDecl>(vd)) {`
`103`	`103`	`if (cd->hasClangNode())`
`104`	`104`	`return true;`
`105`	`105`
`106`		`- return cd->getAttrs().hasAttribute<DynamicAttr>();`
	`106`	`+ return cd->isDynamic();`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`if (auto *asd = dyn_cast<AbstractStorageDecl>(vd))`
`110`	`110`	`return asd->requiresForeignGetterAndSetter();`
`111`	`111`
`112`		`- return vd->getAttrs().hasAttribute<DynamicAttr>();`
	`112`	`+ return vd->isDynamic();`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`/// TODO: We should consult the cached LoweredLocalCaptures the SIL`
Original file line number	Diff line number	Diff line change
`@@ -6016,7 +6016,7 @@ class DeclChecker : public DeclVisitor<DeclChecker> {`
`6016`	`6016`	`}`
`6017`	`6017`
`6018`	`6018`	`void visitDynamicAttr(DynamicAttr *attr) {`
`6019`		`- if (!Override->getAttrs().hasAttribute<DynamicAttr>())`
	`6019`	`+ if (!Override->isDynamic())`
`6020`	`6020`	`// Dynamic is inherited.`
`6021`	`6021`	`Override->getAttrs().add(`
`6022`	`6022`	`new (TC.Context) DynamicAttr(/implicit/true));`
Original file line number	Diff line number	Diff line change
`@@ -61,11 +61,11 @@ public struct NSZone {`
`61`	`61`	`public var pointer : OpaquePointer`
`62`	`62`	`}`
`63`	`63`
`64`		`-internal func _convertBoolToObjCBool(_ x: Bool) -> ObjCBool {`
	`64`	`+public func _convertBoolToObjCBool(_ x: Bool) -> ObjCBool {`
`65`	`65`	`return ObjCBool(x)`
`66`	`66`	`}`
`67`	`67`
`68`		`-internal func _convertObjCBoolToBool(_ x: ObjCBool) -> Bool {`
	`68`	`+public func _convertObjCBoolToBool(_ x: ObjCBool) -> Bool {`
`69`	`69`	`return x.boolValue`
`70`	`70`	`}`
`71`	`71`
Original file line number	Diff line number	Diff line change
`@@ -75,11 +75,11 @@ public struct NSZone {`
`75`	`75`	`public var pointer : OpaquePointer`
`76`	`76`	`}`
`77`	`77`
`78`		`-internal func _convertBoolToObjCBool(_ x: Bool) -> ObjCBool {`
	`78`	`+public func _convertBoolToObjCBool(_ x: Bool) -> ObjCBool {`
`79`	`79`	`return ObjCBool(x)`
`80`	`80`	`}`
`81`	`81`
`82`		`-internal func _convertObjCBoolToBool(_ x: ObjCBool) -> Bool {`
	`82`	`+public func _convertObjCBoolToBool(_ x: ObjCBool) -> Bool {`
`83`	`83`	`return x.boolValue`
`84`	`84`	`}`
`85`	`85`
Original file line number	Diff line number	Diff line change
`@@ -32,11 +32,11 @@ func _convertNSDictionaryToDictionary<K: NSObject, V: AnyObject>(`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`// NSSet bridging entry points`
`35`		`-func _convertSetToNSSet<T: Hashable>(s: Set<T>) -> NSSet {`
	`35`	`+func _convertSetToNSSet<T>(s: Set<T>) -> NSSet {`
`36`	`36`	`return NSSet()`
`37`	`37`	`}`
`38`	`38`
`39`		`-func _convertNSSetToSet<T: NSObject>(s: NSSet?) -> Set<T> {`
	`39`	`+func _convertNSSetToSet<T>(s: NSSet?) -> Set<T> {`
`40`	`40`	`return Set<T>()`
`41`	`41`	`}`
`42`	`42`
Original file line number	Diff line number	Diff line change
`@@ -12,10 +12,10 @@ public struct ObjCBool {`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`@_silgen_name("swift_BoolToObjCBool")`
`15`		`-func _convertBoolToObjCBool(_ x: Bool) -> ObjCBool`
	`15`	`+public func _convertBoolToObjCBool(_ x: Bool) -> ObjCBool`
`16`	`16`
`17`	`17`	`@_silgen_name("swift_ObjCBoolToBool")`
`18`		`-func _convertObjCBoolToBool(_ x: ObjCBool) -> Bool`
	`18`	`+public func _convertObjCBoolToBool(_ x: ObjCBool) -> Bool`
`19`	`19`
`20`	`20`
`21`	`21`	`public struct Selector : ExpressibleByStringLiteral {`