OSDN Git Service

android-x86/art.git
8 years agoFix "check" file, and mark test as failing on device.
Nicolas Geoffray [Mon, 11 Jan 2016 14:18:52 +0000 (14:18 +0000)]
Fix "check" file, and mark test as failing on device.

Change-Id: Ie1f9a2e86f94ccc3c9859ac172ee4b3da0f85d63

8 years agoMerge "Emit an error message when looking for String#offset."
Nicolas Geoffray [Mon, 11 Jan 2016 12:01:16 +0000 (12:01 +0000)]
Merge "Emit an error message when looking for String#offset."

8 years agoMerge "Disable flaky test on host."
Nicolas Geoffray [Mon, 11 Jan 2016 11:56:22 +0000 (11:56 +0000)]
Merge "Disable flaky test on host."

8 years agoDisable flaky test on host.
Nicolas Geoffray [Mon, 11 Jan 2016 11:45:27 +0000 (11:45 +0000)]
Disable flaky test on host.

bug:26483935
Change-Id: I6e1f7b2d33182969d08d75d217ff0891920dc35b

8 years agoMerge "ART: Do not build Checker tests with `dx --no-optimize`"
David Brazdil [Mon, 11 Jan 2016 11:37:52 +0000 (11:37 +0000)]
Merge "ART: Do not build Checker tests with `dx --no-optimize`"

8 years agoMerge "Revert "Disable test while investigating.""
Shubham Ajmera [Mon, 11 Jan 2016 10:29:59 +0000 (10:29 +0000)]
Merge "Revert "Disable test while investigating.""

8 years agoART: Do not build Checker tests with `dx --no-optimize`
David Brazdil [Mon, 11 Jan 2016 10:27:13 +0000 (10:27 +0000)]
ART: Do not build Checker tests with `dx --no-optimize`

Change-Id: Ice9298b92cde5486db40ccdef43cca6d36179d2c

8 years agoRevert "Disable test while investigating."
Shubham Ajmera [Sun, 10 Jan 2016 00:00:25 +0000 (00:00 +0000)]
Revert "Disable test while investigating."

Change #195560 fixes the test.
This reverts commit 1c58d6980541eb469f4860f00a77ba8c729efef9.

Change-Id: Idbfb0c5d2fbc1796f7dd1056181b5fc912a065a3

8 years agoMerge "Suppress jsr166.LinkedTransferQueueTest#testWaitingConsumer."
Hiroshi Yamauchi [Sat, 9 Jan 2016 01:28:37 +0000 (01:28 +0000)]
Merge "Suppress jsr166.LinkedTransferQueueTest#testWaitingConsumer."

8 years agoSuppress jsr166.LinkedTransferQueueTest#testWaitingConsumer.
Hiroshi Yamauchi [Sat, 9 Jan 2016 01:22:23 +0000 (17:22 -0800)]
Suppress jsr166.LinkedTransferQueueTest#testWaitingConsumer.

To make the buildbot read barrier config greener for now.

Bug: 25883050
Change-Id: I5ce837e7783dd2c32825993d8dd754741839261d

8 years agoMerge "Revert "Revert "Reduce sleep duration in SuspendAllDaemonThreads"""
Mathieu Chartier [Sat, 9 Jan 2016 00:29:20 +0000 (00:29 +0000)]
Merge "Revert "Revert "Reduce sleep duration in SuspendAllDaemonThreads"""

8 years agoRevert "Revert "Reduce sleep duration in SuspendAllDaemonThreads""
Mathieu Chartier [Thu, 7 Jan 2016 17:31:33 +0000 (09:31 -0800)]
Revert "Revert "Reduce sleep duration in SuspendAllDaemonThreads""

Fixed the error where I reduced the time until the warning by 10x.

Bug: 26351700

This reverts commit bc34a7ed232cb3d384c250578e2b4ede45f2b167.

Change-Id: I6b30a0711fe077421665b78c39ded88899407700

8 years agoMerge "Improve handling of daemon threads after runtime shutdown"
Mathieu Chartier [Sat, 9 Jan 2016 00:23:00 +0000 (00:23 +0000)]
Merge "Improve handling of daemon threads after runtime shutdown"

8 years agoImprove handling of daemon threads after runtime shutdown
Mathieu Chartier [Thu, 7 Jan 2016 23:14:19 +0000 (15:14 -0800)]
Improve handling of daemon threads after runtime shutdown

