From 5a60f56dbe32ba268524d68a7ce8df2c40cf9e53 Mon Sep 17 00:00:00 2001
From: Maurizio Cimadamore <mcimadamore@openjdk.org>
Date: Wed, 16 Jan 2013 17:40:28 +0000
Subject: [PATCH] 8005964: Regression: difference in error recovery after
 ambiguity causes JCK test failure

Wrong implementation of ResolveError.access in AmbiguityError

Reviewed-by: jjh
---
 .../src/share/classes/com/sun/tools/javac/comp/Resolve.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/Resolve.java b/langtools/src/share/classes/com/sun/tools/javac/comp/Resolve.java
index d5adb408242..2847ff1bfe8 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Resolve.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Resolve.java
@@ -3421,7 +3421,10 @@ public class Resolve {
 
         @Override
         protected Symbol access(Name name, TypeSymbol location) {
-            return ambiguousSyms.last();
+            Symbol firstAmbiguity = ambiguousSyms.last();
+            return firstAmbiguity.kind == TYP ?
+                    types.createErrorType(name, location, firstAmbiguity.type).tsym :
+                    firstAmbiguity;
         }
     }