[multiple changes]

2011-08-02  Vincent Celier  <celier@adacore.com>

	* adaint.c (file_names_case_sensitive_cache): New static int.
	(__gnat_get_file_names_case_sensitive): Cache the return value in
	file_names_case_sensitive_cache at the first invocation, to avoid
	multiple calls to getenv.

2011-08-02  Bob Duff  <duff@adacore.com>

	* sem_ch12.adb (Validate_Derived_Type_Instance): Implement AI05-0218-1.

From-SVN: r177189

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index b74d7a5faf7280e07c10abf9b762705b25a9d41c..bafa761e5eb14b197d6bef2012fc3ae63b2cfe17 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,14 @@
+2011-08-02  Vincent Celier  <celier@adacore.com>
+
+       * adaint.c (file_names_case_sensitive_cache): New static int.
+       (__gnat_get_file_names_case_sensitive): Cache the return value in
+       file_names_case_sensitive_cache at the first invocation, to avoid
+       multiple calls to getenv.
+
+2011-08-02  Bob Duff  <duff@adacore.com>
+
+       * sem_ch12.adb (Validate_Derived_Type_Instance): Implement AI05-0218-1.
+
 2011-08-02  Yannick Moy  <moy@adacore.com>
 
        * sem_ch3.adb, sem_ch5.adb, sem_ch9.adb, sem_prag.adb, sem.ads,

diff --git a/gcc/ada/adaint.c b/gcc/ada/adaint.c
index 446f50018dae778e7ba50535a1284d4c881a6d8d..bfaa31a941a0a5b8b6f3b07695693817eb49a8a2 100644 (file)
--- a/gcc/ada/adaint.c
+++ b/gcc/ada/adaint.c
@@ -592,21 +592,27 @@ __gnat_get_maximum_file_name_length (void)
 
 /* Return nonzero if file names are case sensitive.  */
 
+static int file_names_case_sensitive_cache = -1;
+
 int
 __gnat_get_file_names_case_sensitive (void)
 {
-  const char *sensitive = getenv ("GNAT_FILE_NAME_CASE_SENSITIVE");
+  if (file_names_case_sensitive_cache == -1)
+    {
+      const char *sensitive = getenv ("GNAT_FILE_NAME_CASE_SENSITIVE");
 
-  if (sensitive != NULL
-      && (sensitive[0] == '0' || sensitive[0] == '1')
-      && sensitive[1] == '\0')
-    return sensitive[0] - '0';
-  else
+      if (sensitive != NULL
+          && (sensitive[0] == '0' || sensitive[0] == '1')
+          && sensitive[1] == '\0')
+        file_names_case_sensitive_cache = sensitive[0] - '0';
+      else
 #if defined (VMS) || defined (WINNT) || defined (__APPLE__)
-    return 0;
+        file_names_case_sensitive_cache = 0;
 #else
-    return 1;
+        file_names_case_sensitive_cache = 1;
 #endif
+    }
+  return file_names_case_sensitive_cache;
 }
 
 /* Return nonzero if environment variables are case sensitive.  */

diff --git a/gcc/ada/sem_ch12.adb b/gcc/ada/sem_ch12.adb
index 22c8bc3f580867b85294aa384e8313ba66e3fd9f..3c93ca3f84bbd266ba8f00a743315ef3d37c8d69 100644 (file)
--- a/gcc/ada/sem_ch12.adb
+++ b/gcc/ada/sem_ch12.adb
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---          Copyright (C) 1992-2010, Free Software Foundation, Inc.         --
+--          Copyright (C) 1992-2011, 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- --
@@ -9835,17 +9835,15 @@ package body Sem_Ch12 is
             end if;
          end if;
 
-         --  Perform atomic/volatile checks (RM C.6(12))
+         --  Perform atomic/volatile checks (RM C.6(12)). Note that AI05-0218-1
+         --  removes the second instance of the phrase "or allow pass by copy".
 
          if Is_Atomic (Act_T) and then not Is_Atomic (Ancestor) then
             Error_Msg_N
               ("cannot have atomic actual type for non-atomic formal type",
                Actual);
 
-         elsif Is_Volatile (Act_T)
-           and then not Is_Volatile (Ancestor)
-           and then Is_By_Reference_Type (Ancestor)
-         then
+         elsif Is_Volatile (Act_T) and then not Is_Volatile (Ancestor) then
             Error_Msg_N
               ("cannot have volatile actual type for non-volatile formal type",
                Actual);