The main issue comes from the fact that user daemon threads are
allowed to continue running after the runtime has shutdown. They may
still have a JNI env pointer. To prevent crashing if they call into
the env, we replace the function pointers with functions that sleep
forever.

The other issue is that user daemon threads that are blocked in an
ART condition variable may get woken up by another user daemon inside
of Monitor::Notify or by a spurious wakeup (i.e. SIGQUIT). To deal
with this issue, we check the JNI env for shutdown runtime when we
are woken up from a condition variable wait. This check fixes test
132 with --host --gdb --interpreter. Previously this test crashed
since dlclose was somehow causing a spurious futex wakeup.

TODO: Investigate adding a unit test.

Bug: 18577101
Change-Id: I479b38968ee9fbc4ee4b252ee2528787279972cc

8 years agoMerge "Fix general multi-image TODOs."
Jeff Hao [Fri, 8 Jan 2016 22:45:29 +0000 (22:45 +0000)]
Merge "Fix general multi-image TODOs."

8 years agoFix general multi-image TODOs.
Jeff Hao [Fri, 8 Jan 2016 18:44:20 +0000 (10:44 -0800)]
Fix general multi-image TODOs.

- Removed some unnecessary comments.

Bug: 26317072

(cherry-picked from commit 509f2ab308032534f14d8f4f374f60da8a615fa2)

Change-Id: Id542262ca1182fb77f029f2136266e470bde9473

8 years agoMerge "Fix image writer for generation of app images"
Mathieu Chartier [Fri, 8 Jan 2016 18:07:23 +0000 (18:07 +0000)]
Merge "Fix image writer for generation of app images"

8 years agoFix image writer for generation of app images
Mathieu Chartier [Fri, 8 Jan 2016 02:36:19 +0000 (18:36 -0800)]
Fix image writer for generation of app images

Fixed IsInBootImage and IsInBootOatFile. Also re-enabled generation
of app images for tests.

Bug: 26317072
Bug: 22858531
Change-Id: I19cbe7a8143b5ff7582eb27dfd9d2d8121c67b3c

8 years agoMerge "Disable test while investigating."
Nicolas Geoffray [Fri, 8 Jan 2016 17:10:13 +0000 (17:10 +0000)]
Merge "Disable test while investigating."

8 years agoDisable test while investigating.
Nicolas Geoffray [Fri, 8 Jan 2016 17:09:22 +0000 (17:09 +0000)]
Disable test while investigating.

Change-Id: Ide7fd1251e10fe93525fe3fccd9240318585f9e6

8 years agoMerge "Add a missing implicit null check in the ARM codegen."
Roland Levillain [Fri, 8 Jan 2016 16:50:53 +0000 (16:50 +0000)]
Merge "Add a missing implicit null check in the ARM codegen."

8 years agoMerge "Small implicit null checks refactoring in the ARM codegen."
Roland Levillain [Fri, 8 Jan 2016 16:09:13 +0000 (16:09 +0000)]
Merge "Small implicit null checks refactoring in the ARM codegen."

8 years agoSmall implicit null checks refactoring in the ARM codegen.
Roland Levillain [Fri, 8 Jan 2016 16:04:55 +0000 (16:04 +0000)]
Small implicit null checks refactoring in the ARM codegen.

Change-Id: I7dccb02cf7ac2f7d8fd1676b03e0b394701fbe3f

8 years agoAdd a missing implicit null check in the ARM codegen.
Roland Levillain [Fri, 8 Jan 2016 15:56:19 +0000 (15:56 +0000)]
Add a missing implicit null check in the ARM codegen.

The code generated for object ArraySet on ARM used to
miss an implicit null check for the array when the assigned
value is `null`.  This has not been an actual issue so far,
as ArraySet instructions have never been using implicit null
checks.

Note: This CL comes without a regression test, as the code
path in question is not used (yet).

Change-Id: If3bc85e32802595e635513dfb83ccfcfd8f00d3d

8 years agoMerge "ARM Baker's read barrier fast path implementation."
Roland Levillain [Fri, 8 Jan 2016 15:05:16 +0000 (15:05 +0000)]
Merge "ARM Baker's read barrier fast path implementation."

