minor improvements to ExceptionalUnitGraph and ThrowableSet #1667
+74
−91
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tim-hoffman
commented
Jun 17, 2021
| @@ -322,8 +325,8 @@ protected void initialize(ThrowAnalysis throwAnalysis, boolean omitExceptingUnit | |||
| * @return a <code>Map</code> which whose contents are equivalent to the input <code>map</code>, plus the information that | |||
| * <code>u</code> throws <code>caught</code> to <code>t</code>. | |||
| */ | |||
| private Map<Unit, Collection<ExceptionDest>> addDestToMap(Map<Unit, Collection<ExceptionDest>> map, Unit u, Trap t, | |||
| ThrowableSet caught) { | |||
| protected Map<Unit, Collection<ExceptionDest>> addDestToMap(Map<Unit, Collection<ExceptionDest>> map, Unit u, | |||
There was a problem hiding this comment.
Make it protected to allow a subclass to use and/or override it.
tim-hoffman
commented
Jun 17, 2021
| @@ -667,8 +670,6 @@ private void buildHeadsAndTails(Set<Unit> additionalHeads) { | |||
| Collection<ExceptionDest> result = unitToExceptionDests.get(u); | |||
| if (result == null) { | |||
| ExceptionDest e = new ExceptionDest(null, null) { | |||
| private ThrowableSet throwables; | |||
There was a problem hiding this comment.
ExceptionDest already defines this field, it was just private so it was not accessible. So I removed the private from that field and remove this field so there would be no duplication.
tim-hoffman
commented
Jun 17, 2021
| @@ -255,47 +255,50 @@ protected void initialize(ThrowAnalysis throwAnalysis, boolean omitExceptingUnit | |||
| * extending <code>ExceptionalUnitGraph</code>. If a <code>Unit</code> throws one or more exceptions which are | |||
| * caught within the method, it will be mapped to a <code>Collection</code> of <code>ExceptionDest</code>s | |||
| * describing the sets of exceptions that the <code>Unit</code> might throw to each {@link Trap}. But if all of a | |||
| * <code>Unit</code>'s exceptions escape the method, it will be mapped to <code>null</code, rather than to a | |||
| * <code>Unit</code>'s exceptions escape the method, it will be mapped to <code>null</code>, rather than to a | |||
| * <code>Collection</code> containing a single <code>ExceptionDest</code> with a <code>null</code> trap. (The | |||
| * special case for <code>Unit</code>s with no caught exceptions allows <code>buildExceptionDests()</code> to | |||
| * ignore completely <code>Unit</code>s which are outside the scope of all <code>Trap</code>s.) | |||
| * </p> | |||
| */ | |||
| protected Map<Unit, Collection<ExceptionDest>> buildExceptionDests(ThrowAnalysis throwAnalysis) { | |||
There was a problem hiding this comment.
Restructured this method a bit to avoid unnecessary work when body.getTraps() is empty and to avoid obtaining ThrowableSet.Manager.v().EMPTY repeatedly.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.