OSDN Git Service

compiler: Fix multiple conversions to different named slices.
authorian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>
Tue, 13 Dec 2011 18:52:19 +0000 (18:52 +0000)
committerian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>
Tue, 13 Dec 2011 18:52:19 +0000 (18:52 +0000)
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@182293 138bc75d-0d04-0410-961f-82ee72b054a4

gcc/go/gofrontend/expressions.cc

index ab6f4fe..365e99c 100644 (file)
@@ -3669,7 +3669,7 @@ Type_conversion_expression::do_get_tree(Translate_context* context)
       if (e->integer_type()->is_unsigned()
          && e->integer_type()->bits() == 8)
        {
       if (e->integer_type()->is_unsigned()
          && e->integer_type()->bits() == 8)
        {
-         static tree string_to_byte_array_fndecl;
+         tree string_to_byte_array_fndecl = NULL_TREE;
          ret = Gogo::call_builtin(&string_to_byte_array_fndecl,
                                   this->location(),
                                   "__go_string_to_byte_array",
          ret = Gogo::call_builtin(&string_to_byte_array_fndecl,
                                   this->location(),
                                   "__go_string_to_byte_array",
@@ -3681,7 +3681,7 @@ Type_conversion_expression::do_get_tree(Translate_context* context)
       else
        {
          go_assert(e == Type::lookup_integer_type("int"));
       else
        {
          go_assert(e == Type::lookup_integer_type("int"));
-         static tree string_to_int_array_fndecl;
+         tree string_to_int_array_fndecl = NULL_TREE;
          ret = Gogo::call_builtin(&string_to_int_array_fndecl,
                                   this->location(),
                                   "__go_string_to_int_array",
          ret = Gogo::call_builtin(&string_to_int_array_fndecl,
                                   this->location(),
                                   "__go_string_to_int_array",