8 years agoARM Baker's read barrier fast path implementation.
Roland Levillain [Fri, 18 Dec 2015 10:38:42 +0000 (10:38 +0000)]
ARM Baker's read barrier fast path implementation.

Introduce an ARM fast path implementation in Optimizing for
Baker's read barriers (for both heap reference loads and GC
root loads).  The marking phase of the read barrier is
performed by a slow path, invoking the runtime entry point
artReadBarrierMark.

Other read barrier algorithms continue to use the original
slow path based implementation, which has been renamed as
GenerateReadBarrierSlow/GenerateReadBarrierForRootSlow.

Bug: 12687968
Change-Id: Ie7ee85b1b4c0564148270cebdd3cbd4c3da51b3a

8 years agoMerge "Add libstdc++ as a target for buildbot builds."
Nicolas Geoffray [Fri, 8 Jan 2016 10:21:59 +0000 (10:21 +0000)]
Merge "Add libstdc++ as a target for buildbot builds."

8 years agoMerge "Re-enable class table for image writer"
Mathieu Chartier [Fri, 8 Jan 2016 02:34:03 +0000 (02:34 +0000)]
Merge "Re-enable class table for image writer"

8 years agoRe-enable class table for image writer
Mathieu Chartier [Fri, 8 Jan 2016 00:29:01 +0000 (16:29 -0800)]
Re-enable class table for image writer

Changes, create one temporary class table per ImageInfo. Don't keep
track of class loaders.

Bug: 26317072

Change-Id: I4f9121194f39031fb8629d60b6feeb2747a77870

8 years agoAdd libstdc++ as a target for buildbot builds.
Nicolas Geoffray [Thu, 7 Jan 2016 18:13:33 +0000 (18:13 +0000)]
Add libstdc++ as a target for buildbot builds.

It's a hidden dependency of libjavacore.

Change-Id: I7eca051502897c37293e22fbdda8a5924694ee76

8 years agoMerge "Perform profile file analysis in dex2oat"
Calin Juravle [Thu, 7 Jan 2016 16:32:01 +0000 (16:32 +0000)]
Merge "Perform profile file analysis in dex2oat"

8 years agoPerform profile file analysis in dex2oat
Calin Juravle [Mon, 21 Dec 2015 13:39:33 +0000 (15:39 +0200)]
Perform profile file analysis in dex2oat

Dex2oat can accept now multiple profile files to drive a profile based
compilation. --profile-file and --reference-profile-file speficy a pair
of profile files which will be evaluated for significant differences
before starting the compilation. If the difference is insignificant
(according to some internal metric) the compilation is skipped and a
message is logged.

Multiple pairs of --profile-file and --reference-profile-file can be
specified. This effectively enables multi user support since profiles
for different users will be kept separately.

--reference-profile-file can be left out, case in which the decision is
solely based on --profile-file. If both flags are present, then their
repetition should form unique pairs.

If the compilation is performed and --reference-profile-file is given
then its data is merged with the data from the corresponding --profile-
file and saved back to the file.

If no profile flags are given, dex2oat proceeds as before and compiles
the dex files unconditionally.

As part of this change
- merge ProfileCompilationInfo and OfflineProfilingInfo under the same
object. There was no use to keep them separate anymore.
- SaveProfilingInfo now merges the data with what was in
the file before instead of overwriting it.

Bug: 26080105

Change-Id: Ia8c8b55587d468bca5179f78941854285426234d

8 years agoMerge "Force Jack to consider multidex annotations"
Yohann Roussel [Thu, 7 Jan 2016 15:44:26 +0000 (15:44 +0000)]
Merge "Force Jack to consider multidex annotations"

8 years agoForce Jack to consider multidex annotations
Yohann Roussel [Thu, 7 Jan 2016 15:15:41 +0000 (16:15 +0100)]
Force Jack to consider multidex annotations

This is a workaround and should not be necessary.

Bug: 26441710
Change-Id: Ife879e46deb872ed48cff9abbe1088e2f1c86bee

8 years agoMerge "The ArtMethod is a long on 64bits."
Nicolas Geoffray [Thu, 7 Jan 2016 14:54:18 +0000 (14:54 +0000)]
Merge "The ArtMethod is a long on 64bits."

8 years agoThe ArtMethod is a long on 64bits.
Nicolas Geoffray [Thu, 7 Jan 2016 14:53:08 +0000 (14:53 +0000)]
The ArtMethod is a long on 64bits.

