Merge pull request #2714 from kinke/after2713

[stable] Follow-up on #2713

Author: thewilsonator

src/rt/sections_osx_x86_64.d

@@ -173,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);
@@ -185,7 +185,10 @@ ubyte[] getSection(in mach_header* header, intptr_t slide,
 
 extern (C) size_t malloc_size(const void* ptr) nothrow @nogc;
 
-/// Returns the TLS range of the current image.
+/**
+ * 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
 {
     foreach (i ; 0 .. _dyld_image_count)
@@ -228,15 +231,13 @@ 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
  *

src/rt/util/utility.d

@@ -14,14 +14,14 @@ 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 isn't the case
- * (yet or anymore) for the startup/shutdown code in this module
+ * 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, size_t line = __LINE__
+    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);
+    condition || abort(msg, file, line);
 }