diff options
| author | Arnaud Charlet <charlet@gcc.gnu.org> | 2016-05-02 12:37:34 +0200 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2016-05-02 12:37:34 +0200 |
| commit | c408fb34f9068cf559e8065b60fdf44450377a67 (patch) | |
| tree | f73f00345b6819ac16ada24f11ced83e1f65690d /gcc | |
| parent | a56886e9df65ee26c605446e80470f2a6c2e2e82 (diff) | |
| download | gcc-c408fb34f9068cf559e8065b60fdf44450377a67.zip gcc-c408fb34f9068cf559e8065b60fdf44450377a67.tar.gz gcc-c408fb34f9068cf559e8065b60fdf44450377a67.tar.bz2 | |
Minor reformatting.
From-SVN: r235747
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ada/exp_ch6.adb | 12 | ||||
| -rw-r--r-- | gcc/ada/s-memory.adb | 2 |
2 files changed, 8 insertions, 6 deletions
diff --git a/gcc/ada/exp_ch6.adb b/gcc/ada/exp_ch6.adb index aff75ac..dbdd33d 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 009efa2..48e3a3d 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 |