fix some empty stack exceptions during dfa analysis

java/java-impl/src/com/intellij/codeInspection/dataFlow/ControlFlowAnalyzer.java

@@ -532,9 +532,10 @@ class ControlFlowAnalyzer extends JavaElementVisitor {
       generateBoxingUnboxingInstructionFor(caseExpression, PsiType.INT);
       if (TypeConversionUtil.isEnumType(caseExpression.getType())) {
         addInstruction(new FieldReferenceInstruction(caseExpression, "switch statement expression"));
+      } else {
+        addInstruction(new PopInstruction());
       }
 
-      addInstruction(new PopInstruction());
     }
 
     PsiCodeBlock body = switchStmt.getBody();

java/java-impl/src/com/intellij/codeInspection/dataFlow/DataFlowRunner.java

@@ -161,7 +161,8 @@ public class DataFlowRunner {
       LOG.error(psiBlock.getText(), e); /* TODO[max] !!! hack (of 18186). Please fix in better times. */
       return RunnerResult.ABORTED;
     }
-    catch (EmptyStackException e) /* TODO[max] !!! hack (of 18186). Please fix in better times. */ {
+    catch (EmptyStackException e) {
+      //LOG.error(psiBlock.getText(), e); /* TODO[max] !!! hack (of 18186). Please fix in better times. */
       return RunnerResult.ABORTED;
     }
   }

java/java-impl/src/com/intellij/codeInspection/dataFlow/instructions/MethodCallInstruction.java

@@ -57,7 +57,7 @@ public class MethodCallInstruction extends Instruction {
   public MethodCallInstruction(@NotNull PsiExpression context, MethodType methodType) {
     myContext = context;
     myMethodType = methodType;
-    myCall = context instanceof PsiCallExpression ? (PsiCallExpression)context : null;
+    myCall = methodType == MethodType.REGULAR_METHOD_CALL && context instanceof PsiCallExpression ? (PsiCallExpression)context : null;
     final PsiExpressionList argList = myCall == null ? null : myCall.getArgumentList();
     myArgs = argList != null ? argList.getExpressions() : PsiExpression.EMPTY_ARRAY;
 

java/java-tests/testData/codeInsight/completion/normal/OrAssignmentDfa.java

@@ -0,0 +1,17 @@
+class Foo {
+
+    boolean foo(Object o, final PairFunction<String, ElementType, Boolean> fun){
+        boolean result = true;
+        result |= fun.fun(path);
+        if (o instanceof String) {
+            o.subst<caret>
+        }
+    }
+
+    void foo(String s) {}
+}
+
+interface PairFunction<T, V, U> {
+  U fun(T t, V v);
+
+}

java/java-tests/testData/codeInsight/completion/normal/OrAssignmentDfa_after.java

@@ -0,0 +1,17 @@
+class Foo {
+
+    boolean foo(Object o, final PairFunction<String, ElementType, Boolean> fun){
+        boolean result = true;
+        result |= fun.fun(path);
+        if (o instanceof String) {
+            ((String) o).substring(<caret>)
+        }
+    }
+
+    void foo(String s) {}
+}
+
+interface PairFunction<T, V, U> {
+  U fun(T t, V v);
+
+}

java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy

@@ -809,6 +809,8 @@ public class NormalCompletionTest extends LightFixtureCompletionTestCase {
   public void testQualifierCastingWithUnknownAssignments() throws Throwable { doTest(); }
   public void testQualifierCastingBeforeLt() throws Throwable { doTest(); }
 
+  public void testOrAssignmentDfa() throws Throwable { doTest(); }
+
   public void testWildcardsInLookup() throws Exception {
     configure()
     assertNotNull(getLookup());