Merge pull request #2361 from n8sh/issue-19416

Make core.exception.onOutOfMemoryError work in betterC
merged-on-behalf-of: Nicholas Wilson <[email protected]>

Author: dlang-bot

src/core/exception.d

@@ -9,6 +9,39 @@
  */
 module core.exception;
 
+// Compiler lowers final switch default case to this (which is a runtime error)
+void __switch_errorT()(string file = __FILE__, size_t line = __LINE__) @trusted
+{
+    // Consider making this a compile time check.
+    version (D_Exceptions)
+        throw staticError!SwitchError(file, line, null);
+    else
+        assert(0, "No appropriate switch clause found");
+}
+
+version (D_BetterC)
+{
+    // When compiling with -betterC we use template functions so if they are
+    // used the bodies are copied into the user's program so there is no need
+    // for the D runtime during linking.
+
+    // In the future we might want to convert all functions in this module to
+    // templates even for ordinary builds instead of providing them as an
+    // extern(C) library.
+
+    void onOutOfMemoryError()(void* pretend_sideffect = null) @nogc nothrow pure @trusted
+    {
+        assert(0, "Memory allocation failed");
+    }
+    alias onOutOfMemoryErrorNoGC = onOutOfMemoryError;
+
+    void onInvalidMemoryOperationError()(void* pretend_sideffect = null) @nogc nothrow pure @trusted
+    {
+        assert(0, "Invalid memory operation");
+    }
+}
+else:
+
 /**
  * Thrown on a range error.
  */
@@ -580,16 +613,6 @@ extern (C) void onSwitchError( string file = __FILE__, size_t line = __LINE__ )
         assert(0, "No appropriate switch clause found");
 }
 
-// Compiler lowers final switch default case to this (which is a runtime error)
-void __switch_errorT()(string file = __FILE__, size_t line = __LINE__) @trusted
-{
-    // Consider making this a compile time check.
-    version (D_Exceptions)
-        throw staticError!SwitchError(file, line, null);
-    else
-        assert(0, "No appropriate switch clause found");
-}
-
 /**
  * A callback for unicode errors in D.  A $(LREF UnicodeException) will be thrown.
  *

test/betterc/Makefile

@@ -1,6 +1,6 @@
 include ../common.mak
 
-TESTS:=test18828
+TESTS:=test18828 test19416
 
 .PHONY: all clean
 all: $(addprefix $(ROOT)/,$(addsuffix ,$(TESTS)))

test/betterc/src/test19416.d

@@ -0,0 +1,14 @@
+/*******************************************/
+// https://issues.dlang.org/show_bug.cgi?id=19416
+
+import core.stdc.stdlib : malloc, free;
+import core.exception : onOutOfMemoryError;
+
+extern(C) void main()
+{
+    auto m = malloc(1);
+    if (!m)
+        onOutOfMemoryError();
+    else
+        free(m);
+}