[llvm-commits] [llvm-gcc-4.2] r54243 - /llvm-gcc-4.2/trunk/gcc/dwarf2out.c

[Bill Wendling]

Author: void
Date: Thu Jul 31 00:57:07 2008
New Revision: 54243

URL: http://llvm.org/viewvc/llvm-project?rev=54243&view=rev
Log:
Take into account Obj-C++.

Modified:
    llvm-gcc-4.2/trunk/gcc/dwarf2out.c

Modified: llvm-gcc-4.2/trunk/gcc/dwarf2out.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/dwarf2out.c?rev=54243&r1=54242&r2=54243&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/dwarf2out.c (original)
+++ llvm-gcc-4.2/trunk/gcc/dwarf2out.c Thu Jul 31 00:57:07 2008
@@ -4096,7 +4096,10 @@
 static inline dw_die_ref get_AT_ref (dw_die_ref, enum dwarf_attribute);
 static bool is_c_family (void);
 static bool is_cxx (void);
+/* LLVM LOCAL begin */
 static bool is_objc(void);
+static bool is_objcxx(void);
+/* LLVM LOCAL end */
 static bool is_java (void);
 static bool is_fortran (void);
 static bool is_ada (void);
@@ -5491,6 +5494,7 @@
   return lang == DW_LANG_C_plus_plus || lang == DW_LANG_ObjC_plus_plus;
 }
 
+/* LLVM LOCAL begin */
 /* Return TRUE if the language is objc.  */
 
 static inline bool
@@ -5501,6 +5505,17 @@
   return lang == DW_LANG_ObjC;
 }
 
+/* Return TRUE if the language is objc++.  */
+
+static inline bool
+is_objcxx (void)
+{
+  unsigned int lang = get_AT_unsigned (comp_unit_die, DW_AT_language);
+
+  return lang == DW_LANG_ObjC_plus_plus;
+}
+/* LLVM LOCAL end */
+
 /* Return TRUE if the language is Fortran.  */
 
 static inline bool
@@ -8623,7 +8638,8 @@
 
   /* APPLE LOCAL begin Radar 5741731, typedefs used in '@try' blocks    */ 
   if (is_volatile_type
-      && is_objc ()
+      /* LLVM LOCAL */
+      && (is_objc () || is_objcxx ())
       && lookup_attribute ("objc_volatilized", TYPE_ATTRIBUTES (type)))
     {
       is_volatile_type = 0;