[llvm-commits] [llvm-gcc-4.2] r104009 - in /llvm-gcc-4.2/trunk/gcc: config/arm/arm.c cp/mangle.c

[Bob Wilson]

Author: bwilson
Date: Mon May 17 19:37:36 2010
New Revision: 104009

URL: http://llvm.org/viewvc/llvm-project?rev=104009&view=rev
Log:
Revert r103997 and instead change arm_mangle_type to look through typedefs.

Modified:
    llvm-gcc-4.2/trunk/gcc/config/arm/arm.c
    llvm-gcc-4.2/trunk/gcc/cp/mangle.c

Modified: llvm-gcc-4.2/trunk/gcc/config/arm/arm.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config/arm/arm.c?rev=104009&r1=104008&r2=104009&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/arm/arm.c (original)
+++ llvm-gcc-4.2/trunk/gcc/config/arm/arm.c Mon May 17 19:37:36 2010
@@ -24037,6 +24037,9 @@
   /* LLVM LOCAL */
   unsigned pos;
 
+  /* LLVM LOCAL look through typedefs */
+  type = TYPE_MAIN_VARIANT (type);
+
   /* LLVM LOCAL begin half-float */
   if (arm_is_fp16(type))
     return "Dh";

Modified: llvm-gcc-4.2/trunk/gcc/cp/mangle.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/cp/mangle.c?rev=104009&r1=104008&r2=104009&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/cp/mangle.c (original)
+++ llvm-gcc-4.2/trunk/gcc/cp/mangle.c Mon May 17 19:37:36 2010
@@ -1591,7 +1591,7 @@
   else
     {
       /* APPLE LOCAL begin mangle_type 7105099 */
-      /* LLVM LOCAL removed copy to type_orig */
+      tree type_orig = type;
 
       /* See through any typedefs.  */
       type = TYPE_MAIN_VARIANT (type);
@@ -1602,8 +1602,7 @@
         {
 	  /* Handle any target-specific fundamental types.  */
 	  const char *target_mangling
-            /* LLVM LOCAL mangle based on TYPE_MAIN_VARIANT, not type_orig */
-	    = targetm.mangle_type (type);
+	    = targetm.mangle_type (type_orig);
 
 	  if (target_mangling)
 	    {