From 68a31f355afc3d0c9af6151d477a3e2dc0fb7609 Mon Sep 17 00:00:00 2001
From: Walter Bright <walter@walterbright.com>
Date: Fri, 10 Feb 2017 02:41:49 -0800
Subject: [PATCH] add _d_assertp, _d_unittestp, _d_arrayboundsp

---
 src/core/exception.d | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/core/exception.d b/src/core/exception.d
index 701dff2c30..2473e0b747 100644
--- a/src/core/exception.d
+++ b/src/core/exception.d
@@ -621,9 +621,10 @@ extern (C)
 
     /* One of these three is called upon an assert() fail.
      */
-    void _d_assertm(immutable(ModuleInfo)* m, uint line)
+    void _d_assertp(immutable(char)* file, uint line)
     {
-        onAssertError(m.name, line);
+        import core.stdc.string : strlen;
+        onAssertError(file[0 .. strlen(file)], line);
     }
 
     void _d_assert_msg(string msg, string file, uint line)
@@ -638,9 +639,10 @@ extern (C)
 
     /* One of these three is called upon an assert() fail inside of a unittest block
      */
-    void _d_unittestm(immutable(ModuleInfo)* m, uint line)
+    void _d_unittestp(immutable(char)* file, uint line)
     {
-        _d_unittest(m.name, line);
+        import core.stdc.string : strlen;
+        _d_unittest(file[0 .. strlen(file)], line);
     }
 
     void _d_unittest_msg(string msg, string file, uint line)
@@ -655,9 +657,10 @@ extern (C)
 
     /* Called when an array index is out of bounds
      */
-    void _d_array_bounds(immutable(ModuleInfo)* m, uint line)
+    void _d_arrayboundsp(immutable(char*) file, uint line)
     {
-        onRangeError(m.name, line);
+        import core.stdc.string : strlen;
+        onRangeError(file[0 .. strlen(file)], line);
     }
 
     void _d_arraybounds(string file, uint line)