---

yaml
---
r: 347021
b: refs/heads/master
c: 65eca49
h: refs/heads/master
i:
  347019: 2ab6e4a

Author: swift-ci

[refs]

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

trunk/include/swift/Remote/MetadataReader.h

@@ -2472,8 +2472,13 @@ class MetadataReader {
     TaggedPointerExtendedClasses =
         TaggedPointerExtendedClassesAddr.getAddressData();
 
-    tryFindAndReadSymbol(TaggedPointerObfuscator,
-                         "objc_debug_taggedpointer_obfuscator");
+    // The tagged pointer obfuscator is not present on older OSes, in
+    // which case we can treat it as zero.
+    TaggedPointerObfuscator = 0;
+    auto TaggedPointerObfuscatorAddr = Reader->getSymbolAddress(
+      "objc_debug_taggedpointer_obfuscator");
+    if (TaggedPointerObfuscatorAddr)
+      tryReadSymbol(TaggedPointerObfuscatorAddr, TaggedPointerObfuscator);
 
 #   undef tryFindSymbol
 #   undef tryReadSymbol

trunk/lib/Sema/TypeCheckDeclOverride.cpp

@@ -861,7 +861,7 @@ static void checkOverrideAccessControl(ValueDecl *baseDecl, ValueDecl *decl,
     }
   } else if (baseHasOpenAccess &&
              classDecl->hasOpenAccess(dc) &&
-             decl->getFormalAccess() != AccessLevel::Open &&
+             decl->getFormalAccess() < AccessLevel::Public &&
              !decl->isFinal()) {
     {
       auto diag = diags.diagnose(decl, diag::override_not_accessible,

trunk/stdlib/tools/swift-reflection-test/swift-reflection-test.c

@@ -66,6 +66,14 @@ static void errnoAndExit(const char *message) {
   abort();
 }
 
+#if 0
+#include <inttypes.h>
+#define DEBUG_LOG(fmt, ...) fprintf(stderr, "%s: " fmt "\n",\
+                                    __func__, __VA_ARGS__)
+#else
+#define DEBUG_LOG(fmt, ...) (void)0
+#endif
+
 static const size_t ReadEnd = 0;
 static const size_t WriteEnd = 1;
 
@@ -143,6 +151,8 @@ const void *PipeMemoryReader_readBytes(void *Context, swift_addr_t Address,
   const PipeMemoryReader *Reader = (const PipeMemoryReader *)Context;
   uintptr_t TargetAddress = Address;
   size_t TargetSize = (size_t)Size;
+  DEBUG_LOG("Requesting read of %zu bytes from 0x%" PRIxPTR,
+            TargetSize, TargetAddress);
   int WriteFD = PipeMemoryReader_getParentWriteFD(Reader);
   write(WriteFD, REQUEST_READ_BYTES, 2);
   write(WriteFD, &TargetAddress, sizeof(TargetAddress));
@@ -162,12 +172,14 @@ swift_addr_t PipeMemoryReader_getSymbolAddress(void *Context,
                                                uint64_t Length) {
   const PipeMemoryReader *Reader = (const PipeMemoryReader *)Context;
   uintptr_t Address = 0;
+  DEBUG_LOG("Requesting address of symbol %s", SymbolName);
   int WriteFD = PipeMemoryReader_getParentWriteFD(Reader);
   write(WriteFD, REQUEST_SYMBOL_ADDRESS, 2);
   write(WriteFD, SymbolName, Length);
   write(WriteFD, "\n", 1);
   PipeMemoryReader_collectBytesFromPipe(Reader, (uint8_t*)&Address,
                                         sizeof(Address));
+  DEBUG_LOG("Address of %s is 0x%" PRIxPTR, SymbolName, Address);
   return (uintptr_t)Address;
 }
 
@@ -177,6 +189,7 @@ PipeMemoryReader_receiveInstanceKind(const PipeMemoryReader *Reader) {
   write(WriteFD, REQUEST_INSTANCE_KIND, 2);
   uint8_t KindValue = 0;
   PipeMemoryReader_collectBytesFromPipe(Reader, &KindValue, sizeof(KindValue));
+  DEBUG_LOG("Requested instance kind is %u", KindValue);
   return KindValue;
 }
 
@@ -187,6 +200,7 @@ PipeMemoryReader_receiveInstanceAddress(const PipeMemoryReader *Reader) {
   uintptr_t InstanceAddress = 0;
   PipeMemoryReader_collectBytesFromPipe(Reader, (uint8_t *)&InstanceAddress,
                                         sizeof(InstanceAddress));
+  DEBUG_LOG("Requested instance address is 0x%" PRIxPTR, InstanceAddress);
   return InstanceAddress;
 }
 
@@ -222,6 +236,7 @@ PipeMemoryReader_receiveImages(SwiftReflectionContextRef RC,
   size_t NumReflectionInfos;
   PipeMemoryReader_collectBytesFromPipe(Reader, &NumReflectionInfos,
                                         sizeof(NumReflectionInfos));
+  DEBUG_LOG("Receiving %z images from child", NumReflectionInfos);
 
   if (NumReflectionInfos == 0)
     return;
@@ -232,6 +247,7 @@ PipeMemoryReader_receiveImages(SwiftReflectionContextRef RC,
                                         NumReflectionInfos * sizeof(*Images));
 
   for (size_t i = 0; i < NumReflectionInfos; ++i) {
+    DEBUG_LOG("Adding image at 0x%" PRIxPTR, Images[i].Start);
     swift_reflection_addImage(RC, Images[i].Start);
   }
 

trunk/test/attr/open.swift

@@ -76,16 +76,16 @@ class SubClass : ExternalOpenClass {
   }
 }
 
-open class InvalidOpenSubClass : ExternalOpenClass {
-  public override func openMethod() {} // expected-error {{overriding instance method must be as accessible as the declaration it overrides}} {{3-9=open}}
-  public override var openProperty: Int { get{return 0} set{} } // expected-error {{overriding property must be as accessible as the declaration it overrides}} {{3-9=open}}
-  public override subscript(index: MarkerForOpenSubscripts) -> Int { // expected-error {{overriding subscript must be as accessible as the declaration it overrides}} {{3-9=open}}
+open class ValidOpenSubClass : ExternalOpenClass {
+  public override func openMethod() {}
+  public override var openProperty: Int { get{return 0} set{} }
+  public override subscript(index: MarkerForOpenSubscripts) -> Int {
     get { return 0 }
     set {}
   }
 }
 
-open class InvalidOpenSubClass2 : ExternalOpenClass {
+open class InvalidOpenSubClass : ExternalOpenClass {
   internal override func openMethod() {} // expected-error {{overriding instance method must be as accessible as the declaration it overrides}} {{3-11=open}}
   internal override var openProperty: Int { get{return 0} set{} } // expected-error {{overriding property must be as accessible as the declaration it overrides}} {{3-11=open}}
   internal override subscript(index: MarkerForOpenSubscripts) -> Int { // expected-error {{overriding subscript must be as accessible as the declaration it overrides}} {{3-11=open}}

trunk/test/decl/class/override.swift

@@ -362,10 +362,9 @@ class DerivedWithFilePrivateSetter: BaseWithFilePrivateSetter {
     }
 }
 
-// Issues with final overrides of open members
 open class OpenBase {
-  open func instanceMethod() {} // expected-note {{overridden declaration is here}}
-  open class func classMethod() {} // expected-note {{overridden declaration is here}}
+  open func instanceMethod() {}
+  open class func classMethod() {}
 }
 
 public class PublicDerived : OpenBase {
@@ -379,8 +378,8 @@ open class OpenDerived : OpenBase {
 }
 
 open class OpenDerivedPublic : OpenBase {
-  override public func instanceMethod() {} // expected-error {{overriding instance method must be as accessible as the declaration it overrides}}
-  override public class func classMethod() {} // expected-error {{overriding class method must be as accessible as the declaration it overrides}}
+  override public func instanceMethod() {} // Ok
+  override public class func classMethod() {} // Ok
 }
 
 open class OpenDerivedFinal : OpenBase {