---

yaml
---
r: 348742
b: refs/heads/master
c: c108dae
h: refs/heads/master

Author: hamishknight

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 3ec5e76ee30b2b50d26c455736ff108515b9ada8
+refs/heads/master: c108dae5d99698db1811347fa6827babd595d974
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/docs/CToSwiftNameTranslation.md

@@ -212,29 +212,6 @@ Additionally, typedefs for `void *` or `const void *` that are themselves annota
 If a typedef's underlying type is itself a "CF pointer" typedef, the "alias" typedef will be imported as a regular typealias, with the suffix "Ref" still dropped from its name (if present) unless doing so would conflict with another declaration in the same module as the typedef.
 
 
-## Objective-C Properties
-
-By default, most property names are not transformed at all. However, if the getter of a property overrides a superclass or adopted protocol method that is also a property accessor, the Swift name of the overridden accessor's property will be used for consistency. If there's more than one such name, one is chosen arbitrarily.
-
-Properties with the type `BOOL` or `Boolean` use the name of the getter as the name of the Swift property by default, rather than the name of the property in Objective-C. This accounts for a difference in Swift and Objective-C naming conventions for boolean properties that use "is".
-
-```objc
-@property(getter=isContrivedExample) BOOL contrivedExample;
-@property BOOL hasAnotherForm;
-```
-
-```swift
-var isContrivedExample: Bool { get set }
-var hasAnotherForm: Bool { get set }
-```
-
-_This rule should probably have applied to C's native `bool` as well._
-
-A property declaration with the `SwiftImportPropertyAsAccessors` API note will not be imported at all, and its accessors will be imported as methods. Additionally, properties whose names start with "accessibility" in the NSAccessibility protocol are always imported as methods, as are properties whose names start with "accessibility" in an `@interface` declaration (class or category) that provides the adoption of NSAccessibility.
-
-_Objective-C code has historically not been consistent about whether the NSAccessibility declarations should be considered properties and therefore the Swift compiler chooses to import them as methods, as a sort of lowest common denominator._
-
-
 ## `swift_private`
 
 The `swift_private` Clang attribute prepends `__` onto the base name of any declaration being imported except initializers. For initializers with no arguments, a dummy `Void` argument with the name `__` is inserted; otherwise, the label for the first argument has `__` prepended. This transformation takes place after any other name manipulation, unless the declaration has a custom name. It will not occur if the declaration is an override; in that case the name needs to match the overridden declaration.
@@ -275,8 +252,6 @@ __attribute__((swift_name("SpacecraftCoordinates")))
 struct SPKSpacecraftCoordinates {
   double x, y, z, t; // space and time, of course
 };
-
-// Usually seen as NS_SWIFT_NAME.
 ```
 
 ```swift
@@ -312,10 +287,12 @@ The `swift_name` attribute can be used to give a C function a custom name. The v
 ```objc
 __attribute__((swift_name("doSomething(to:bar:)")))
 void doSomethingToFoo(Foo *foo, int bar);
+
+// Usually seen as NS_SWIFT_NAME.
 ```
 
 ```swift
-func doSomething(to foo: UnsafeMutablePointer<Foo>, bar: Int32)
+func doSomething(foo: UnsafeMutablePointer<Foo>, bar: Int32)
 ```
 
 An underscore can be used in place of an empty parameter label, as in Swift.
@@ -453,86 +430,4 @@ Although enumerators always have global scope in C, they are often imported as m
 
 _Currently, `swift_name` does not even allow importing an enum case as a member of the enum type itself, even if the enum is not recognized as an `@objc` enum, error code enum, or option set (i.e. the situation where a case is imported as a global constant)._
 
