Merge branch 'master' into amakeev/gradle

# Conflicts:
#	community/plugins/gradle/src/org/jetbrains/plugins/gradle/service/settings/IdeaGradleProjectSettingsControlBuilder.java

GitOrigin-RevId: d931e798108685731bf185f7c2e3221680b8e5a2
This commit is contained in:
Anton Makeev
2019-05-15 13:31:00 +02:00
committed by intellij-monorepo-bot
parent c66c8fc54e
commit c25785846b
9 changed files with 10 additions and 10 deletions

View File

@@ -745,7 +745,7 @@ public class ControlFlowGraph implements CodeConstants {
return res;
}
private static void addToReversePostOrderListIterative(BasicBlock root, List<BasicBlock> lst) {
private static void addToReversePostOrderListIterative(BasicBlock root, List<? super BasicBlock> lst) {
LinkedList<BasicBlock> stackNode = new LinkedList<>();
LinkedList<Integer> stackIndex = new LinkedList<>();