From: charlet Date: Mon, 2 May 2016 10:37:34 +0000 (+0000) Subject: Minor reformatting. X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=621e067b83de5ee9e568ca8f01e104cc02d48a70;p=thirdparty%2Fgcc.git Minor reformatting. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@235747 138bc75d-0d04-0410-961f-82ee72b054a4 --- diff --git a/gcc/ada/exp_ch6.adb b/gcc/ada/exp_ch6.adb index aff75ac00bb8..dbdd33dc8fc3 100644 --- a/gcc/ada/exp_ch6.adb +++ b/gcc/ada/exp_ch6.adb @@ -3977,7 +3977,7 @@ package body Exp_Ch6 is begin Inst := Scope (Subp); - -- Find enclosing instance. + -- Find enclosing instance while Present (Inst) and then Inst /= Standard_Standard loop exit when Is_Generic_Instance (Inst); @@ -4002,11 +4002,11 @@ package body Exp_Ch6 is null; else - -- The instantiation node follows the package - -- declaration for the instance. If the generic - -- unit had aspect specifications, they have - -- been transformed into pragmas in the instance, - -- and the instance node appears after them. + -- The instantiation node usually follows the package + -- declaration for the instance. If the generic unit + -- has aspect specifications, they are transformed + -- into pragmas in the instance, and the instance node + -- appears after them. Inst_Node := Next (Decl); diff --git a/gcc/ada/s-memory.adb b/gcc/ada/s-memory.adb index 009efa2c13a7..48e3a3def16f 100644 --- a/gcc/ada/s-memory.adb +++ b/gcc/ada/s-memory.adb @@ -67,6 +67,7 @@ package body System.Memory is function Alloc (Size : size_t) return System.Address is Result : System.Address; + begin if Parameters.No_Abort then Result := c_malloc (System.CRTL.size_t (Size)); @@ -77,6 +78,7 @@ package body System.Memory is end if; if Result = System.Null_Address then + -- If Size = 0, we can't allocate 0 bytes, because then two different -- allocators, one of which has Size = 0, could return pointers that -- compare equal, which is wrong. (Nonnull pointers compare equal if