---

yaml
---
r: 347029
b: refs/heads/master
c: e9a456c
h: refs/heads/master
i:
  347027: b5e6b47

Author: swift-ci

[refs]

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

trunk/stdlib/public/Darwin/os/os.m

@@ -87,8 +87,8 @@
   if (_os_log_encode(buf, fmt, args, saved_errno, &ob)) {
     if (os_log_pack_send) {
       size_t sz = _os_log_pack_size(ob.ob_len);
-      uint8_t _Alignas(os_log_pack_s) buf[sz];
-      os_log_pack_t p = (os_log_pack_t)buf;
+      uint8_t _Alignas(os_log_pack_s) pack[sz];
+      os_log_pack_t p = (os_log_pack_t)pack;
       /*
        * _os_log_encode has already packed `saved_errno` into a
        * OSLF_CMD_TYPE_SCALAR command as the OSLF_CMD_TYPE_ERRNO does not
@@ -136,8 +136,8 @@
       _os_log_encode(buf, fmt, args, saved_errno, &ob);
   if (encoded) {
     size_t sz = _os_log_pack_size(ob.ob_len);
-    uint8_t _Alignas(os_log_pack_s) buf[sz];
-    os_log_pack_t p = (os_log_pack_t)buf;
+    uint8_t _Alignas(os_log_pack_s) pack[sz];
+    os_log_pack_t p = (os_log_pack_t)pack;
     uint8_t *ptr = _os_signpost_pack_fill(p, sz, saved_errno, dso,
         fmt, spnm, spid);
     p->olp_pc = ra;

trunk/stdlib/public/SwiftShims/GlobalObjects.h

@@ -102,13 +102,6 @@ static_assert(
     4 * sizeof(__swift_intptr_t) + sizeof(__swift_int64_t),
   "_SwiftSetBodyStorage has unexpected size");
 
-static_assert(std::is_pod<_SwiftEmptyArrayStorage>::value,
-              "empty array type should be POD");
-static_assert(std::is_pod<_SwiftEmptyDictionarySingleton>::value,
-              "empty dictionary type should be POD");
-static_assert(std::is_pod<_SwiftEmptySetSingleton>::value,
-              "empty set type should be POD");
-
 }} // extern "C", namespace swift
 #endif
 

trunk/stdlib/public/SwiftShims/HeapObject.h

@@ -93,8 +93,6 @@ __swift_size_t swift_weakRetainCount(HeapObject *obj);
 #endif
 
 #ifdef __cplusplus
-static_assert(swift::IsTriviallyConstructible<HeapObject>::value,
-              "HeapObject must be trivially initializable");
 static_assert(std::is_trivially_destructible<HeapObject>::value,
               "HeapObject must be trivially destructible");
 

trunk/stdlib/public/SwiftShims/RefCount.h

@@ -1188,8 +1188,6 @@ class RefCounts {
 typedef RefCounts<InlineRefCountBits> InlineRefCounts;
 typedef RefCounts<SideTableRefCountBits> SideTableRefCounts;
 
-static_assert(swift::IsTriviallyConstructible<InlineRefCounts>::value,
-              "InlineRefCounts must be trivially initializable");
 static_assert(std::is_trivially_destructible<InlineRefCounts>::value,
               "InlineRefCounts must be trivially destructible");
 

trunk/stdlib/public/core/Optional.swift

@@ -300,7 +300,9 @@ func _diagnoseUnexpectedNilOptional(_filenameStart: Builtin.RawPointer,
                                     _filenameIsASCII: Builtin.Int1,
                                     _line: Builtin.Word,
                                     _isImplicitUnwrap: Builtin.Int1) {
-  _preconditionFailure(
+  // Cannot use _preconditionFailure as the file and line info would not be
+  // printed.
+  preconditionFailure(
     Bool(_isImplicitUnwrap)
       ? "Unexpectedly found nil while implicitly unwrapping an Optional value"
       : "Unexpectedly found nil while unwrapping an Optional value",

trunk/stdlib/public/runtime/HeapObject.cpp

@@ -84,9 +84,11 @@ static HeapObject *_swift_allocObject_(HeapMetadata const *metadata,
   assert(isAlignmentMask(requiredAlignmentMask));
   auto object = reinterpret_cast<HeapObject *>(
       swift_slowAlloc(requiredSize, requiredAlignmentMask));
-  // FIXME: this should be a placement new but that adds a null check
-  object->metadata = metadata;
-  object->refCounts.init();
+
+  // NOTE: this relies on the C++17 guaranteed semantics of no null-pointer
+  // check on the placement new allocator which we have observed on Windows,
+  // Linux, and macOS.
+  new (object) HeapObject(metadata);
 
   // If leak tracking is enabled, start tracking this object.
   SWIFT_LEAKS_START_TRACKING_OBJECT(object);

trunk/test/stdlib/OptionalTraps.swift

@@ -25,7 +25,22 @@ OptionalTraps.test("UnwrapNone")
     { _isFastAssertConfiguration() },
     reason: "this trap is not guaranteed to happen in -Ounchecked"))
   .code {
-  var a: AnyObject? = returnNil()
+  let a: AnyObject? = returnNil()
+  expectCrashLater()
+  let unwrapped: AnyObject = a!
+  _blackHole(unwrapped)
+}
+
+OptionalTraps.test("UnwrapNone/location")
+  .skip(.custom(
+    { _isFastAssertConfiguration() },
+    reason: "this trap is not guaranteed to happen in -Ounchecked"))
+  .crashOutputMatches(_isDebugAssertConfiguration()
+                        ? "test/stdlib/OptionalTraps.swift, line 45"
+                        : "")
+  .code {
+  expectCrashLater()
+  let a: AnyObject? = returnNil()
   expectCrashLater()
   let unwrapped: AnyObject = a!
   _blackHole(unwrapped)