diff options
| author | Yohann Roussel <yroussel@google.com> | 2015-03-02 16:19:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-03-02 16:19:14 +0000 |
| commit | 7bf7dbc6a8ea0f78582fc14146db925661d82bf3 (patch) | |
| tree | 359a28121b647e99c0c3f763e3164e07e2c6194f /jack/tests | |
| parent | 6e8482205dac2df1911eb4a8a120996577b53025 (diff) | |
| parent | 1b4cbac609adeef794aa0134d4fe34673ef51954 (diff) | |
| download | toolchain_jack-7bf7dbc6a8ea0f78582fc14146db925661d82bf3.tar.gz toolchain_jack-7bf7dbc6a8ea0f78582fc14146db925661d82bf3.tar.bz2 toolchain_jack-7bf7dbc6a8ea0f78582fc14146db925661d82bf3.zip | |
Merge "Fix TracingTest" into ub-jack
Diffstat (limited to 'jack/tests')
| -rw-r--r-- | jack/tests/com/android/jack/tracer/MultiTracerBrush.java | 19 | ||||
| -rw-r--r-- | jack/tests/com/android/jack/tracer/TracingTest.java | 1 |
2 files changed, 4 insertions, 16 deletions
diff --git a/jack/tests/com/android/jack/tracer/MultiTracerBrush.java b/jack/tests/com/android/jack/tracer/MultiTracerBrush.java index bc6fdbd6..16b9f760 100644 --- a/jack/tests/com/android/jack/tracer/MultiTracerBrush.java +++ b/jack/tests/com/android/jack/tracer/MultiTracerBrush.java @@ -37,8 +37,6 @@ public class MultiTracerBrush implements TracerBrush { private final boolean traceEnclosingMethod; - private final boolean traceExternal = true; - private final int id; private final int seed; @@ -51,9 +49,6 @@ public class MultiTracerBrush implements TracerBrush { @Override public boolean startTrace(@Nonnull JDefinedClassOrInterface type) { - if (type.isExternal()) { - return false; - } return markIfNecessary(type); } @@ -63,9 +58,6 @@ public class MultiTracerBrush implements TracerBrush { @Override public boolean startTrace(@Nonnull JMethod method) { - if (method.isExternal()) { - return false; - } return markIfNecessary(method); } @@ -75,9 +67,6 @@ public class MultiTracerBrush implements TracerBrush { @Override public boolean startTrace(@Nonnull JField field) { - if (field.isExternal()) { - return false; - } return markIfNecessary(field); } @@ -125,13 +114,13 @@ public class MultiTracerBrush implements TracerBrush { public boolean traceMarked(@Nonnull JNode node) { if (node instanceof JDefinedClassOrInterface && ((JDefinedClassOrInterface) node).isExternal()) { - return traceExternal; + return true; } else if (node instanceof JMethod && ((JMethod) node).getEnclosingType().isExternal()) { - return traceExternal; + return true; } else if (node instanceof JField && ((JField) node).getEnclosingType().isExternal()) { - return traceExternal; + return true; } return isMarked(node); } @@ -196,7 +185,7 @@ public class MultiTracerBrush implements TracerBrush { @Override public void setMustTraceOverridingMethods(@Nonnull JMethod method) { - if (!isForcedMark(method)) { + if ((!method.getEnclosingType().isExternal()) && !isForcedMark(method)) { synchronized (method) { MultiTracerMarker marker = method.getMarker(MultiTracerMarker.class); assert marker != null && marker.isSet(id); diff --git a/jack/tests/com/android/jack/tracer/TracingTest.java b/jack/tests/com/android/jack/tracer/TracingTest.java index beb45bfb..15173a77 100644 --- a/jack/tests/com/android/jack/tracer/TracingTest.java +++ b/jack/tests/com/android/jack/tracer/TracingTest.java @@ -61,7 +61,6 @@ public class TracingTest { public void doTest(File fileOrSourceList) throws Exception { Options options = TestTools.buildCommandLineArgs(fileOrSourceList); - options.addProperty(Options.DROP_METHOD_BODY.getName(), "true"); RunnableHooks hooks = new RunnableHooks(); try { |