Merge pull request #2725 from MartinNowak/merge_stable

Merge remote-tracking branch 'upstream/stable' into merge_stable
merged-on-behalf-of: Sebastian Wilzbach <sebi.wilzbach@gmail.com>

Author: dlang-bot

changelog/darwin-loader.dd

@@ -174,5 +174,6 @@ DOCS=\
     $(DOCDIR)\rt_util_container_common.html \
     $(DOCDIR)\rt_util_container_hashtab.html \
     $(DOCDIR)\rt_util_container_treap.html \
+    $(DOCDIR)\rt_util_utility.html \
     $(DOCDIR)\rt_util_random.html \
     $(DOCDIR)\rt_util_typeinfo.html \

mak/DOCS

@@ -468,6 +468,7 @@ SRCS=\
 	\
 	src\rt\util\random.d \
 	src\rt\util\typeinfo.d \
+	src\rt\util\utility.d \
 	src\rt\util\container\array.d \
 	src\rt\util\container\common.d \
 	src\rt\util\container\hashtab.d \

mak/SRCS

@@ -59,18 +59,7 @@ import rt.dmain2;
 import rt.minfo;
 import rt.util.container.array;
 import rt.util.container.hashtab;
-
-/****
- * Asserts the specified condition, independent from -release, by abort()ing.
- * Regular assertions throw an AssertError and thus require an initialized
- * GC, which isn't the case (yet or anymore) for the startup/shutdown code in
- * this module (called by CRT ctors/dtors etc.).
- */
-private void safeAssert(bool condition, scope string msg, size_t line = __LINE__) @nogc nothrow @safe
-{
-    import core.internal.abort;
-    condition || abort(msg, __FILE__, line);
-}
+import rt.util.utility : safeAssert;
 
 alias DSO SectionGroup;
 struct DSO

src/rt/sections_elf_shared.d

@@ -29,8 +29,10 @@ import core.stdc.string, core.stdc.stdlib;
 import core.sys.posix.pthread;
 import core.sys.darwin.mach.dyld;
 import core.sys.darwin.mach.getsect;
+
 import rt.deh, rt.minfo;
 import rt.util.container.array;
+import rt.util.utility : safeAssert;
 
 struct SectionGroup
 {
@@ -95,9 +97,11 @@ void finiSections() nothrow @nogc
 
 void[] initTLSRanges() nothrow @nogc
 {
-    auto range = getTLSRange();
-    assert(range.isValid, "Could not determine TLS range.");
-    return range.toArray;
+    static ubyte tlsAnchor;
+
+    auto range = getTLSRange(&tlsAnchor);
+    safeAssert(range !is null, "Could not determine TLS range.");
+    return range;
 }
 
 void finiTLSRanges(void[] rng) nothrow @nogc
@@ -169,7 +173,7 @@ static immutable SegRef[] dataSegs = [{SEG_DATA, SECT_DATA},
 ubyte[] getSection(in mach_header* header, intptr_t slide,
                    in char* segmentName, in char* sectionName)
 {
-    assert(header.magic == MH_MAGIC_64);
+    safeAssert(header.magic == MH_MAGIC_64, "Unsupported header.");
     auto sect = getsectbynamefromheader_64(cast(mach_header_64*)header,
                                         segmentName,
                                         sectionName);
@@ -181,44 +185,22 @@ ubyte[] getSection(in mach_header* header, intptr_t slide,
 
 extern (C) size_t malloc_size(const void* ptr) nothrow @nogc;
 
-/// Represents a TLS range.
-struct TLSRange
-{
-    /// The start of the range.
-    void* start;
-
-    /// The size of the range.
-    size_t size;
-
-    /// Returns `true` if the range is valid.
-    bool isValid() const pure nothrow @nogc @safe
-    {
-        return start !is null && size > 0;
-    }
-
-    /// Returns the range as an array.
-    void[] toArray() pure nothrow @nogc
-    {
-        return start[0 .. size];
-    }
-}
-
-/// Returns the TLS range of the current image.
-TLSRange getTLSRange() nothrow @nogc
+/**
+ * Returns the TLS range of the image containing the specified TLS symbol,
+ * or null if none was found.
+ */
+void[] getTLSRange(const void* tlsSymbol) nothrow @nogc
 {
-    static ubyte tlsAnchor;
-    const tlsSymbol = &tlsAnchor;
-
     foreach (i ; 0 .. _dyld_image_count)
     {
         const header = cast(const(mach_header_64)*) _dyld_get_image_header(i);
         auto tlvInfo = tlvInfo(header);
 
         if (tlvInfo.foundTLSRange(tlsSymbol))
-            return TLSRange(tlvInfo.tlv_addr, tlvInfo.tlv_size);
+            return tlvInfo.tlv_addr[0 .. tlvInfo.tlv_size];
     }
 
-    return TLSRange.init;
+    return null;
 }
 
 /**
@@ -249,29 +231,27 @@ struct dyld_tlv_info
     /// Base address of TLV storage
     void* tlv_addr;
 
-    // Byte size of TLV storage
+    /// Byte size of TLV storage
     size_t tlv_size;
 }
 
 /**
  * Returns the TLV info for the given image.
  *
- * Asserts if no TLV address could be found.
- *
  * Params:
  *  header = the image to look for the TLV info in
  *
  * Returns: the TLV info
  */
 dyld_tlv_info tlvInfo(const mach_header_64* header) nothrow @nogc
 {
-    auto tlvAddress = pthread_getspecific(header.firstTLVKey);
-    assert(tlvAddress, "No TLV address found");
+    const key = header.firstTLVKey;
+    auto tlvAddress = key == pthread_key_t.max ? null : pthread_getspecific(key);
 
     dyld_tlv_info info = {
         info_size: dyld_tlv_info.sizeof,
         tlv_addr: tlvAddress,
-        tlv_size: malloc_size(tlvAddress)
+        tlv_size: tlvAddress ? malloc_size(tlvAddress) : 0
     };
 
     return info;

src/rt/sections_osx_x86_64.d

@@ -0,0 +1,27 @@
+/**
+ * Contains various utility functions used by the runtime implementation.
+ *
+ * Copyright: Copyright Digital Mars 2016.
+ * License: Distributed under the
+ *      $(LINK2 http://www.boost.org/LICENSE_1_0.txt, Boost Software License 1.0).
+ *    (See accompanying file LICENSE)
+ * Authors: Jacob Carlborg
+ * Source: $(DRUNTIMESRC rt/util/_utility.d)
+ */
+module rt.util.utility;
+
+/**
+ * Asserts that the given condition is `true`.
+ *
+ * The assertion is independent from -release, by abort()ing. Regular assertions
+ * throw an AssertError and thus require an initialized GC, which might not be
+ * the case (yet or anymore) for the startup/shutdown code in this package
+ * (called by CRT ctors/dtors etc.).
+ */
+package(rt) void safeAssert(
+    bool condition, scope string msg, scope string file = __FILE__, size_t line = __LINE__
+) nothrow @nogc @safe
+{
+    import core.internal.abort;
+    condition || abort(msg, file, line);
+}