Change-Id: I8719d7061def3968d8f933e7649ec7bbdabbcf67

8 years agoEmit an error message when looking for String#offset.
Nicolas Geoffray [Thu, 7 Jan 2016 10:55:14 +0000 (10:55 +0000)]
Emit an error message when looking for String#offset.

Debugging two different apps relying on it and swallowing
the getDeclaredField exception took too much of my lifetime.
Adding a LOG(ERROR) can help diagnose quicker.

Also remove unused method getDeclaredFieldInternal.

Change-Id: I0923556a4fdbad2b06c1811ed741d23dbd4aa0a0

8 years agoMerge "Fix a crash with unresolved classes."
Nicolas Geoffray [Thu, 7 Jan 2016 12:05:23 +0000 (12:05 +0000)]
Merge "Fix a crash with unresolved classes."

8 years agoMerge "Assume the profile file was created before saving."
Calin Juravle [Thu, 7 Jan 2016 11:45:11 +0000 (11:45 +0000)]
Merge "Assume the profile file was created before saving."

8 years agoFix a crash with unresolved classes.
Nicolas Geoffray [Wed, 6 Jan 2016 17:40:20 +0000 (17:40 +0000)]
Fix a crash with unresolved classes.

We cannot pass the initialization duty to a HLoadClass that needs
access checks. The optimization was assuming the graph structure
could not lead to such a situation, but turns out with licm, it can.

Change-Id: I6c5299955e1f9221a2dd70976a55e0dea06882eb

8 years agoMerge "Revert "Reduce sleep duration in SuspendAllDaemonThreads""
Nicolas Geoffray [Thu, 7 Jan 2016 09:13:42 +0000 (09:13 +0000)]
Merge "Revert "Reduce sleep duration in SuspendAllDaemonThreads""

8 years agoRevert "Reduce sleep duration in SuspendAllDaemonThreads"
Nicolas Geoffray [Thu, 7 Jan 2016 09:13:24 +0000 (09:13 +0000)]
Revert "Reduce sleep duration in SuspendAllDaemonThreads"

run-test 132 randomly chokes due to this change.

Bug: 26351700

This reverts commit adef5bde6c3392dca3dafa0f8d2c9428b59af3ef.

Change-Id: I18e007264e1e8b9027d7d241cb9f0053ad8d112a

8 years agoMerge "Reduce sleep duration in SuspendAllDaemonThreads"
Mathieu Chartier [Thu, 7 Jan 2016 02:55:46 +0000 (02:55 +0000)]
Merge "Reduce sleep duration in SuspendAllDaemonThreads"

8 years agoReduce sleep duration in SuspendAllDaemonThreads
Mathieu Chartier [Thu, 7 Jan 2016 02:28:21 +0000 (18:28 -0800)]
Reduce sleep duration in SuspendAllDaemonThreads

Previously we unconditionally slept for 200ms which caused runtime
shutdown to take 200ms longer than required.

Reduces runtime shutdown time for "am" from ~200ms to ~10ms.

Bug: 26351700
Change-Id: I7fd0059cb3b04dba0acc4a1754e76c89ec867f85

8 years agoMerge "Add systrace output to runtime shutdown"
Mathieu Chartier [Thu, 7 Jan 2016 02:21:52 +0000 (02:21 +0000)]
Merge "Add systrace output to runtime shutdown"

8 years agoAdd systrace output to runtime shutdown
Mathieu Chartier [Thu, 7 Jan 2016 01:23:25 +0000 (17:23 -0800)]
Add systrace output to runtime shutdown

Help debug why am command shutdown is slow.

Findings:
~200ms spent in deleting thread list on N5.

Bug: 26351700
Change-Id: Icb59390a5267ae8bade4ced12252743c48206bb1

8 years agoMerge "Address some intern table comments"
Mathieu Chartier [Thu, 7 Jan 2016 00:23:17 +0000 (00:23 +0000)]
Merge "Address some intern table comments"

8 years agoAddress some intern table comments
Mathieu Chartier [Wed, 6 Jan 2016 23:47:09 +0000 (15:47 -0800)]
Address some intern table comments

Change-Id: I7ffaa463272015c2924ba03e006041daee498ad4

