--- old/src/jdk.compiler/share/classes/com/sun/tools/javac/code/ClassFinder.java	2017-02-08 11:44:45.692921675 -0800
+++ new/src/jdk.compiler/share/classes/com/sun/tools/javac/code/ClassFinder.java	2017-02-08 11:44:45.555920646 -0800
@@ -554,11 +554,19 @@
         Location classLocn = msym.classLocation;
         Location sourceLocn = msym.sourceLocation;
         Location patchLocn = msym.patchLocation;
+        Location patchOutLocn = msym.patchOutputLocation;
 
         boolean prevPreferCurrent = preferCurrent;
 
         try {
             preferCurrent = false;
+            if (wantClassFiles && (patchOutLocn != null)) {
+                fillIn(p, patchOutLocn,
+                       list(patchOutLocn,
+                            p,
+                            packageName,
+                            classKinds));
+            }
             if ((wantClassFiles || wantSourceFiles) && (patchLocn != null)) {
                 Set<JavaFileObject.Kind> combined = EnumSet.noneOf(JavaFileObject.Kind.class);
                 combined.addAll(classKinds);