dfa: overriding @NotNull has precedence over super method @Nullable

java/java-tests/testData/inspection/dataFlow/fixture/NotNullOverridesNullable.java

@@ -0,0 +1,26 @@
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.lang.Object;
+import java.lang.Override;
+
+class Super {
+  @Nullable Object foo() {
+    return null;
+  }
+}
+
+class Main extends Super {
+  @NotNull
+  @Override
+  Object foo() {
+    return 2;
+  }
+
+  void bar(@NotNull Object o) {}
+
+  void goo() {
+    bar(foo());
+  }
+
+}

java/java-tests/testSrc/com/intellij/codeInspection/DataFlowInspectionTest.java

@@ -279,6 +279,8 @@ public class DataFlowInspectionTest extends LightCodeInsightFixtureTestCase {
   public void testSameComparisonTwice() { doTest(); }
   public void testRootThrowableCause() { doTest(); }
 
+  public void testNotNullOverridesNullable() { doTest(); }
+
   public void testOverridingInferredNotNullMethod() { doTest(); }
   public void testUseInferredContracts() { doTest(); }
   public void testContractWithNoArgs() { doTest(); }

java/java-tests/testSrc/com/intellij/codeInspection/DataFlowInspectionTestSuite.java

@@ -37,6 +37,8 @@ public class DataFlowInspectionTestSuite {
     suite.addTestSuite(SliceBackwardTest.class);
     suite.addTestSuite(SmartTypeCompletionDfaTest.class);
     suite.addTestSuite(NormalCompletionDfaTest.class);
+    suite.addTestSuite(NullableStuffInspectionTest.class);
+    suite.addTestSuite(NullableStuffInspection14Test.class);
     return suite;
   }
 }