8 years agoMerge "Remove gaps between images"
Mathieu Chartier [Wed, 6 Jan 2016 23:26:01 +0000 (23:26 +0000)]
Merge "Remove gaps between images"

8 years agoRemove gaps between images
Mathieu Chartier [Wed, 6 Jan 2016 21:51:52 +0000 (13:51 -0800)]
Remove gaps between images

We now use the same logic to calculate the size as we use to create
the image header. This should mean that it always lines up correctly.
Previously the alignment rounding could have caused page off by one
errors in some cases.

Re-enable no gap check in heap.cc.

Bug: 26317072
Change-Id: I558a4e60197ca4613fc4ec4c3a618c64a83d006a

8 years agoMerge "Re-enable adding intern table to image"
Mathieu Chartier [Wed, 6 Jan 2016 19:42:41 +0000 (19:42 +0000)]
Merge "Re-enable adding intern table to image"

8 years agoMerge "Get rid of shadow maps for images"
Mathieu Chartier [Wed, 6 Jan 2016 19:19:22 +0000 (19:19 +0000)]
Merge "Get rid of shadow maps for images"

8 years agoGet rid of shadow maps for images
Mathieu Chartier [Wed, 6 Jan 2016 02:03:15 +0000 (18:03 -0800)]
Get rid of shadow maps for images

Fixed the image bitmap creation to use the End of the object section
instead of using the map size. This means that the bitmap covers at
most one word of bits past the end of the object section.

Reverts shadow map logic introduced by multi image CL:
(commit dcdc85bbd569f0ee66c331b4219c19304a616214)

Bug: 26317072
Change-Id: I181cf3490a5b292c00c6b0f97536f3206adcd091

8 years agoRe-enable adding intern table to image
Mathieu Chartier [Tue, 29 Dec 2015 21:17:37 +0000 (13:17 -0800)]
Re-enable adding intern table to image

Changed intern table to have a stack of tables similarily to
ClassTable. Adding an image intern table adds to the front of the
intern table stack. Also some cleanup.

Bug: 26317072

Change-Id: I7bbf9485b5dbbbf3707fed21e29de3beccfb8705

8 years agoMerge "Disable tests while investigating."
Nicolas Geoffray [Wed, 6 Jan 2016 16:34:44 +0000 (16:34 +0000)]
Merge "Disable tests while investigating."

8 years agoDisable tests while investigating.
Nicolas Geoffray [Wed, 6 Jan 2016 16:33:41 +0000 (16:33 +0000)]
Disable tests while investigating.

Change-Id: I3f1e46a8bf27c962c96315d125ddd8430b7f9f0b

8 years agoMerge "ART: Don't set initial RTI for BoundType if input untyped"
David Brazdil [Wed, 6 Jan 2016 12:47:07 +0000 (12:47 +0000)]
Merge "ART: Don't set initial RTI for BoundType if input untyped"

8 years agoMerge "ART: Resolve ambiguous ArraySets"
David Brazdil [Wed, 6 Jan 2016 12:45:54 +0000 (12:45 +0000)]
Merge "ART: Resolve ambiguous ArraySets"

8 years agoART: Don't set initial RTI for BoundType if input untyped
David Brazdil [Mon, 28 Dec 2015 10:53:34 +0000 (10:53 +0000)]
ART: Don't set initial RTI for BoundType if input untyped

ReferenceTypePropagation will create a BoundType with upper bound
[Object, inexact, not null] for each if-not-null branch. The logic
setting its initial RTI will, however, set it straight to Object if
the input is untyped (loop phi or its derivate). This patch changes
the logic to leave the BoundType untyped and set it during fix-point
iteration.

Bug: 26330326
Change-Id: Ic492e2179a4c51f577908e60fbcf70d728b98a6f

8 years agoART: Resolve ambiguous ArraySets
David Brazdil [Wed, 16 Dec 2015 10:30:45 +0000 (10:30 +0000)]
ART: Resolve ambiguous ArraySets

Just like aget(-wide), the value operand of aput(-wide) bytecode
instructions can be both int/long and float/double. This patch builds
on the previous mechanism for resolving type of ArrayGets to type the
values of ArraySets based on the reference type of the array.

Bug: 22538329

Change-Id: Ic86abbb58de146692de04476b555010b6fcdd8b6

