[llvm-branch-commits] [llvm-gcc-branch] r128411 - /llvm-gcc-4.2/branches/Apple/Morbo/gcc/fold-const.c

[Stuart Hastings]

Author: stuart
Date: Mon Mar 28 12:09:42 2011
New Revision: 128411

URL: http://llvm.org/viewvc/llvm-project?rev=128411&view=rev
Log:
Preclude ambiguous conversion from G++ FE range-merge opt.  <rdar://problem/9186245>

Modified:
    llvm-gcc-4.2/branches/Apple/Morbo/gcc/fold-const.c

Modified: llvm-gcc-4.2/branches/Apple/Morbo/gcc/fold-const.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Morbo/gcc/fold-const.c?rev=128411&r1=128410&r2=128411&view=diff
==============================================================================
--- llvm-gcc-4.2/branches/Apple/Morbo/gcc/fold-const.c (original)
+++ llvm-gcc-4.2/branches/Apple/Morbo/gcc/fold-const.c Mon Mar 28 12:09:42 2011
@@ -4307,13 +4307,11 @@
 
       if (TREE_INT_CST_HIGH (high) == hi && TREE_INT_CST_LOW (high) == lo)
 	{
-	  if (TYPE_UNSIGNED (etype))
-	    {
-	      etype = lang_hooks.types.signed_type (etype);
-	      exp = fold_convert (etype, exp);
-	    }
-	  return fold_build2 (GT_EXPR, type, exp,
-			      build_int_cst (etype, 0));
+          /* LLVM LOCAL begin 9186245 */
+          if (!TYPE_UNSIGNED(etype))
+            return fold_build2 (GT_EXPR, type, exp,
+                                build_int_cst (etype, 0));
+          /* LLVM LOCAL end 9186245 */
 	}
     }