diff options
| author | mikaelpeltier <mikaelpeltier@google.com> | 2014-10-03 14:54:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-10-03 14:54:03 +0000 |
| commit | 1f63e0e92d2452758466dc64ba5f638eddf2fe84 (patch) | |
| tree | d793eca3dffc07f1ecf6265ffdabdfde2519c97d /jack | |
| parent | a5179c13d0a922f43ee76b3b31aff85cac8330a1 (diff) | |
| parent | 9a4ec8d122a5da1bd373cc941f63239d31b65e9e (diff) | |
| download | toolchain_jack-1f63e0e92d2452758466dc64ba5f638eddf2fe84.zip toolchain_jack-1f63e0e92d2452758466dc64ba5f638eddf2fe84.tar.gz toolchain_jack-1f63e0e92d2452758466dc64ba5f638eddf2fe84.tar.bz2 | |
Merge "CodeItemBuilder & OneDexPerTypeWriter are now multi-thread" into ub-jack
Diffstat (limited to 'jack')
| -rw-r--r-- | jack/src/com/android/jack/backend/dex/OneDexPerTypeWriter.java | 4 | ||||
| -rw-r--r-- | jack/src/com/android/jack/backend/dex/rop/CodeItemBuilder.java | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/jack/src/com/android/jack/backend/dex/OneDexPerTypeWriter.java b/jack/src/com/android/jack/backend/dex/OneDexPerTypeWriter.java index 6faa0ff..5343404 100644 --- a/jack/src/com/android/jack/backend/dex/OneDexPerTypeWriter.java +++ b/jack/src/com/android/jack/backend/dex/OneDexPerTypeWriter.java @@ -26,7 +26,6 @@ import com.android.jack.ir.ast.JDefinedClassOrInterface; import com.android.jack.scheduling.marker.ClassDefItemMarker; import com.android.jack.scheduling.marker.DexCodeMarker; import com.android.sched.item.Description; -import com.android.sched.item.Synchronized; import com.android.sched.schedulable.Constraint; import com.android.sched.schedulable.RunnableSchedulable; import com.android.sched.util.config.ThreadConfig; @@ -42,7 +41,6 @@ import javax.annotation.Nonnull; * Write one dex file per type. */ @Description("Write one dex file per type") -@Synchronized @Constraint(need = {DexCodeMarker.class, ClassDefItemMarker.Complete.class}) public class OneDexPerTypeWriter extends DexWriter implements RunnableSchedulable<JDefinedClassOrInterface> { @@ -53,7 +51,7 @@ public class OneDexPerTypeWriter extends DexWriter implements private final boolean forceJumbo = ThreadConfig.get(CodeItemBuilder.FORCE_JUMBO).booleanValue(); @Override - public synchronized void run(@Nonnull JDefinedClassOrInterface type) throws Exception { + public void run(@Nonnull JDefinedClassOrInterface type) throws Exception { ClassDefItemMarker cdiMarker = type.getMarker(ClassDefItemMarker.class); assert cdiMarker != null; diff --git a/jack/src/com/android/jack/backend/dex/rop/CodeItemBuilder.java b/jack/src/com/android/jack/backend/dex/rop/CodeItemBuilder.java index d96dfe5..28a2c87 100644 --- a/jack/src/com/android/jack/backend/dex/rop/CodeItemBuilder.java +++ b/jack/src/com/android/jack/backend/dex/rop/CodeItemBuilder.java @@ -88,7 +88,6 @@ import com.android.jack.transformations.threeaddresscode.ThreeAddressCodeForm; import com.android.jack.util.filter.Filter; import com.android.sched.item.Description; import com.android.sched.item.Name; -import com.android.sched.item.Synchronized; import com.android.sched.schedulable.Constraint; import com.android.sched.schedulable.RunnableSchedulable; import com.android.sched.schedulable.Transform; @@ -139,7 +138,6 @@ import javax.annotation.Nonnull; EmptyClinit.class, UselessSwitches.class}) @Transform(add = DexCodeMarker.class) -@Synchronized public class CodeItemBuilder implements RunnableSchedulable<JMethod> { @Nonnull @@ -170,7 +168,7 @@ public class CodeItemBuilder implements RunnableSchedulable<JMethod> { ThreadConfig.get(Options.EMIT_LINE_NUMBER_DEBUG_INFO).booleanValue(); @Override - public synchronized void run(@Nonnull JMethod method) throws Exception { + public void run(@Nonnull JMethod method) throws Exception { if (method.getEnclosingType().isExternal() || method.isNative() |