8 years agoMerge "ART: Create BoundType for CheckCast early"
David Brazdil [Wed, 6 Jan 2016 10:34:16 +0000 (10:34 +0000)]
Merge "ART: Create BoundType for CheckCast early"

8 years agoART: Create BoundType for CheckCast early
David Brazdil [Sun, 27 Dec 2015 13:36:12 +0000 (13:36 +0000)]
ART: Create BoundType for CheckCast early

ReferenceTypePropagation creates a BoundType for each CheckCast and
replaces all dominated uses of the casted object with it. This does
not include Phi uses on the boundary of the dominated scope, reducing
typing precision. This patch creates the BoundType in Builder, causing
SsaBuilder to replace uses of the object automatically.

Bug: 26081304

Change-Id: I083979155cccb348071ff58cb9060a896ed7d2ac

8 years agoMerge "Update expectations after push of apache-xml and other fixes."
Nicolas Geoffray [Wed, 6 Jan 2016 09:52:15 +0000 (09:52 +0000)]
Merge "Update expectations after push of apache-xml and other fixes."

8 years agoUpdate expectations after push of apache-xml and other fixes.
Nicolas Geoffray [Wed, 6 Jan 2016 09:33:56 +0000 (09:33 +0000)]
Update expectations after push of apache-xml and other fixes.

bug:26326992
Change-Id: I7d0c0706c53b4b04a3a3038b334cac6bcda4868c

8 years agoMerge "Revert "Add new test expectations after enso move.""
Nicolas Geoffray [Wed, 6 Jan 2016 08:43:03 +0000 (08:43 +0000)]
Merge "Revert "Add new test expectations after enso move.""

8 years agoRevert "Add new test expectations after enso move."
Nicolas Geoffray [Wed, 6 Jan 2016 08:34:46 +0000 (08:34 +0000)]
Revert "Add new test expectations after enso move."

Failures were due to a bogus date on devices.

Bug: 26353151
Bug: 26326992

This reverts commit 376756d0c9e23173c1d93fe32acf6b3e08f45b73.

Change-Id: I3ecdd152b27299efab37ded29b62c2f3369b5d96

8 years agoMerge "Fix multi-image TODOs in class linker, runtime, and oat file."
Jeff Hao [Wed, 6 Jan 2016 02:09:22 +0000 (02:09 +0000)]
Merge "Fix multi-image TODOs in class linker, runtime, and oat file."

8 years agoMerge "ART: Add large object allocation to ThreadStress"
Andreas Gampe [Wed, 6 Jan 2016 00:25:40 +0000 (00:25 +0000)]
Merge "ART: Add large object allocation to ThreadStress"

8 years agoFix multi-image TODOs in class linker, runtime, and oat file.
Jeff Hao [Tue, 5 Jan 2016 22:13:00 +0000 (14:13 -0800)]
Fix multi-image TODOs in class linker, runtime, and oat file.

- Modified SanityCheckArtMethodPointerArray in class linker
- Put back warnings in OatFile::GetOatDexFile
- Reinstated ImageSpace VerifyImageAllocations in Runtime::Init

Bug: 26317072

(cherry-picked from commit 0dfef949bb824accde27f8cfe1b233ec9e087355)

Change-Id: I3bdb8f87d885213795c82c41e5095fec6daf00c4

8 years agoART: Add large object allocation to ThreadStress
Andreas Gampe [Tue, 5 Jan 2016 20:57:56 +0000 (12:57 -0800)]
ART: Add large object allocation to ThreadStress

Test interactions with large objects some more, as there are
sometimes interactions between maps and unwind (in SIGQUIT).

(Probably should ramp up the iterations/frequency, though.)

Change-Id: I21368bfc584b9b642a39d3560391f929b5576b08

8 years agoMerge "Remove unused reference to MALLOC_IMPL."
Josh Gao [Tue, 5 Jan 2016 19:38:33 +0000 (19:38 +0000)]
Merge "Remove unused reference to MALLOC_IMPL."

8 years agoMerge "ART: Make opt inliner a little bit cleaner/faster"
Andreas Gampe [Tue, 5 Jan 2016 18:28:58 +0000 (18:28 +0000)]
Merge "ART: Make opt inliner a little bit cleaner/faster"

8 years agoART: Make opt inliner a little bit cleaner/faster
Andreas Gampe [Thu, 24 Dec 2015 00:30:44 +0000 (16:30 -0800)]
ART: Make opt inliner a little bit cleaner/faster

