[LLVMdev] Review: minor patches to llvm-gcc-4-2

[Scott Michel]

Index: gcc/gimplify.c
===================================================================
--- gcc/gimplify.c      (revision 39923)
+++ gcc/gimplify.c      (working copy)
@@ -179,8 +179,10 @@
   /* LLVM LOCAL begin */
 #ifndef ENABLE_LLVM
   /* LLVM wants to know about gimple formal temps. */
-  for (t = gimplify_ctxp->temps; t ; t = TREE_CHAIN (t))
-    DECL_GIMPLE_FORMAL_TEMP_P (t) = 0;
+  if (gimplify_ctxp != 0) {
+    for (t = gimplify_ctxp->temps; t ; t = TREE_CHAIN (t))
+      DECL_GIMPLE_FORMAL_TEMP_P (t) = 0;
+  }
 #else
   t = 0;
 #endif
Index: gcc/fold-const.c
===================================================================
--- gcc/fold-const.c    (revision 39923)
+++ gcc/fold-const.c    (working copy)
@@ -12942,11 +12942,11 @@
 {
   if ((TREE_CODE (exp) == INDIRECT_REF
        || TREE_CODE (exp) == ARRAY_REF)
-      && TREE_CODE (TREE_TYPE (exp)) == INTEGER_TYPE &&
+      && TREE_CODE (TREE_TYPE (exp)) == INTEGER_TYPE
 /* LLVM LOCAL begin */
 #if ENABLE_LLVM
     /* LLVM extends ARRAY_REF to allow pointers to be the base value. */
-      (TREE_CODE (TREE_TYPE (TREE_OPERAND (exp, 0))) == ARRAY_TYPE)
+      && (TREE_CODE (TREE_TYPE (TREE_OPERAND (exp, 0))) == ARRAY_TYPE)
 #endif
 /* LLVM LOCAL end */
     )