-
-### Fields of structs and unions; Objective-C properties
-
-The `swift_name` attribute can be applied to rename a struct or union field or an Objective-C property (whether on a class or a protocol). The value of the attribute must be a valid Swift identifier.
-
-```objc
-struct SPKSpaceflightBooking {
-  const SPKLocation * _Nullable destination;
-  bool roundTrip __attribute__((swift_name("isRoundTrip")));
-};
-```
-
-```swift
-struct SPKSpaceflightBooking {
-  var destination: UnsafePointer<SPKLocation>?
-  var isRoundTrip: Bool
-}
-```
-
-
-### Objective-C methods
-
-The `swift_name` attribute can be used to give an Objective-C method a custom name. The value of the attribute must be a full Swift function name, including parameter labels.
-
-```objc
-- (void)doSomethingToFoo:(Foo *)foo bar:(int)bar
-  __attribute__((swift_name("doSomethingImportant(to:bar:)")));
-```
-
-```swift
-func doSomethingImportant(to foo: UnsafeMutablePointer<Foo>, bar: Int32)
-```
-
-As with functions, an underscore can be used to represent an empty parameter label.
-
-Methods that follow the NSError out-parameter convention may provide one fewer parameter label than the number of parameters in the original method to indicate that a parameter should be dropped, but they do not have to. The `swift_error` attribute is still respected even when using a custom name for purposes of transforming an NSError out-parameter and the method return type.
-
-```objc
-- (BOOL)doSomethingRiskyAndReturnError:(NSError **)error
-  __attribute__((swift_name("doSomethingRisky()")));
-- (BOOL)doSomethingContrived:(NSString *)action error:(NSError **)outError
-  __attribute__((swift_name("doSomethingContrived(_:error:)")));
-```
-
-```swift
-func doSomethingRisky() throws
-func doSomethingContrived(_ action: String, error: ()) throws
-```
-
-A base name of "init" can be used on a *class* method that returns `instancetype` or the containing static type in order to import that method as an initializer. Any other custom name *prevents* a class method from being imported as an initializer even if it would normally be inferred as one.
-
-```objc
-+ (Action *)makeActionWithHandler:(void(^)(void))handler
-  __attribute__((swift_name("init(handler:)")));
-+ (instancetype)makeActionWithName:(NSString *)name
-  __attribute__((swift_name("init(name:)")));
-```
-
-```swift
-/* non-inherited */ init(handler: () -> Void)
-init(name: String)
-```
-
-A no-argument method imported as an initializer can be given a dummy argument label to disambiguate it from the no-argument `init()`, whether the method is an init-family instance method or a factory class method in Objective-C.
-
-```objc
-- (instancetype)initSafely
-  __attribute__((swift_name("init(safe:)")));
-+ (instancetype)makeDefaultAction
-  __attribute__((swift_name("init(default:)")));
-```
-
-```swift
-init(safe: ())
-init(default: ())
-```
-
-A custom name on an instance method with one of Objective-C's subscript selectors (`objectAtIndexedSubscript:`, `objectForKeyedSubscript:`, `setObject:atIndexedSubscript:`, or `setObject:forKeyedSubscript:`) prevents that method from being imported as a subscript or used as the accessor for another subscript.
-
-_Currently, this only works if *both* methods in a read/write subscript are given custom names; if just one is, a read/write subscript will still be formed. A read-only subscript only has one method to rename._
-
-
 ## More to come...

trunk/include/swift/AST/Identifier.h

