--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/model/JavacElements.java	Fri Apr 27 09:57:16 2018 -0700
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/model/JavacElements.java	Fri Apr 27 15:55:29 2018 -0700
@@ -247,14 +247,15 @@
             if (sym == null)
                 sym = javaCompiler.resolveIdent(module, nameStr);
 
-            sym.complete();
-
-            return (sym.kind != ERR &&
+            if (clazz.isInstance(sym)) {
+                sym.complete();
+                if (sym.kind != ERR &&
                     sym.exists() &&
-                    clazz.isInstance(sym) &&
-                    name.equals(sym.getQualifiedName()))
-                ? clazz.cast(sym)
-                : null;
+                    name.equals(sym.getQualifiedName())) {
+                    return clazz.cast(sym);
+                }
+            }
+            return null;
         } catch (CompletionFailure cf) {
             cf.dcfh.handleAPICompletionFailure(cf);
             return null;