Skip to content

Fixing handling of multi-source JavaSources on older JDKs. #3321

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jlahoda wants to merge 1 commit into from
Closed

Fixing handling of multi-source JavaSources on older JDKs. #3321

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions java/java.source.base/src/org/netbeans/modules/java/source/parsing/JavacParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -772,29 +772,25 @@ Phase moveToPhase (final Phase phase, final CompilationInfoImpl currentInfo, Lis
compiler.todo.offer(env);
}
}
currentPhase = Phase.RESOLVED;
if (!lowMemoryCancel.get()) {
Copy link
Member

@sdedic sdedic Nov 17, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Completed without an exception/error, but still low memory cancel ?

Copy link
Contributor Author

@jlahoda jlahoda Nov 17, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, old(er) versions of javac will not propagate the exceptions from the parse and analyze methods. See:
openjdk/jdk@4333942

Copy link
Member

@sdedic sdedic Nov 17, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jlahoda Thanks for expanation - I don't have such a wide context, so now I better understand the core piece of this PR :)

currentPhase = Phase.RESOLVED;
}
long end = System.currentTimeMillis ();
logTime(currentInfo.getFileObject(),currentPhase,(end-start));
}
if (currentPhase == Phase.RESOLVED && phase.compareTo(Phase.UP_TO_DATE)>=0) {
currentPhase = Phase.UP_TO_DATE;
}
} catch (CancelAbort ca) {
if (lowMemoryCancel.get()) {
currentInfo.markIncomplete();
HUGE_SNAPSHOTS.add(new WeakReference<>(snapshots));
} else {
if (!lowMemoryCancel.get()) {
//real cancel
currentPhase = Phase.MODIFIED;
invalidate(false);
}
} catch (Abort abort) {
parserError = currentPhase;
} catch (RuntimeException | Error ex) {
if (lowMemoryCancel.get()) {
currentInfo.markIncomplete();
HUGE_SNAPSHOTS.add(new WeakReference<>(snapshots));
} else {
if (!lowMemoryCancel.get()) {
if (cancellable && parserCanceled.get()) {
currentPhase = Phase.MODIFIED;
invalidate(false);
Expand All @@ -805,6 +801,10 @@ Phase moveToPhase (final Phase phase, final CompilationInfoImpl currentInfo, Lis
}
}
} finally {
if (lowMemoryCancel.get()) {
Copy link
Member

@sdedic sdedic Nov 17, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, centralized low-memory conditions for all types of failures, not just Runtime + CancelAbort.

currentInfo.markIncomplete();
HUGE_SNAPSHOTS.add(new WeakReference<>(snapshots));
}
currentInfo.setPhase(currentPhase);
currentInfo.parserCrashed = parserError;
}
Expand Down