2014-11-20 Vadim Godunko <godunko@adacore.com>

	* a-strunb-shared.adb, a-stwiun-shared.adb, a-stzunb-shared.adb
	("&") Use already computed value of data length to call allocation
	subprogram.

From-SVN: r217860

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index d25786bc7c78a6a41aa67a5f2febe489a000e855..d5473a1c4d8f6b01961eaddb07e1b162d1bd1814 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,9 @@
+2014-11-20  Vadim Godunko  <godunko@adacore.com>
+
+       * a-strunb-shared.adb, a-stwiun-shared.adb, a-stzunb-shared.adb
+       ("&") Use already computed value of data length to call allocation
+       subprogram.
+
 2014-11-20  Ed Schonberg  <schonberg@adacore.com>
 
        * exp_ch6.adb (Expand_Call, Inlined_Subprogram): Do not suppress

diff --git a/gcc/ada/a-strunb-shared.adb b/gcc/ada/a-strunb-shared.adb
index caeb3a02676bde9d5cba551fb1e9c312f700db1f..9c9246600e7201ac45d9e0df6e468d572bf3c4ad 100644 (file)
--- a/gcc/ada/a-strunb-shared.adb
+++ b/gcc/ada/a-strunb-shared.adb
@@ -91,7 +91,7 @@ package body Ada.Strings.Unbounded is
       --  Otherwise, allocate new shared string and fill data
 
       else
-         DR := Allocate (LR.Last + RR.Last);
+         DR := Allocate (DL);
          DR.Data (1 .. LR.Last) := LR.Data (1 .. LR.Last);
          DR.Data (LR.Last + 1 .. DL) := RR.Data (1 .. RR.Last);
          DR.Last := DL;

diff --git a/gcc/ada/a-stwiun-shared.adb b/gcc/ada/a-stwiun-shared.adb
index 6c3be54083c47912bbc93180dd38f0f295efa11c..284ffd3cf9e92effb14d7db979c944fb0eaab5b0 100644 (file)
--- a/gcc/ada/a-stwiun-shared.adb
+++ b/gcc/ada/a-stwiun-shared.adb
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---          Copyright (C) 1992-2012, Free Software Foundation, Inc.         --
+--          Copyright (C) 1992-2014, Free Software Foundation, Inc.         --
 --                                                                          --
 -- GNAT is free software;  you can  redistribute it  and/or modify it under --
 -- terms of the  GNU General Public License as published  by the Free Soft- --
@@ -91,7 +91,7 @@ package body Ada.Strings.Wide_Unbounded is
       --  Overwise, allocate new shared string and fill data
 
       else
-         DR := Allocate (LR.Last + RR.Last);
+         DR := Allocate (DL);
          DR.Data (1 .. LR.Last) := LR.Data (1 .. LR.Last);
          DR.Data (LR.Last + 1 .. DL) := RR.Data (1 .. RR.Last);
          DR.Last := DL;

diff --git a/gcc/ada/a-stzunb-shared.adb b/gcc/ada/a-stzunb-shared.adb
index 37ab295369ea6dd495641b43391f3dc6e4d0989c..b71f71d5ff337792849a0890eaa5f7b86d928e11 100644 (file)
--- a/gcc/ada/a-stzunb-shared.adb
+++ b/gcc/ada/a-stzunb-shared.adb
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---          Copyright (C) 1992-2012, Free Software Foundation, Inc.         --
+--          Copyright (C) 1992-2014, Free Software Foundation, Inc.         --
 --                                                                          --
 -- GNAT is free software;  you can  redistribute it  and/or modify it under --
 -- terms of the  GNU General Public License as published  by the Free Soft- --
@@ -91,7 +91,7 @@ package body Ada.Strings.Wide_Wide_Unbounded is
       --  Overwise, allocate new shared string and fill data
 
       else
-         DR := Allocate (LR.Last + RR.Last);
+         DR := Allocate (DL);
          DR.Data (1 .. LR.Last) := LR.Data (1 .. LR.Last);
          DR.Data (LR.Last + 1 .. DL) := RR.Data (1 .. RR.Last);
          DR.Last := DL;
@@ -1614,9 +1614,9 @@ package body Ada.Strings.Wide_Wide_Unbounded is
       end if;
    end Tail;
 
-   --------------------
+   -------------------------
    -- To_Wide_Wide_String --
-   --------------------
+   -------------------------
 
    function To_Wide_Wide_String
      (Source : Unbounded_Wide_Wide_String) return Wide_Wide_String is
@@ -1624,9 +1624,9 @@ package body Ada.Strings.Wide_Wide_Unbounded is
       return Source.Reference.Data (1 .. Source.Reference.Last);
    end To_Wide_Wide_String;
 
-   ------------------------------
+   -----------------------------------
    -- To_Unbounded_Wide_Wide_String --
-   ------------------------------
+   -----------------------------------
 
    function To_Unbounded_Wide_Wide_String
      (Source : Wide_Wide_String) return Unbounded_Wide_Wide_String