parser.c (cp_parser_lookup_name): Tidy.

2013-10-18  Paolo Carlini  <paolo.carlini@oracle.com>

	* parser.c (cp_parser_lookup_name): Tidy.

From-SVN: r203822

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 4a5043a5f5bdfd2c6d00cf16267cda400507c240..2ef2978e1fa2d8ef3bc130b79ed44b517b8a8d81 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2013-10-18  Paolo Carlini  <paolo.carlini@oracle.com>
+
+       * parser.c (cp_parser_lookup_name): Tidy.
+
 2013-10-17  Andrew MacLeod  <amacleod@redhat.com>
 
        * parser.c: Include omp-low.h.

diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 54520b414e7874e6da8fcc5f547024be3bd138c7..10a7b962d050db0a271ee45f9eccd7f41704e22d 100644 (file)
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -21882,7 +21882,6 @@ cp_parser_lookup_name (cp_parser *parser, tree name,
     }
   else if (object_type)
     {
-      tree object_decl = NULL_TREE;
       /* Look up the name in the scope of the OBJECT_TYPE, unless the
         OBJECT_TYPE is not a class.  */
       if (CLASS_TYPE_P (object_type))
@@ -21890,19 +21889,21 @@ cp_parser_lookup_name (cp_parser *parser, tree name,
           be instantiated during name lookup.  In that case, errors
           may be issued.  Even if we rollback the current tentative
           parse, those errors are valid.  */
-       object_decl = lookup_member (object_type,
-                                    name,
-                                    /*protect=*/0,
-                                    tag_type != none_type,
-                                    tf_warning_or_error);
-      /* Look it up in the enclosing context, too.  */
-      decl = lookup_name_real (name, tag_type != none_type,
-                              /*nonclass=*/0,
-                              /*block_p=*/true, is_namespace, 0);
+       decl = lookup_member (object_type,
+                             name,
+                             /*protect=*/0,
+                             tag_type != none_type,
+                             tf_warning_or_error);
+      else
+       decl = NULL_TREE;
+
+      if (!decl)
+       /* Look it up in the enclosing context.  */
+       decl = lookup_name_real (name, tag_type != none_type,
+                                /*nonclass=*/0,
+                                /*block_p=*/true, is_namespace, 0);
       parser->object_scope = object_type;
       parser->qualifying_scope = NULL_TREE;
-      if (object_decl)
-       decl = object_decl;
     }
   else
     {