Bug 581774 - OT-smart breaks MatchLocater in

JavaSearchBugs16Tests.testAIOOBEForRecordClassGh790()

Avoid reading requesting type SystemModules$0 from SourceMapper
Avoid TheNotFoundType in one more situation which would AbortCompilation

2 files changed, 2 insertions, 2 deletions

diff --git a/org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/lookup/PackageBinding.java b/org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/lookup/PackageBinding.java
index 5e9094796..937182631 100644
--- a/org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/lookup/PackageBinding.java
+++ b/org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/lookup/PackageBinding.java
@@ -91,7 +91,7 @@ protected void addNotFoundPackage(char[] simpleName) {
 }
 //{ObjectTeams: ROFI changed visibility, was private
 void addNotFoundType(char[] simpleName) {
-	if (this.dontRememberNotFoundType) return;
+	if (this.dontRememberNotFoundType || this.environment.root.mayTolerateMissingType) return;
 // SH}
 	if (this.environment.suppressImportErrors)
 		return;
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SourceMapper.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SourceMapper.java
index a6175c786..d3f9c4e0a 100644
--- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SourceMapper.java
+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SourceMapper.java
@@ -1164,7 +1164,7 @@ public class SourceMapper
   :giro */
 		char[] source = internalFindSource((NamedMember) type, name);
 		try {
-			if (source == null && Flags.isRole(type.getFlags())) {
+			if (source == null && type.getDeclaringType() != null && Flags.isRole(type.getFlags())) {
 				simpleSourceFileName = type.getDeclaringType().getElementName()+'/'+simpleSourceFileName;
 				name = org.eclipse.jdt.internal.core.util.Util.concatWith(pkgFrag.names, simpleSourceFileName, '/');
 				return internalFindSource((NamedMember) type, name);