Remove the double-if.

Change-Id: Ic6551e30d016d4b2c3b8dfb8841d2db90fce45cd

8 years agoMerge "Don't duplicate the menu in the help page for ahat."
Richard Uhler [Tue, 5 Jan 2016 16:56:24 +0000 (16:56 +0000)]
Merge "Don't duplicate the menu in the help page for ahat."

8 years agoMerge "ART: Use non-stripped core jars in gtests"
Andreas Gampe [Tue, 5 Jan 2016 16:35:42 +0000 (16:35 +0000)]
Merge "ART: Use non-stripped core jars in gtests"

8 years agoART: Use non-stripped core jars in gtests
Andreas Gampe [Wed, 30 Sep 2015 18:52:02 +0000 (11:52 -0700)]
ART: Use non-stripped core jars in gtests

To support emulators and other preopted device configurations, use
a special core-libart and core-oj version that will never be stripped.

Bug: 24535627
Change-Id: Ie632bc382bbc753e9c100039f2ecc4ac1f2ab249

8 years agoMerge "ART: Move ThrowStackOverflowError to common_throws"
Andreas Gampe [Tue, 5 Jan 2016 16:26:13 +0000 (16:26 +0000)]
Merge "ART: Move ThrowStackOverflowError to common_throws"

8 years agoART: Move ThrowStackOverflowError to common_throws
Andreas Gampe [Mon, 4 Jan 2016 23:32:43 +0000 (15:32 -0800)]
ART: Move ThrowStackOverflowError to common_throws

This should really be in common_throws considering all the callers.

Change-Id: I410c07cbf5659f216d44597530cb85f99740f320

8 years agoMerge "Add apache-xml to the device & host boot classpath."
Narayan Kamath [Tue, 5 Jan 2016 16:01:03 +0000 (16:01 +0000)]
Merge "Add apache-xml to the device & host boot classpath."

8 years agoAdd apache-xml to the device & host boot classpath.
Narayan Kamath [Tue, 5 Jan 2016 14:33:58 +0000 (14:33 +0000)]
Add apache-xml to the device & host boot classpath.

This is used by parts of OpenJdk's java.util.prefs implementation.

bug: 26326992
Change-Id: Ibc0f3043945ec6eefdc97e9bab998e2082baf95e

8 years agoMerge "Disable test due to toybox update."
Nicolas Geoffray [Tue, 5 Jan 2016 12:55:28 +0000 (12:55 +0000)]
Merge "Disable test due to toybox update."

8 years agoDisable test due to toybox update.
Nicolas Geoffray [Tue, 5 Jan 2016 12:46:51 +0000 (12:46 +0000)]
Disable test due to toybox update.

bug:26395656
Change-Id: I0356bf0e5fff3cab198f6c91da097ff0de564c89

8 years agoMerge "Fix multi-image TODOs in patchoat."
Jeff Hao [Tue, 5 Jan 2016 03:13:30 +0000 (03:13 +0000)]
Merge "Fix multi-image TODOs in patchoat."

8 years agoFix multi-image TODOs in patchoat.
Jeff Hao [Tue, 5 Jan 2016 01:38:06 +0000 (17:38 -0800)]
Fix multi-image TODOs in patchoat.

- Reinstated checks that were still valid (one check was removed).
- Removed unused path that patches only images.

Bug: 26317072

(cherry-picked from commit e271fe1e2797205c57c052212c32139234f781ea)

Change-Id: I0e140cb110abbfa469c097c805657ecfdc8552d6

8 years agoRemove unused reference to MALLOC_IMPL.
Josh Gao [Tue, 5 Jan 2016 01:17:46 +0000 (17:17 -0800)]
Remove unused reference to MALLOC_IMPL.

Bug: http://b/26390299
Change-Id: I2e779282d8d585519c2ed1bff246d2202eee61c8

8 years agoMerge changes I129fbc84,I9238ee0b
Andreas Gampe [Mon, 4 Jan 2016 19:19:30 +0000 (19:19 +0000)]
Merge changes I129fbc84,I9238ee0b

* changes:
  ART: Fix JDWP GetClassLoader command
  Revert "ART: Fix JDWP GetClassLoader command"

