--- a/test/langtools/tools/javac/6330997/T6330997.java	Mon Jun 04 12:51:24 2018 +0200
+++ b/test/langtools/tools/javac/6330997/T6330997.java	Mon Jun 04 12:54:13 2018 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -44,7 +44,7 @@
 import com.sun.tools.javac.api.JavacTaskImpl;
 import com.sun.tools.javac.code.ClassFinder.BadClassFile;
 import com.sun.tools.javac.code.Symtab;
-import com.sun.tools.javac.main.JavaCompiler;
+import com.sun.tools.javac.util.Names;
 import javax.tools.ToolProvider;
 
 public class T6330997 {
@@ -53,17 +53,17 @@
         increaseMajor("T2.class", 2);
         javax.tools.JavaCompiler tool = ToolProvider.getSystemJavaCompiler();
         JavacTaskImpl task = (JavacTaskImpl)tool.getTask(null, null, null, null, null, null);
-        JavaCompiler compiler = JavaCompiler.instance(task.getContext());
         Symtab syms = Symtab.instance(task.getContext());
+        Names names = Names.instance(task.getContext());
         task.ensureEntered();
         try {
-            compiler.resolveIdent(syms.unnamedModule, "T1").complete();
+            syms.enterClass(syms.unnamedModule, names.fromString("T1")).complete();
         } catch (Exception e) {
             e.printStackTrace();
             throw new RuntimeException("Failed: unexpected exception while reading class T1");
         }
         try {
-            compiler.resolveIdent(syms.unnamedModule, "T2").complete();
+            syms.enterClass(syms.unnamedModule, names.fromString("T2")).complete();
         } catch (BadClassFile e) {
             System.err.println("Passed: expected completion failure " + e.getClass().getName());
             return;