Merge remote-tracking branch 'aosp/upstream-master' into merge

Conflicts:
	.idea/libraries/asm_tools.xml
	.idea/libraries/bouncy_castle.xml
	.idea/libraries/builder_model.xml
	.idea/libraries/commons_compress.xml
	.idea/libraries/easymock_tools.xml
	.idea/libraries/freemarker_2_3_20.xml
	.idea/libraries/guava_tools.xml
	.idea/libraries/kxml2.xml
	.idea/libraries/lombok_ast.xml
	.idea/libraries/mockito.xml
	.idea/modules.xml
	.idea/vcs.xml
	build/scripts/layouts.gant
	updater/src/com/intellij/updater/Runner.java

Change-Id: I8e1c173e00cd76c855b8a98543b0a0edfdd99d12

1 files changed, 19 insertions, 8 deletions

diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/bytecodeAnalysis/BytecodeAnalysisConverter.java b/java/java-analysis-impl/src/com/intellij/codeInspection/bytecodeAnalysis/BytecodeAnalysisConverter.java
index 84a5851e847d..91f1b685faa8 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInspection/bytecodeAnalysis/BytecodeAnalysisConverter.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInspection/bytecodeAnalysis/BytecodeAnalysisConverter.java
@@ -28,6 +28,7 @@ import java.security.NoSuchAlgorithmException;
 import java.util.*;
 
 import static com.intellij.codeInspection.bytecodeAnalysis.ProjectBytecodeAnalysis.LOG;
+import static com.intellij.codeInspection.bytecodeAnalysis.Direction.*;
 
 /**
  * @author lambdamix
@@ -272,25 +273,35 @@ public class BytecodeAnalysisConverter {
     return null;
   }
 
-  private static int mkDirectionKey(Direction dir) {
-    if (dir instanceof Out) {
+
+  static int mkDirectionKey(Direction dir) {
+    if (dir == Out) {
       return 0;
-    } else if (dir instanceof In) {
+    }
+    else if (dir == NullableOut) {
+      return 1;
+    }
+    else if (dir instanceof In) {
       In in = (In)dir;
       // nullity mask is 0/1
-      return 8 * in.paramId() + 1 + in.nullityMask;
-    } else {
+      return 2 + 8 * in.paramId() + in.nullityMask;
+    }
+    else {
       InOut inOut = (InOut)dir;
-      return 8 * inOut.paramId() + 3 + inOut.valueId();
+      return 4 + 8 * inOut.paramId() + inOut.valueId();
     }
   }
 
   @NotNull
   private static Direction extractDirection(int directionKey) {
     if (directionKey == 0) {
-      return new Out();
+      return Out;
+    }
+    else if (directionKey == 1) {
+      return NullableOut;
     }
     else {
+      directionKey--;
       int paramId = directionKey / 8;
       int subDirection = directionKey % 8;
       if (subDirection <= 2) {
@@ -344,7 +355,7 @@ public class BytecodeAnalysisConverter {
         continue;
       }
       Direction direction = extractDirection(key.dirKey);
-      if (value == Value.NotNull && direction instanceof Out && methodKey.equals(key)) {
+      if (value == Value.NotNull && direction == Out && methodKey.equals(key)) {
         notNulls.add(key);
       }
       else if (direction instanceof InOut) {