OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

go-gcc.cc (Gcc_backend::global_variable): If type is zero-sized, add a VIEW_CONVERT_EXPR to the tree. 

* go-gcc.cc (Gcc_backend::global_variable): If type is zero-sized,
	add a VIEW_CONVERT_EXPR to the tree.
	(Gcc_backend::global_variable_set_init): Remove any
	VIEW_CONVERT_EXPR.
	(Gcc_backend::write_global_definitions): Likewise.

From-SVN: r231888
This commit is contained in:
Ian Lance Taylor 2015-12-22 00:10:07 +00:00 committed by Ian Lance Taylor
parent bf507c789e
commit 8fd41e922d
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gcc/go/ChangeLog
View File

@ -1,3 +1,11 @@
2015-12-21 Ian Lance Taylor <iant@google.com>
* go-gcc.cc (Gcc_backend::global_variable): If type is zero-sized,
add a VIEW_CONVERT_EXPR to the tree.
(Gcc_backend::global_variable_set_init): Remove any
VIEW_CONVERT_EXPR.
(Gcc_backend::write_global_definitions): Likewise.
2015-11-30 Ian Lance Taylor <iant@google.com>
PR go/68477

16
gcc/go/go-gcc.cc
View File

@ -2390,6 +2390,7 @@ Gcc_backend::global_variable(const std::string& package_name,
return this->error_variable();
// The GNU linker does not like dynamic variables with zero size.
tree orig_type_tree = type_tree;
if ((is_external || !is_hidden) && int_size_in_bytes(type_tree) == 0)
type_tree = this->non_zero_size_type(type_tree);
@ -2419,6 +2420,10 @@ Gcc_backend::global_variable(const std::string& package_name,
go_preserve_from_gc(decl);
if (orig_type_tree != type_tree)
decl = fold_build1_loc(location.gcc_location(), VIEW_CONVERT_EXPR,
orig_type_tree, decl);
return new Bvariable(decl);
}
@ -2434,6 +2439,10 @@ Gcc_backend::global_variable_set_init(Bvariable* var, Bexpression* expr)
tree var_decl = var->get_tree();
if (var_decl == error_mark_node)
return;
// Undo the VIEW_CONVERT_EXPR that may have been added by
// global_variable.
if (TREE_CODE(var_decl) == VIEW_CONVERT_EXPR)
var_decl = TREE_OPERAND(var_decl, 0);
DECL_INITIAL(var_decl) = expr_tree;
// If this variable goes in a unique section, it may need to go into
@ -3030,7 +3039,12 @@ Gcc_backend::write_global_definitions(
{
if ((*p)->get_tree() != error_mark_node)
{
defs[i] = (*p)->get_tree();
tree t = (*p)->get_tree();
// Undo the VIEW_CONVERT_EXPR that may have been added by
// global_variable.
if (TREE_CODE(t) == VIEW_CONVERT_EXPR)
t = TREE_OPERAND(t, 0);
defs[i] = t;
go_preserve_from_gc(defs[i]);
++i;
}