[gcc] Kill NACL_LEA_MATCH_ADDRESS_OPERAND and insn_is_nacl_lea.

gcc/gcc/reload1.c

Index: gcc/gcc/reload1.c
diff --git a/gcc/gcc/reload1.c b/gcc/gcc/reload1.c
index b40e0ea959bb33ec042857fad6df6449146b65da..fcf0bd3fc4d3588e290fb12dc69a7d623762e0ef 100644
--- a/gcc/gcc/reload1.c
+++ b/gcc/gcc/reload1.c
@@ -4321,13 +4321,7 @@ reload_as_needed (int live_known)
 				 are met after the replacement.  */
 			      extract_insn (p);
 			      if (n)
-				{
-				  if (insn_is_nacl_lea(p))
-				    NACL_LEA_MATCH_ADDRESS_OPERAND++;
-				  n = constrain_operands (1);
-				  if (insn_is_nacl_lea(p))
-				    NACL_LEA_MATCH_ADDRESS_OPERAND--;
-				}
+				n = constrain_operands (1);
 			      else
 				break;
 
@@ -5219,11 +5213,7 @@ gen_reload_chain_without_interm_reg_p (int r1, int r2)
 	  /* We want constrain operands to treat this insn strictly in
 	     its validity determination, i.e., the way it would after
 	     reload has completed.  */
-	  if (insn_is_nacl_lea(insn))
-	    NACL_LEA_MATCH_ADDRESS_OPERAND++;
 	  result = constrain_operands (1);
-	  if (insn_is_nacl_lea(insn))
-	    NACL_LEA_MATCH_ADDRESS_OPERAND--;
 	}
       
       delete_insns_since (last);
@@ -6976,12 +6966,8 @@ emit_input_reload_insns (struct insn_chain *chain, struct reload *rl,
 
 	  /* Verify that resulting insn is valid.  */
 	  extract_insn (temp);
-	  if (insn_is_nacl_lea(insn))
-	    NACL_LEA_MATCH_ADDRESS_OPERAND++;
 	  if (constrain_operands (1))
 	    {
-	      if (insn_is_nacl_lea(insn))
-		NACL_LEA_MATCH_ADDRESS_OPERAND--;
 	      /* If the previous insn is an output reload, the source is
 		 a reload register, and its spill_reg_store entry will
 		 contain the previous destination.  This is now
@@ -7008,8 +6994,6 @@ emit_input_reload_insns (struct insn_chain *chain, struct reload *rl,
 	    }
 	  else
 	    {
-	      if (insn_is_nacl_lea(insn))
-		NACL_LEA_MATCH_ADDRESS_OPERAND--;
 	      SET_DEST (PATTERN (temp)) = old;
 	    }
 	}
@@ -8125,16 +8109,8 @@ emit_insn_if_valid_for_reload (rtx insn)
       /* We want constrain operands to treat this insn strictly in its
 	 validity determination, i.e., the way it would after reload has
 	 completed.  */
-      if (insn_is_nacl_lea(insn))
-	NACL_LEA_MATCH_ADDRESS_OPERAND++;
       if (constrain_operands (1))
-	{
-	  if (insn_is_nacl_lea(insn))
-	    NACL_LEA_MATCH_ADDRESS_OPERAND--;
-	  return insn;
-	}
-      if (insn_is_nacl_lea(insn))
-	NACL_LEA_MATCH_ADDRESS_OPERAND--;
+	return insn;
     }
 
   delete_insns_since (last);
@@ -8772,12 +8748,8 @@ inc_for_reload (rtx reloadreg, rtx in, rtx value, int inc_amount)
       if (code >= 0)
 	{
 	  extract_insn (add_insn);
-	  if (insn_is_nacl_lea(add_insn))
-	    NACL_LEA_MATCH_ADDRESS_OPERAND++;
 	  if (constrain_operands (1))
 	    {
-	      if (insn_is_nacl_lea(add_insn))
-		NACL_LEA_MATCH_ADDRESS_OPERAND--;
 	      /* If this is a pre-increment and we have incremented the value
 		 where it lives, copy the incremented value to RELOADREG to
 		 be used as an address.  */
@@ -8787,8 +8759,6 @@ inc_for_reload (rtx reloadreg, rtx in, rtx value, int inc_amount)
 
 	      return add_insn;
 	    }
-	  if (insn_is_nacl_lea(add_insn))
-	    NACL_LEA_MATCH_ADDRESS_OPERAND--;
 	}
       delete_insns_since (last);
     }