---

yaml
---
r: 347899
b: refs/heads/master
c: 5db4e8d
h: refs/heads/master
i:
  347897: 947bf61
  347895: 674d256

Author: swift-ci

[refs]

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

trunk/lib/IRGen/GenDecl.cpp

@@ -2398,7 +2398,8 @@ llvm::Function *IRGenModule::getAddrOfSILFunction(
 
 static llvm::GlobalVariable *createGOTEquivalent(IRGenModule &IGM,
                                                  llvm::Constant *global,
-                                                 LinkEntity entity) {
+                                                 LinkEntity entity)
+{
   // Determine the name of this entity.
   llvm::SmallString<64> globalName;
   entity.mangle(globalName);
@@ -2421,7 +2422,17 @@ static llvm::GlobalVariable *createGOTEquivalent(IRGenModule &IGM,
                                       llvm::GlobalValue::PrivateLinkage,
                                       global,
                                       llvm::Twine("got.") + globalName);
-  gotEquivalent->setUnnamedAddr(llvm::GlobalValue::UnnamedAddr::Global);
+  
+  // rdar://problem/50968433: Unnamed_addr constants appear to get emitted
+  // with incorrect alignment by the LLVM JIT in some cases. Don't use
+  // unnamed_addr as a workaround.
+  if (!IGM.getOptions().UseJIT) {
+    gotEquivalent->setUnnamedAddr(llvm::GlobalValue::UnnamedAddr::Global);
+  } else {
+    ApplyIRLinkage(IRLinkage::InternalLinkOnceODR)
+      .to(gotEquivalent);
+  }
+  
   return gotEquivalent;
 }
 

trunk/test/Interpreter/external_key_path_ref.swift

@@ -0,0 +1,17 @@
+// RUN: %target-run-simple-swift
+// REQUIRES: executable_test
+
+struct Container<Base, Value, Content>
+    where Base: Collection
+{
+    var base: Base
+    var elementPath: KeyPath<Base.Element, Value>
+    var content: (Value) -> Content
+}
+
+let x = Container(base: 1...10, elementPath: \.bitWidth) {
+    return String($0, radix: 2)
+} 
+
+// CHECK: i hope we passed the audition
+print("i hope we passed the audition")

trunk/test/PrintAsObjC/resilient-ancestry-stable-abi.swift

@@ -0,0 +1,12 @@
+// RUN: %empty-directory(%t)
+// RUN: %target-swift-frontend -emit-module-path %t/resilient_struct.swiftmodule %S/../Inputs/resilient_struct.swift -enable-library-evolution
+// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -emit-module-path %t/resilient_objc_class.swiftmodule %S/../Inputs/resilient_objc_class.swift -I %t -enable-library-evolution -emit-objc-header-path %t/resilient_objc_class.h
+
+// RUN: cp %S/Inputs/custom-modules/module.map %t/module.map
+
+// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck %S/resilient-ancestry.swift -module-name resilient -emit-objc-header-path %t/resilient.h -I %t -enable-library-evolution -enable-resilient-objc-class-stubs
+// RUN: %FileCheck %S/resilient-ancestry.swift < %t/resilient.h
+// RUN: %check-in-clang %t/resilient.h -I %t
+
+// REQUIRES: objc_interop
+// REQUIRES: swift_stable_abi

trunk/test/PrintAsObjC/resilient-ancestry.swift

@@ -10,12 +10,10 @@
 // RUN: %FileCheck %s --check-prefix=NO-STUBS < %t/resilient.h
 // RUN: %check-in-clang %t/resilient.h -I %t
 
-// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck %s -module-name resilient -emit-objc-header-path %t/resilient.h -I %t -enable-library-evolution -enable-resilient-objc-class-stubs
-// RUN: %FileCheck %s < %t/resilient.h
-// RUN: %check-in-clang %t/resilient.h -I %t
-
 // REQUIRES: objc_interop
 
+// See also resilient-ancestry.swift, for the stable ABI deployment target test.
+
 import Foundation
 import resilient_objc_class
 

trunk/test/decl/protocol/conforms/nscoding.swift

@@ -2,16 +2,16 @@
 
 // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -parse-as-library -swift-version 4 %s -verify
 // RUN: not %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -parse-as-library -swift-version 4 %s -disable-nskeyedarchiver-diagnostics 2>&1 | %FileCheck -check-prefix CHECK-NO-DIAGS %s
-
 // RUN: not %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -parse-as-library -swift-version 4 %s -dump-ast -target %target-pre-stable-abi-triple > %t/old.ast
-// RUN: not %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -parse-as-library -swift-version 4 %s -dump-ast -target %target-stable-abi-triple > %t/new.ast
 
 // RUN: %FileCheck --check-prefix=CHECK-OLD %s < %t/old.ast
 // RUN: %FileCheck --check-prefix=NEGATIVE %s < %t/old.ast
-// RUN: %FileCheck --check-prefix=NEGATIVE --check-prefix=NEGATIVE-NEW %s < %t/new.ast
 
 // REQUIRES: objc_interop
 
+// See also nscoding_stable_abi.swift, for the stable ABI deployment
+// target test.
+
 // CHECK-NO-DIAGS-NOT: NSCoding
 // CHECK-NO-DIAGS-NOT: unstable
 

trunk/test/decl/protocol/conforms/nscoding_stable_abi.swift

@@ -0,0 +1,8 @@
+// RUN: %empty-directory(%t)
+
+// RUN: not %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -parse-as-library -swift-version 4 %S/nscoding.swift -dump-ast -target %target-stable-abi-triple > %t/new.ast
+
+// RUN: %FileCheck --check-prefix=NEGATIVE --check-prefix=NEGATIVE-NEW %S/nscoding.swift < %t/new.ast
+
+// REQUIRES: objc_interop
+// REQUIRES: swift_stable_abi