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

[Bill Wendling]

Author: void
Date: Wed Jul 30 13:45:09 2008
New Revision: 54227

URL: http://llvm.org/viewvc/llvm-project?rev=54227&view=rev
Log:
Don't use C language-specific stuff in here. Check for ObjC the correct way.

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=54227&r1=54226&r2=54227&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/dwarf2out.c (original)
+++ llvm-gcc-4.2/trunk/gcc/dwarf2out.c Wed Jul 30 13:45:09 2008
@@ -69,9 +69,6 @@
 #include "hashtab.h"
 #include "cgraph.h"
 #include "input.h"
-/* APPLE LOCAL radar 5811943 - Fix type of pointers to Blocks  */
-/* APPLE LOCAL Radar 5741731, typedefs used in '@try' blocks    */ 
-#include "c-common.h"
 
 #ifdef DWARF2_DEBUGGING_INFO
 static void dwarf2out_source_line (unsigned int, const char *);
@@ -4099,6 +4096,7 @@
 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);
+static bool is_objc(void);
 static bool is_java (void);
 static bool is_fortran (void);
 static bool is_ada (void);
@@ -5493,6 +5491,16 @@
   return lang == DW_LANG_C_plus_plus || lang == DW_LANG_ObjC_plus_plus;
 }
 
+/* Return TRUE if the language is objc.  */
+
+static inline bool
+is_objc (void)
+{
+  unsigned int lang = get_AT_unsigned (comp_unit_die, DW_AT_language);
+
+  return lang == DW_LANG_ObjC;
+}
+
 /* Return TRUE if the language is Fortran.  */
 
 static inline bool
@@ -8615,7 +8623,7 @@
 
   /* APPLE LOCAL begin Radar 5741731, typedefs used in '@try' blocks    */ 
   if (is_volatile_type
-      && c_dialect_objc ()
+      && is_objc ()
       && lookup_attribute ("objc_volatilized", TYPE_ATTRIBUTES (type)))
     {
       is_volatile_type = 0;