hasting2    02/10/04 14:36:51

  Modified:    live/gcc3/gcc/config Tag: dizzy-kitty-branch darwin.c
  Log:
  Try again to fix 3032085, ICE in Mach-O x86 codegen.
  Bug #: 3032085
  Submitted by: stuart
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.70.2.2  +8 -8      src/live/gcc3/gcc/config/darwin.c
  
  Index: darwin.c
  ===================================================================
  RCS file: /cvs/Darwin/src/live/gcc3/gcc/config/darwin.c,v
  retrieving revision 1.70.2.1
  retrieving revision 1.70.2.2
  diff -u -r1.70.2.1 -r1.70.2.2
  --- darwin.c  2002/09/23 23:04:58     1.70.2.1
  +++ darwin.c  2002/10/04 21:36:50     1.70.2.2
  @@ -968,13 +968,13 @@
     else if (GET_CODE (orig) == SYMBOL_REF)
       return orig;
   
  -  else if (GET_CODE (orig) == PLUS
  -        && (GET_CODE (XEXP (orig, 0)) == MEM
  -            || GET_CODE (XEXP (orig, 0)) == SYMBOL_REF
  -            || GET_CODE (XEXP (orig, 0)) == LABEL_REF)
  -        && XEXP (orig, 0) != pic_offset_table_rtx
  -        && GET_CODE (XEXP (orig, 1)) != REG)
  -    
  +    else if (GET_CODE (orig) == PLUS
  +        && (GET_CODE (XEXP (orig, 0)) == MEM
  +            || GET_CODE (XEXP (orig, 0)) == SYMBOL_REF
  +            || GET_CODE (XEXP (orig, 0)) == LABEL_REF)
  +        && XEXP (orig, 0) != pic_offset_table_rtx
  +        && GET_CODE (XEXP (orig, 1)) != REG)
  +     
       {
         rtx base;
         int is_complex = (GET_CODE (XEXP (orig, 0)) == MEM);
  @@ -989,7 +989,7 @@
        }
         /* APPLE LOCAL begin gen ADD */
   #ifdef MASK_80387
  -      else if ((GET_CODE (XEXP (orig, 0)) == MEM))
  +      else if (GET_CODE (base) == MEM)
        {
          pic_ref = gen_rtx (PLUS, Pmode, base, orig);
          if ( ! reload_in_progress) /* necessary ? */
  
  
  


Reply via email to