d: Fix ICE in gimplify_var_or_parm_decl, at gimplify.cc:3308

The result type of the assert() should always be the same as its
inferred expression type, which could either be `void' or `noreturn'.

Also moves the pattern of calling to BUILT_IN_TRAP to its own codegen
function, as it is repeated quite enough throughout the front-end.

	PR d/124922

gcc/d/ChangeLog:

	* d-codegen.cc (build_trap_call): New function.
	(build_array_bounds_call): Use it.
	(build_bounds_index_condition): Likewise.
	(build_bounds_slice_condition): Likewise.
	(d_build_call): Likewise.
	* expr.cc (ExprVisitor::visit (HaltExp *)): Likewise.
	(ExprVisitor::visit (AssertExp *)): Likewise.  Return zero instead of
	void_node when assert contracts are disabled.
	* d-tree.h (build_trap_call): New prototype.

gcc/testsuite/ChangeLog:

	* gdc.dg/pr124922.d: New test.

Author: ibuclaw

gcc/d/d-codegen.cc

@@ -2007,7 +2007,7 @@ build_array_bounds_call (const Loc &loc)
 {
   /* Terminate the program with a trap if no D runtime present.  */
   if (checkaction_trap_p ())
-    return build_call_expr (builtin_decl_explicit (BUILT_IN_TRAP), 0);
+    return build_trap_call ();
   else
     {
       return build_libcall (LIBCALL_ARRAYBOUNDSP, 2,
@@ -2036,7 +2036,7 @@ build_bounds_index_condition (IndexExp *ie, tree index, tree length)
   tree boundserr;
 
   if (checkaction_trap_p ())
-    boundserr = build_call_expr (builtin_decl_explicit (BUILT_IN_TRAP), 0);
+    boundserr = build_trap_call ();
   else
     {
       boundserr = build_libcall (LIBCALL_ARRAYBOUNDS_INDEXP, 4,
@@ -2082,10 +2082,7 @@ build_bounds_slice_condition (SliceExp *se, tree lower, tree upper, tree length)
 	  tree boundserr;
 
 	  if (checkaction_trap_p ())
-	    {
-	      boundserr =
-		build_call_expr (builtin_decl_explicit (BUILT_IN_TRAP), 0);
-	    }
+	    boundserr = build_trap_call ();
 	  else
 	    {
 	      boundserr = build_libcall (LIBCALL_ARRAYBOUNDS_SLICEP, 5,
@@ -2156,6 +2153,14 @@ checkaction_trap_p (void)
     }
 }
 
+/* Build a call to built-in trap().  */
+
+tree
+build_trap_call ()
+{
+  return build_call_expr (builtin_decl_explicit (BUILT_IN_TRAP), 0);
+}
+
 /* Returns the TypeFunction class for Type T.
    Assumes T is already the main variant type (toBasetype).  */
 
@@ -2397,6 +2402,10 @@ d_build_call (TypeFunction *tf, tree callable, tree object,
 	    break;
 	}
 
+      /* Trap after evaluating all call arguments, as it is not expected that
+	 we get to this point after the `noreturn' parameter.  */
+      saved_args = compound_expr (saved_args, build_trap_call ());
+
       /* Add a stub result type for the expression.  */
       tree result = build_zero_cst (TREE_TYPE (ctype));
       return compound_expr (saved_args, result);

gcc/d/d-tree.h

@@ -608,6 +608,7 @@ extern tree build_bounds_index_condition (IndexExp *, tree, tree);
 extern tree build_bounds_slice_condition (SliceExp *, tree, tree, tree);
 extern bool array_bounds_check (void);
 extern bool checkaction_trap_p (void);
+extern tree build_trap_call (void);
 extern TypeFunction *get_function_type (Type *);
 extern bool call_side_effect_free_p (FuncDeclaration *, Type *);
 extern bool call_by_alias_p (FuncDeclaration *, FuncDeclaration *);

gcc/d/expr.cc

@@ -1783,13 +1783,12 @@ class ExprVisitor : public Visitor
     else if (global.params.useAssert == CHECKENABLEon && checkaction_trap_p ())
       {
 	/* Generate: __builtin_trap()  */
-	tree fn = builtin_decl_explicit (BUILT_IN_TRAP);
-	assert_fail = build_call_expr (fn, 0);
+	assert_fail = build_trap_call ();
       }
     else
       {
 	/* Assert contracts are turned off.  */
-	this->result_ = void_node;
+	this->result_ = build_zero_cst (build_ctype (e->type));
 	return;
       }
 
@@ -1905,8 +1904,7 @@ class ExprVisitor : public Visitor
   void visit (HaltExp *) final override
   {
     /* Should we use trap() or abort()?  */
-    tree ttrap = builtin_decl_explicit (BUILT_IN_TRAP);
-    this->result_ = build_call_expr (ttrap, 0);
+    this->result_ = build_trap_call ();
   }
 
   /* Build a symbol pointer offset expression.  */

gcc/testsuite/gdc.dg/pr124922.d

@@ -0,0 +1,11 @@
+// { dg-do compile }
+// { dg-additional-options "-fno-assert -fdump-tree-original" }
+module object;
+alias noreturn = typeof(*null);
+void main()
+{
+    void function(noreturn) fun;
+    noreturn bar;
+    fun(bar);
+}
+// { dg-final { scan-tree-dump-times "__builtin_trap" 1 "original" } }