diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 18e891b6dc53..60f75a3d8443 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2012-08-08  Richard Guenther  <rguenther@suse.de>
+
+	* tree-ssa-operands.h (virtual_operand_p): Declare.
+	* tree-ssa-operands.c (virtual_operand_p): New predicate.
+	* gimple.c (is_gimple_reg): Use virtual_operand_p.
+	* tree-into-ssa.c (prepare_block_for_update): Likewise.
+	* tree-vect-loop-manip.c (adjust_debug_stmts): Likewise.
+
 2012-08-08  Richard Guenther  <rguenther@suse.de>
 
 	* tree-call-cdce.c (check_pow): Simplify.
diff --git a/gcc/gimple.c b/gcc/gimple.c
index 7686f8105cd5..d78c60f22e84 100644
--- a/gcc/gimple.c
+++ b/gcc/gimple.c
@@ -2782,19 +2782,12 @@ is_gimple_id (tree t)
 bool
 is_gimple_reg (tree t)
 {
-  if (TREE_CODE (t) == SSA_NAME)
-    {
-      t = SSA_NAME_VAR (t);
-      if (TREE_CODE (t) == VAR_DECL
-	  && VAR_DECL_IS_VIRTUAL_OPERAND (t))
-	return false;
-      return true;
-    }
-
-  if (TREE_CODE (t) == VAR_DECL
-      && VAR_DECL_IS_VIRTUAL_OPERAND (t))
+  if (virtual_operand_p (t))
     return false;
 
+  if (TREE_CODE (t) == SSA_NAME)
+    return true;
+
   if (!is_gimple_variable (t))
     return false;
 
diff --git a/gcc/tree-into-ssa.c b/gcc/tree-into-ssa.c
index 74ef7f5b61d5..eb1ef6c1c9a7 100644
--- a/gcc/tree-into-ssa.c
+++ b/gcc/tree-into-ssa.c
@@ -2548,14 +2548,12 @@ prepare_block_for_update (basic_block bb, bool insert_phi_p)
       gimple phi = gsi_stmt (si);
       tree lhs_sym, lhs = gimple_phi_result (phi);
 
-      lhs_sym = DECL_P (lhs) ? lhs : SSA_NAME_VAR (lhs);
-
       if (TREE_CODE (lhs) == SSA_NAME
-	  && (TREE_CODE (lhs_sym) != VAR_DECL
-	      || !VAR_DECL_IS_VIRTUAL_OPERAND (lhs_sym)
-	      || !cfun->gimple_df->rename_vops))
+	  && (! virtual_operand_p (lhs)
+	      || ! cfun->gimple_df->rename_vops))
 	continue;
 
+      lhs_sym = DECL_P (lhs) ? lhs : SSA_NAME_VAR (lhs);
       mark_for_renaming (lhs_sym);
       mark_def_interesting (lhs_sym, phi, bb, insert_phi_p);
 
diff --git a/gcc/tree-ssa-operands.c b/gcc/tree-ssa-operands.c
index cbadfd9ae809..67e6f935972b 100644
--- a/gcc/tree-ssa-operands.c
+++ b/gcc/tree-ssa-operands.c
@@ -1421,6 +1421,24 @@ debug_immediate_uses_for (tree var)
 }
 
 
+/* Return true if OP, an SSA name or a DECL is a virtual operand.  */
+
+bool
+virtual_operand_p (tree op)
+{
+  if (TREE_CODE (op) == SSA_NAME)
+    {
+      op = SSA_NAME_VAR (op);
+      if (!op)
+	return false;
+    }
+
+  if (TREE_CODE (op) == VAR_DECL)
+    return VAR_DECL_IS_VIRTUAL_OPERAND (op);
+
+  return false;
+}
+
 /* Unlink STMTs virtual definition from the IL by propagating its use.  */
 
 void
diff --git a/gcc/tree-ssa-operands.h b/gcc/tree-ssa-operands.h
index e3fe63364a56..2d899dda45ba 100644
--- a/gcc/tree-ssa-operands.h
+++ b/gcc/tree-ssa-operands.h
@@ -116,6 +116,7 @@ extern void debug_decl_set (bitmap);
 
 extern bool ssa_operands_active (void);
 
+extern bool virtual_operand_p (tree);
 extern void unlink_stmt_vdef (gimple);
 
 enum ssa_op_iter_type {
diff --git a/gcc/tree-vect-loop-manip.c b/gcc/tree-vect-loop-manip.c
index cea8a1b8c524..5eda1f2ee10e 100644
--- a/gcc/tree-vect-loop-manip.c
+++ b/gcc/tree-vect-loop-manip.c
@@ -205,8 +205,9 @@ adjust_debug_stmts (tree from, tree to, basic_block bb)
 {
   adjust_info ai;
 
-  if (MAY_HAVE_DEBUG_STMTS && TREE_CODE (from) == SSA_NAME
-      && SSA_NAME_VAR (from) != gimple_vop (cfun))
+  if (MAY_HAVE_DEBUG_STMTS
+      && TREE_CODE (from) == SSA_NAME
+      && ! virtual_operand_p (from))
     {
       ai.from = from;
       ai.to = to;