Do not forget to trace implementation methods

- Tracing can forget to keep some methods due to tracing order.
Trace a method that is a seed need also to trace implementation of
this method for all types that are already kept.

Bug: 21023926
Change-Id: I0a0df841b0f7441ddba056ad69a1f506db15afb3
(cherry picked from commit df69c567bb1903bdcf1a39be18a0e52c62709de0)

5 files changed, 118 insertions, 0 deletions

diff --git a/jack-tests/tests/com/android/jack/shrob/ShrinkTests.java b/jack-tests/tests/com/android/jack/shrob/ShrinkTests.java
index 396380e6..d5a04790 100644
--- a/jack-tests/tests/com/android/jack/shrob/ShrinkTests.java
+++ b/jack-tests/tests/com/android/jack/shrob/ShrinkTests.java
@@ -28,6 +28,7 @@ import com.android.jack.test.toolchain.DummyToolchain;
 import com.android.jack.test.toolchain.JackApiToolchainBase;
 import com.android.jack.test.toolchain.JackBasedToolchain;
 import com.android.jack.util.TextUtils;
+import com.android.sched.scheduler.ScheduleInstance;
 
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -87,6 +88,42 @@ public class ShrinkTests extends AbstractTest {
         candidateNodeListing));
   }
 
+  protected void runTestInMonoThreadWithOrderedInput(
+      @Nonnull String testNumber,
+      @Nonnull String flagNumber,
+      @Nonnull String mappingNumber)
+      throws Exception {
+    File testFolder = new File(shrobTestsDir, "test" + testNumber);
+    JackBasedToolchain toolchain =
+        AbstractTestTools.getCandidateToolchain(JackBasedToolchain.class);
+
+    File refFolder = new File(testFolder, "refsShrinking");
+
+    File candidateNodeListing = AbstractTestTools.createTempFile("nodeListing", ".txt");
+    toolchain.addProperty(ShrinkStructurePrinter.STRUCTURE_PRINTING.getName(), "true");
+    toolchain.addProperty(ShrinkStructurePrinter.STRUCTURE_PRINTING_FILE.getName(),
+        candidateNodeListing.getPath());
+    toolchain.addProperty(Options.METHOD_FILTER.getName(), "supported-methods");
+    toolchain.disableDxOptimizations();
+    toolchain.addProperty(ScheduleInstance.DEFAULT_RUNNER.getName(), "single-threaded");
+    toolchain.addProperty(Options.INPUT_FILTER.getName(), "ordered-filter");
+
+    File outFolder = AbstractTestTools.createTempDir();
+
+    SourceToDexComparisonTestHelper env =
+        new SourceToDexComparisonTestHelper(new File(testFolder, "jack"));
+
+    env.setCandidateTestTools(toolchain);
+    env.setReferenceTestTools(new DummyToolchain());
+    env.setProguardFlags(
+        dontObfuscateFlagFile,
+        new ProguardFlags(shrobTestsDir,"keepAllAttributes.flags"),
+        new ProguardFlags(testFolder, "proguard.flags" + flagNumber));
+
+    env.runTest(new ComparatorMapping(new File(refFolder, "expected-" + flagNumber + ".txt"),
+        candidateNodeListing));
+  }
+
   private void runTestWithLib(@Nonnull String testNumber, @Nonnull String flagNumber,
       boolean importLib) throws Exception {
     File testFolder = new File(shrobTestsDir, "test" + testNumber);
@@ -289,6 +326,10 @@ public class ShrinkTests extends AbstractTest {
     runTest("042", "003", "");
   }
 
+  @Test
+  public void test43_001() throws Exception {
+    runTestInMonoThreadWithOrderedInput("043", "001", "");
+  }
 
   @Test
   @Category(SlowTests.class)
diff --git a/jack-tests/tests/com/android/jack/shrob/test043/jack/A.java b/jack-tests/tests/com/android/jack/shrob/test043/jack/A.java
new file mode 100644
index 00000000..662e9efe
--- /dev/null
+++ b/jack-tests/tests/com/android/jack/shrob/test043/jack/A.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.jack.shrob.test043.jack;
+
+public class A {
+
+  public void test() {
+    new B();
+  }
+}
diff --git a/jack-tests/tests/com/android/jack/shrob/test043/jack/B.java b/jack-tests/tests/com/android/jack/shrob/test043/jack/B.java
new file mode 100644
index 00000000..eb90eae0
--- /dev/null
+++ b/jack-tests/tests/com/android/jack/shrob/test043/jack/B.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.jack.shrob.test043.jack;
+
+public class B implements I {
+
+  @Override
+  public int getInt() {
+    return 1;
+  }
+
+}
diff --git a/jack-tests/tests/com/android/jack/shrob/test043/jack/I.java b/jack-tests/tests/com/android/jack/shrob/test043/jack/I.java
new file mode 100644
index 00000000..df09f669
--- /dev/null
+++ b/jack-tests/tests/com/android/jack/shrob/test043/jack/I.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.jack.shrob.test043.jack;
+
+public interface I {
+  int getInt();
+}
diff --git a/jack-tests/tests/com/android/jack/shrob/test043/proguard.flags001 b/jack-tests/tests/com/android/jack/shrob/test043/proguard.flags001
new file mode 100644
index 00000000..3d24ffdf
--- /dev/null
+++ b/jack-tests/tests/com/android/jack/shrob/test043/proguard.flags001
@@ -0,0 +1,6 @@
+-keep class com.android.jack.shrob.test043.jack.A {
+  void test();
+}
+-keep class com.android.jack.shrob.test043.jack.I {
+  int getInt();
+}
\ No newline at end of file