D: Adjust the code-gen for a string constant.

In this function, we are generating a string constant but do so with
a mismatch between the actual string length and the length specified
in the type.  This causes Darwin, at least, to place the string in an
unexpected section (since the parameters do not match, it is rejected
as a cstring).

Use build_string_literal() to construct a consistent null-terminated
string.

gcc/d/ChangeLog:

	* d-codegen.cc (build_filename_from_loc): Use
	build_string_literal() to build a null-terminated string for
	the filename.

Signed-off-by: Iain Sandoe <iain@sandoe.co.uk>

diff --git a/gcc/d/d-codegen.cc b/gcc/d/d-codegen.cc
index e35f75af58436fd4bbad3fafd0aacbcccf2307d3..f3c3e4ab691bd8b391165ae1bebbeded6e0ee004 100644 (file)
--- a/gcc/d/d-codegen.cc
+++ b/gcc/d/d-codegen.cc
@@ -1939,11 +1939,7 @@ build_filename_from_loc (const Loc &loc)
   if (filename == NULL)
     filename = d_function_chain->module->srcfile.toChars ();
 
-  unsigned length = strlen (filename);
-  tree str = build_string (length, filename);
-  TREE_TYPE (str) = make_array_type (Type::tchar, length + 1);
-
-  return build_address (str);
+  return build_string_literal (filename);
 }
 
 /* Builds a CALL_EXPR at location LOC in the source file to call LIBCALL when