@@ -56,26 +56,8 @@ class Identifier {
 
   const char *Pointer;
 
-public:
-  enum : size_t {
-    NumLowBitsAvailable = 2,
-    RequiredAlignment = 1 << NumLowBitsAvailable,
-    SpareBitMask = ((intptr_t)1 << NumLowBitsAvailable) - 1
-  };
-
-private:
   /// Constructor, only accessible by ASTContext, which handles the uniquing.
-  explicit Identifier(const char *Ptr) : Pointer(Ptr) {
-    assert(((uintptr_t)Ptr & SpareBitMask) == 0
-           && "Identifier pointer does not use any spare bits");
-  }
-
-  /// A type with the alignment expected of a valid \c Identifier::Pointer .
-  struct alignas(uint32_t) Aligner {};
-
-  static_assert(alignof(Aligner) >= RequiredAlignment,
-                "Identifier table will provide enough spare bits");
-
+  explicit Identifier(const char *Ptr) : Pointer(Ptr) {}
 public:
   explicit Identifier() : Pointer(nullptr) {}
 
@@ -171,15 +153,12 @@ class Identifier {
   bool operator<(Identifier RHS) const { return Pointer < RHS.Pointer; }
 
   static Identifier getEmptyKey() {
-    uintptr_t Val = static_cast<uintptr_t>(-1);
-    Val <<= NumLowBitsAvailable;
-    return Identifier((const char*)Val);
+    return Identifier((const char*)
+                      llvm::DenseMapInfo<const void*>::getEmptyKey());
   }
-
   static Identifier getTombstoneKey() {
-    uintptr_t Val = static_cast<uintptr_t>(-2);
-    Val <<= NumLowBitsAvailable;
-    return Identifier((const char*)Val);
+    return Identifier((const char*)
+                      llvm::DenseMapInfo<const void*>::getTombstoneKey());
   }
 
 private:
@@ -223,7 +202,7 @@ namespace llvm {
     static inline swift::Identifier getFromVoidPointer(void *P) {
       return swift::Identifier::getFromOpaquePointer(P);
     }
-    enum { NumLowBitsAvailable = swift::Identifier::NumLowBitsAvailable };
+    enum { NumLowBitsAvailable = 2 };
   };
 
 } // end namespace llvm
@@ -242,15 +221,15 @@ class DeclBaseName {
   };
 
 private:
-  /// In a special DeclName representing a subscript, this opaque pointer
+  /// In a special DeclName represenenting a subscript, this opaque pointer
   /// is used as the data of the base name identifier.
   /// This is an implementation detail that should never leak outside of
   /// DeclName.
-  static const Identifier::Aligner SubscriptIdentifierData;
+  static void *SubscriptIdentifierData;
   /// As above, for special constructor DeclNames.
-  static const Identifier::Aligner ConstructorIdentifierData;
+  static void *ConstructorIdentifierData;
   /// As above, for special destructor DeclNames.
-  static const Identifier::Aligner DestructorIdentifierData;
+  static void *DestructorIdentifierData;
 
   Identifier Ident;
 
@@ -260,23 +239,23 @@ class DeclBaseName {
   DeclBaseName(Identifier I) : Ident(I) {}
 
   static DeclBaseName createSubscript() {
-    return DeclBaseName(Identifier((const char *)&SubscriptIdentifierData));
+    return DeclBaseName(Identifier((const char *)SubscriptIdentifierData));
   }
 
   static DeclBaseName createConstructor() {
-    return DeclBaseName(Identifier((const char *)&ConstructorIdentifierData));
+    return DeclBaseName(Identifier((const char *)ConstructorIdentifierData));
   }
 
   static DeclBaseName createDestructor() {
-    return DeclBaseName(Identifier((const char *)&DestructorIdentifierData));
+    return DeclBaseName(Identifier((const char *)DestructorIdentifierData));
   }
 
   Kind getKind() const {
-    if (Ident.get() == (const char *)&SubscriptIdentifierData) {
+    if (Ident.get() == SubscriptIdentifierData) {
       return Kind::Subscript;
-    } else if (Ident.get() == (const char *)&ConstructorIdentifierData) {
+    } else if (Ident.get() == ConstructorIdentifierData) {
       return Kind::Constructor;
-    } else if (Ident.get() == (const char *)&DestructorIdentifierData) {
+    } else if (Ident.get() == DestructorIdentifierData) {
         return Kind::Destructor;
     } else {
       return Kind::Normal;
@@ -741,7 +720,7 @@ namespace llvm {
     static inline swift::DeclName getFromVoidPointer(void *ptr) {
       return swift::DeclName::getFromOpaqueValue(ptr);
     }
-    enum { NumLowBitsAvailable = PointerLikeTypeTraits<swift::DeclBaseName>::NumLowBitsAvailable - 2 };
+    enum { NumLowBitsAvailable = 0 };
   };
 
   // DeclNames hash just like pointers.

trunk/include/swift/ClangImporter/ClangImporterOptions.h

@@ -103,8 +103,7 @@ class ClangImporterOptions {
     using llvm::hash_combine;
 
     auto Code = hash_value(ModuleCachePath);
-    Code = hash_combine(Code, llvm::hash_combine_range(ExtraArgs.begin(),
-                                                       ExtraArgs.end()));
+    // ExtraArgs ignored - already considered in Clang's module hashing.
     Code = hash_combine(Code, OverrideResourceDir);
     Code = hash_combine(Code, TargetCPU);
     Code = hash_combine(Code, BridgingHeader);

trunk/lib/AST/ASTContext.cpp

@@ -165,8 +165,7 @@ struct ASTContext::Implementation {
 
   // FIXME: This is a StringMap rather than a StringSet because StringSet
   // doesn't allow passing in a pre-existing allocator.
-  llvm::StringMap<Identifier::Aligner, llvm::BumpPtrAllocator&>
-  IdentifierTable;
+  llvm::StringMap<char, llvm::BumpPtrAllocator&> IdentifierTable;
 
   /// The declaration of Swift.AssignmentPrecedence.
   PrecedenceGroupDecl *AssignmentPrecedence = nullptr;
@@ -643,8 +642,7 @@ Identifier ASTContext::getIdentifier(StringRef Str) const {
   if (Str.data() == nullptr)
     return Identifier(nullptr);
 
-  auto pair = std::make_pair(Str, Identifier::Aligner());
-  auto I = getImpl().IdentifierTable.insert(pair).first;
+  auto I = getImpl().IdentifierTable.insert(std::make_pair(Str, char())).first;
   return Identifier(I->getKeyData());
 }
 

trunk/lib/AST/ASTMangler.cpp

@@ -1491,10 +1491,6 @@ void ASTMangler::appendImplFunctionType(SILFunctionType *fn) {
 Optional<ASTMangler::SpecialContext>
 ASTMangler::getSpecialManglingContext(const ValueDecl *decl,
                                       bool useObjCProtocolNames) {
-  #if SWIFT_BUILD_ONLY_SYNTAXPARSERLIB
-    return None; // not needed for the parser library.
-  #endif
-
   // Declarations provided by a C module have a special context mangling.
   //   known-context ::= 'So'
   //

trunk/lib/AST/Identifier.cpp

@@ -21,9 +21,12 @@
 #include "clang/Basic/CharInfo.h"
 using namespace swift;
 
-constexpr const Identifier::Aligner DeclBaseName::SubscriptIdentifierData{};
-constexpr const Identifier::Aligner DeclBaseName::ConstructorIdentifierData{};
-constexpr const Identifier::Aligner DeclBaseName::DestructorIdentifierData{};
+void *DeclBaseName::SubscriptIdentifierData =
+    &DeclBaseName::SubscriptIdentifierData;
+void *DeclBaseName::ConstructorIdentifierData =
+    &DeclBaseName::ConstructorIdentifierData;
+void *DeclBaseName::DestructorIdentifierData =
+    &DeclBaseName::DestructorIdentifierData;
 
 raw_ostream &llvm::operator<<(raw_ostream &OS, Identifier I) {
   if (I.get() == nullptr)

trunk/lib/IRGen/IRGenSIL.cpp

@@ -1639,6 +1639,9 @@ void IRGenSILFunction::emitSILFunction() {
 
   assert(!CurSILFn->empty() && "function has no basic blocks?!");
 
+  if (CurSILFn->isThunk())
+    IGM.setHasFramePointer(CurFn, false);
+  
   if (CurSILFn->getDynamicallyReplacedFunction())
     IGM.IRGen.addDynamicReplacement(CurSILFn);
 

trunk/lib/SILOptimizer/Transforms/OwnershipModelEliminator.cpp

@@ -383,25 +383,7 @@ struct OwnershipModelEliminator : SILModuleTransform {
         continue;
 
       // Verify here to make sure ownership is correct before we strip.
-      {
-        // Add a pretty stack trace entry to tell users who see a verification
-        // failure triggered by this verification check that they need to re-run
-        // with -sil-verify-all to actually find the pass that introduced the
-        // verification error.
-        //
-        // DISCUSSION: This occurs due to the crash from the verification
-        // failure happening in the pass itself. This causes us to dump the
-        // SILFunction and emit a msg that this pass (OME) is the culprit. This
-        // is generally correct for most passes, but not for OME since we are
-        // verifying before we have even modified the function to ensure that
-        // all ownership invariants have been respected before we lower
-        // ownership from the function.
-        llvm::PrettyStackTraceString silVerifyAllMsgOnFailure(
-            "Found verification error when verifying before lowering "
-            "ownership. Please re-run with -sil-verify-all to identify the "
-            "actual pass that introduced the verification error.");
-        F.verify();
-      }
+      F.verify();
 
       if (stripOwnership(F)) {
         auto InvalidKind =