2009-06-22 Shujing Zhao <pearly.zhao@oracle.com>

	* alias.c: Use REG_P, MEM_P, CONST_INT_P, LABEL_P, CALL_P, NOTE_P and
	JUMP_TABLE_DATA_P predicates where applicable.
	* auto-inc-dec.c: Ditto.
	* builtins.c: Ditto.
	* caller-save.c: Ditto.
	* calls.c: Ditto.
	* cfgcleanup.c: Ditto.
	* cfglayout.c: Ditto.
	* cfgrtl.c: Ditto.
	* combine.c: Ditto.
	* combine-stack-adj.c: Ditto.
	* cse.c: Ditto.
	* cselib.c: Ditto.
	* dbxout.c: Ditto.
	* df-scan.c: Ditto.
	* dse.c: Ditto.
	* dwarf2asm.c: Ditto.
	* dwarf2out.c: Ditto.
	* emit-rtl.c: Ditto.
	* except.c: Ditto.
	* explow.c: Ditto.
	* expmed.c: Ditto.
	* expr.c: Ditto.
	* final.c: Ditto.
	* function.c: Ditto.
	* fwprop.c: Ditto.
	* gcse.c: Ditto.
	* genpreds.c: Ditto.
	* genrecog.c: Ditto.
	* ifcvt.c: Ditto.
	* ira-costs.c: Ditto.
	* ira-lives.c: Ditto.
	* jump.c: Ditto.
	* loop-iv.c: Ditto.
	* lower-subreg.c: Ditto.
	* modulo-sched.c: Ditto.
	* optabs.c: Ditto.
	* postreload.c: Ditto.
	* print-rtl.c: Ditto.
	* recog.c: Ditto.
	* reginfo.c: Ditto.
	* regmove.c: Ditto.
	* reload1.c: Ditto.
	* reload.c: Ditto.
	* reorg.c: Ditto.
	* rtlanal.c: Ditto.
	* rtl.c: Ditto.
	* sched-vis.c: Ditto.
	* sdbout.c: Ditto.
	* sel-sched-ir.c: Ditto.
	* simplify-rtx.c: Ditto.
	* targhooks.c: Ditto.
	* var-tracking.c: Ditto.
	* vmsdbgout.c: Ditto.



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@148786 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 9 insertions, 10 deletions

diff --git a/gcc/var-tracking.c b/gcc/var-tracking.c
index 56e50c2c36d..79bdce6417f 100644
--- a/gcc/var-tracking.c
+++ b/gcc/var-tracking.c
@@ -406,7 +406,7 @@ stack_adjust_offset_pre_post (rtx pattern, HOST_WIDE_INT *pre,
       code = GET_CODE (src);
       if (! (code == PLUS || code == MINUS)
 	  || XEXP (src, 0) != stack_pointer_rtx
-	  || GET_CODE (XEXP (src, 1)) != CONST_INT)
+	  || !CONST_INT_P (XEXP (src, 1)))
 	return;
 
       if (code == MINUS)
@@ -429,7 +429,7 @@ stack_adjust_offset_pre_post (rtx pattern, HOST_WIDE_INT *pre,
 	      rtx val = XEXP (XEXP (src, 1), 1);
 	      /* We handle only adjustments by constant amount.  */
 	      gcc_assert (GET_CODE (XEXP (src, 1)) == PLUS &&
-			  GET_CODE (val) == CONST_INT);
+			  CONST_INT_P (val));
 	      
 	      if (code == PRE_MODIFY)
 		*pre -= INTVAL (val);
@@ -2220,9 +2220,9 @@ compute_bb_dataflow (basic_block bb)
 	      if (! flag_var_tracking_uninit)
 		status = VAR_INIT_STATUS_INITIALIZED;
 
-	      if (GET_CODE (loc) == REG)
+	      if (REG_P (loc))
 		var_reg_set (out, loc, status, NULL);
-	      else if (GET_CODE (loc) == MEM)
+	      else if (MEM_P (loc))
 		var_mem_set (out, loc, status, NULL);
 	    }
 	    break;
@@ -2953,17 +2953,16 @@ emit_note_insn_var_location (void **varp, void *data)
 	    }
 	  else if (MEM_P (loc[n_var_parts])
 		   && GET_CODE (XEXP (loc2, 0)) == PLUS
-		   && GET_CODE (XEXP (XEXP (loc2, 0), 0)) == REG
-		   && GET_CODE (XEXP (XEXP (loc2, 0), 1)) == CONST_INT)
+		   && REG_P (XEXP (XEXP (loc2, 0), 0))
+		   && CONST_INT_P (XEXP (XEXP (loc2, 0), 1)))
 	    {
-	      if ((GET_CODE (XEXP (loc[n_var_parts], 0)) == REG
+	      if ((REG_P (XEXP (loc[n_var_parts], 0))
 		   && rtx_equal_p (XEXP (loc[n_var_parts], 0),
 				   XEXP (XEXP (loc2, 0), 0))
 		   && INTVAL (XEXP (XEXP (loc2, 0), 1))
 		      == GET_MODE_SIZE (mode))
 		  || (GET_CODE (XEXP (loc[n_var_parts], 0)) == PLUS
-		      && GET_CODE (XEXP (XEXP (loc[n_var_parts], 0), 1))
-			 == CONST_INT
+		      && CONST_INT_P (XEXP (XEXP (loc[n_var_parts], 0), 1))
 		      && rtx_equal_p (XEXP (XEXP (loc[n_var_parts], 0), 0),
 				      XEXP (XEXP (loc2, 0), 0))
 		      && INTVAL (XEXP (XEXP (loc[n_var_parts], 0), 1))
@@ -3152,7 +3151,7 @@ emit_notes_in_bb (basic_block bb)
 	      enum var_init_status status = VAR_INIT_STATUS_UNINITIALIZED;
 	      if (! flag_var_tracking_uninit)
 		status = VAR_INIT_STATUS_INITIALIZED;
-	      if (GET_CODE (loc) == REG)
+	      if (REG_P (loc))
 		var_reg_set (&set, loc, status, NULL);
 	      else
 		var_mem_set (&set, loc, status, NULL);