Fixed KNPE when inline functions/constants are completely removed.

jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt

@@ -280,7 +280,12 @@ public class IncrementalCacheImpl(val baseDir: File): StorageOwner, IncrementalC
             if (oldMap == constantsMap) {
                 return false
             }
-            map.put(key, constantsMap)
+            if (constantsMap != null) {
+                map.put(key, constantsMap)
+            }
+            else {
+                map.remove(key)
+            }
             return true
         }
     }
@@ -396,6 +401,9 @@ public class IncrementalCacheImpl(val baseDir: File): StorageOwner, IncrementalC
             if (inlineFunctionsMap != null) {
                 map.put(key, inlineFunctionsMap)
             }
+            else {
+                map.remove(key)
+            }
             return true
         }
     }

jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java

@@ -135,6 +135,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest {
             doTest(fileName);
         }
 
+        @TestMetadata("constantRemoved")
+        public void testConstantRemoved() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/constantRemoved/");
+            doTest(fileName);
+        }
+
         @TestMetadata("constantsUnchanged")
         public void testConstantsUnchanged() throws Exception {
             String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/");
@@ -171,6 +177,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest {
             doTest(fileName);
         }
 
+        @TestMetadata("inlineFunctionRemoved")
+        public void testInlineFunctionRemoved() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/");
+            doTest(fileName);
+        }
+
         @TestMetadata("inlineFunctionsCircularDependency")
         public void testInlineFunctionsCircularDependency() throws Exception {
             String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/");

jps-plugin/testData/incremental/pureKotlin/constantRemoved/build.log

@@ -0,0 +1,7 @@
+Cleaning output files:
+out/production/module/test/TestPackage$const$*.class
+out/production/module/test/TestPackage.class
+End of files
+Compiling files:
+src/const.kt
+End of files

jps-plugin/testData/incremental/pureKotlin/constantRemoved/const.kt

@@ -0,0 +1,3 @@
+package test
+
+val CONST = "foo"

jps-plugin/testData/incremental/pureKotlin/constantRemoved/const.kt.new

@@ -0,0 +1,3 @@
+package test
+
+val CONST = "I'm not a constant anymore:" + System.currentTimeMillis()

jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/build.log

@@ -0,0 +1,14 @@
+Cleaning output files:
+out/production/module/inline/InlinePackage$inline$*.class
+out/production/module/inline/InlinePackage.class
+End of files
+Compiling files:
+src/inline.kt
+End of files
+Cleaning output files:
+out/production/module/inline/InlinePackage$inline$*.class
+out/production/module/inline/InlinePackage.class
+End of files
+Compiling files:
+src/inline.kt
+End of files

jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/inline.kt

@@ -0,0 +1,6 @@
+package inline
+
+inline fun f(body: () -> Unit) {
+    println("i'm inline function")
+    body()
+}

jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/inline.kt.new

@@ -0,0 +1,7 @@
+package inline
+
+fun f(body: () -> Unit) {
+    println("i'm not an inline function")
+    body()
+}
+