8 years agoAssume the profile file was created before saving.
Calin Juravle [Fri, 18 Dec 2015 12:10:00 +0000 (14:10 +0200)]
Assume the profile file was created before saving.

bug: 26080105
Change-Id: I9969a4abd8533614922076551fcbae2cdf695525

8 years agoMerge "Revert "Temporary disable linker-namespaces""
Dimitry Ivanov [Mon, 4 Jan 2016 17:15:44 +0000 (17:15 +0000)]
Merge "Revert "Temporary disable linker-namespaces""

8 years agoMerge "Add a fence to ensure other threads see the correct data."
Nicolas Geoffray [Mon, 4 Jan 2016 16:31:47 +0000 (16:31 +0000)]
Merge "Add a fence to ensure other threads see the correct data."

8 years agoAdd a fence to ensure other threads see the correct data.
Nicolas Geoffray [Mon, 4 Jan 2016 16:06:51 +0000 (16:06 +0000)]
Add a fence to ensure other threads see the correct data.

Other threads may see the ProfilingInfo pointer in the ArtMethod,
but the data they have for it is bogus due to a prior load in their
cache.

bug:26221227
Change-Id: I1fa8f088a3144df39d07a986ed57d6fc20edba18

8 years agoMerge "ART: Remove core-junit from test boot classpath"
Andreas Gampe [Mon, 4 Jan 2016 16:16:51 +0000 (16:16 +0000)]
Merge "ART: Remove core-junit from test boot classpath"

8 years agoMerge "ART: Use Primitive::Is64BitType in SsaBuilder::TypePhiFromInputs"
David Brazdil [Mon, 4 Jan 2016 16:16:05 +0000 (16:16 +0000)]
Merge "ART: Use Primitive::Is64BitType in SsaBuilder::TypePhiFromInputs"

8 years agoART: Use Primitive::Is64BitType in SsaBuilder::TypePhiFromInputs
David Brazdil [Mon, 4 Jan 2016 15:55:10 +0000 (15:55 +0000)]
ART: Use Primitive::Is64BitType in SsaBuilder::TypePhiFromInputs

Accidentally submitted CL Ib39f3da2b92bc5be5d76f4240a77567d82c6bebe
without this.

Bug: 26208284
Change-Id: I2e69ca2fde72171f2ce645304c4835d8d57f4e0b

8 years agoMerge "Add 002-sleep as timing sensitive."
Nicolas Geoffray [Mon, 4 Jan 2016 15:41:54 +0000 (15:41 +0000)]
Merge "Add 002-sleep as timing sensitive."

8 years agoAdd 002-sleep as timing sensitive.
Nicolas Geoffray [Mon, 4 Jan 2016 15:22:00 +0000 (15:22 +0000)]
Add 002-sleep as timing sensitive.

The buildbots have chewed on it a few times.

Change-Id: Icf81cf4baa8e06573ed92bf61c0861c64825475a

8 years agoMerge "X86: templatize GenerateTestAndBranch and friends"
David Brazdil [Mon, 4 Jan 2016 14:51:33 +0000 (14:51 +0000)]
Merge "X86: templatize GenerateTestAndBranch and friends"

8 years agoMerge "Detect phi cycles."
Nicolas Geoffray [Mon, 4 Jan 2016 14:42:19 +0000 (14:42 +0000)]
Merge "Detect phi cycles."

8 years agoMerge "Revert "Revert "Tweak inlining heuristics."""
Nicolas Geoffray [Mon, 4 Jan 2016 14:41:49 +0000 (14:41 +0000)]
Merge "Revert "Revert "Tweak inlining heuristics."""

8 years agoRevert "Revert "Tweak inlining heuristics.""
Nicolas Geoffray [Fri, 18 Dec 2015 10:57:10 +0000 (10:57 +0000)]
Revert "Revert "Tweak inlining heuristics.""

This reverts commit b17d1ccff0ac26fc22df671907ba2b4f4c656ce4.

Change-Id: I26f6f8702a448c3da12662cbc6bc0f6e562bc40b

8 years agoMerge "MIPS32: improvements in code generation (mostly 64-bit ALU ops)"
Nicolas Geoffray [Mon, 4 Jan 2016 12:21:15 +0000 (12:21 +0000)]
Merge "MIPS32: improvements in code generation (mostly 64-bit ALU ops)"