OSDN Git Service
Vladimir Marko [Thu, 10 Jul 2014 11:01:18 +0000 (11:01 +0000)]
am
21e38a35: am
723b2fc3: Merge "Faster deduplication in OatWriter."
* commit '
21e38a359648de457eeeef3632da59c5ab35d653':
Faster deduplication in OatWriter.
Ian Rogers [Thu, 10 Jul 2014 11:01:17 +0000 (11:01 +0000)]
am
6302c888: am
b2bc3c97: Merge "Fix GC to use art::Atomic rather than compiler intrinsics."
* commit '
6302c888bcdf8b3202197ddb6aefb3d0584e9c71':
Fix GC to use art::Atomic rather than compiler intrinsics.
Andreas Gampe [Thu, 10 Jul 2014 11:01:16 +0000 (11:01 +0000)]
am
d74ff9b5: am
c4f72ec4: Merge "Use memory chunks for monitors on LP64"
* commit '
d74ff9b53eabfbb301c418bc6a6197c634dae65d':
Use memory chunks for monitors on LP64
Ian Rogers [Thu, 10 Jul 2014 11:01:15 +0000 (11:01 +0000)]
am
b88f433c: am
af4cf5d7: Merge "Missed use of android_atomic and thread state_."
* commit '
b88f433ccd966e87b3c5d7ae756af116e445f6d0':
Missed use of android_atomic and thread state_.
Ian Rogers [Thu, 10 Jul 2014 11:01:14 +0000 (11:01 +0000)]
am
0cb6d725: am
070dfc4c: Merge "Fix tracing."
* commit '
0cb6d725ffa27ff3b53761558ae6ced5c047de84':
Fix tracing.
Colin Cross [Thu, 10 Jul 2014 11:01:13 +0000 (11:01 +0000)]
am
3df187cd: am
d8079288: Merge "art: fix host dex2oat runtime args"
* commit '
3df187cd2cce35b587baed6e3b46e08fc427aa16':
art: fix host dex2oat runtime args
Ian Rogers [Thu, 10 Jul 2014 11:01:12 +0000 (11:01 +0000)]
am
fc879248: am
62526c37: Merge "Move thread state to art::Atomic."
* commit '
fc87924857d410f4cd21b4dcf5cc0af032e19c5a':
Move thread state to art::Atomic.
Vladimir Marko [Thu, 10 Jul 2014 09:43:42 +0000 (09:43 +0000)]
am
723b2fc3: Merge "Faster deduplication in OatWriter."
* commit '
723b2fc3848bce9f26c54c7080099eba2fdb06ea':
Faster deduplication in OatWriter.
Ian Rogers [Thu, 10 Jul 2014 09:43:41 +0000 (09:43 +0000)]
am
b2bc3c97: Merge "Fix GC to use art::Atomic rather than compiler intrinsics."
* commit '
b2bc3c9791e093330be98bc6ca8fb92c41757cb1':
Fix GC to use art::Atomic rather than compiler intrinsics.
Andreas Gampe [Thu, 10 Jul 2014 09:43:40 +0000 (09:43 +0000)]
am
c4f72ec4: Merge "Use memory chunks for monitors on LP64"
* commit '
c4f72ec44660f804b595bfaf2b959f46fd2ff00d':
Use memory chunks for monitors on LP64
Ian Rogers [Thu, 10 Jul 2014 09:43:35 +0000 (09:43 +0000)]
am
af4cf5d7: Merge "Missed use of android_atomic and thread state_."
* commit '
af4cf5d72a2bf77f0e442bedb208f9227f262c89':
Missed use of android_atomic and thread state_.
Ian Rogers [Thu, 10 Jul 2014 09:43:34 +0000 (09:43 +0000)]
am
070dfc4c: Merge "Fix tracing."
* commit '
070dfc4cebb9772a646382be9751d8f4c6b7d69a':
Fix tracing.
Colin Cross [Thu, 10 Jul 2014 09:43:34 +0000 (09:43 +0000)]
am
d8079288: Merge "art: fix host dex2oat runtime args"
* commit '
d807928876744231ebbe2f07d17439f84d4e0185':
art: fix host dex2oat runtime args
Ian Rogers [Thu, 10 Jul 2014 09:43:30 +0000 (09:43 +0000)]
am
62526c37: Merge "Move thread state to art::Atomic."
* commit '
62526c377fe5242a723f154a373eccf5b9db416d':
Move thread state to art::Atomic.
Ian Rogers [Thu, 10 Jul 2014 03:45:39 +0000 (03:45 +0000)]
am
43b6fe02: Merge "Move another field away from android_atomic_cas."
* commit '
43b6fe0270477cd47f8dd8b064d006961a44be54':
Move another field away from android_atomic_cas.
Dave Allison [Thu, 10 Jul 2014 02:00:03 +0000 (02:00 +0000)]
am
672f8367: Merge "Revert "Add implicit null and stack checks for x86""
* commit '
672f8367f74e5db7d26714cd6fa1a13fa2a6c59f':
Revert "Add implicit null and stack checks for x86"
Ian Rogers [Thu, 10 Jul 2014 01:45:08 +0000 (01:45 +0000)]
am
4770a2e6: Merge "Remove legacy CAS implementations from mutex."
* commit '
4770a2e6d56398a6b4398fcce14fea43394e0d1b':
Remove legacy CAS implementations from mutex.
Ian Rogers [Thu, 10 Jul 2014 08:14:55 +0000 (08:14 +0000)]
Merge "Fix GC to use art::Atomic rather than compiler intrinsics."
Ian Rogers [Thu, 10 Jul 2014 07:56:36 +0000 (00:56 -0700)]
Fix GC to use art::Atomic rather than compiler intrinsics.
Changes to SpaceBitmap::AtomicTestAndSet and Space::end_. Space::end_ is made
atomic rather than volatile to fully capture all its uses multi-threaded or not
uses.
Change-Id: I3058964b8ad90a8c253b3d7f75585f63ca2fb5e3
Ian Rogers [Thu, 10 Jul 2014 06:49:02 +0000 (06:49 +0000)]
Merge "Missed use of android_atomic and thread state_."
Ian Rogers [Thu, 10 Jul 2014 05:02:36 +0000 (22:02 -0700)]
Missed use of android_atomic and thread state_.
Move to using art::Atomic, add necessary FetchAnd... operations to art::Atomic.
Change-Id: I32f1cdc4e0a2037b73f459bf4bb4d544f357f41b
Mathieu Chartier [Thu, 10 Jul 2014 00:40:14 +0000 (00:40 +0000)]
am
bcb3b290: Merge "Add notion of released vs empty pages to ROSAlloc."
* commit '
bcb3b29095817ce8987d8310d4db87271f5114ad':
Add notion of released vs empty pages to ROSAlloc.
Ian Rogers [Thu, 10 Jul 2014 06:37:47 +0000 (06:37 +0000)]
Merge "Fix tracing."
Ian Rogers [Thu, 10 Jul 2014 06:16:06 +0000 (23:16 -0700)]
Fix tracing.
Change-Id: If6837270baec694c00cc1884bae0f1842d49da75
Dave Allison [Thu, 10 Jul 2014 00:26:08 +0000 (00:26 +0000)]
am
5de52242: Merge "Add implicit null and stack checks for x86"
* commit '
5de52242f3934f1604083d7215cdde1d0cc8ba7a':
Add implicit null and stack checks for x86
Ian Rogers [Thu, 10 Jul 2014 00:21:46 +0000 (00:21 +0000)]
am
2929490d: Merge "Move card table away from android_atomic_cas."
* commit '
2929490de9374c2a052cff4cf6957852ebf06d98':
Move card table away from android_atomic_cas.
Brian Carlstrom [Thu, 10 Jul 2014 00:16:10 +0000 (00:16 +0000)]
am
5472edce: Merge "CW on Master: Propagate or throw exception when no class found happens in interpreter."
* commit '
5472edce3697721099ead9e16427e0e7ace90754':
CW on Master: Propagate or throw exception when no class found happens in interpreter.
Elliott Hughes [Thu, 10 Jul 2014 00:16:09 +0000 (00:16 +0000)]
am
b288a5ad: Merge "Use the icu4c headers from the new location."
* commit '
b288a5ad024f99d593aef55e352b46c1a2868af7':
Use the icu4c headers from the new location.
Andreas Gampe [Thu, 10 Jul 2014 00:16:08 +0000 (00:16 +0000)]
am
91db19b5: Merge "ART: Add simple tests for inlining of CAS"
* commit '
91db19b5f14e32878e0a70fa8d43f3412586b821':
ART: Add simple tests for inlining of CAS
Mathieu Chartier [Wed, 9 Jul 2014 22:33:33 +0000 (22:33 +0000)]
am
ef9b94cc: Merge "Add easy way to ensure the next allocation does GC."
* commit '
ef9b94cc83595bc0c95b0edd5131187998919c7a':
Add easy way to ensure the next allocation does GC.
Dave Allison [Thu, 10 Jul 2014 00:16:22 +0000 (00:16 +0000)]
Merge "Add implicit null and stack checks for x86"
Dave Allison [Thu, 29 May 2014 15:20:04 +0000 (08:20 -0700)]
Add implicit null and stack checks for x86
This adds compiler and runtime changes for x86
implicit checks. 32 bit only.
Both host and target are supported.
By default, on the host, the implicit checks are null pointer and
stack overflow. Suspend is implemented but not switched on.
Change-Id: I88a609e98d6bf32f283eaa4e6ec8bbf8dc1df78a
Dave Allison [Wed, 9 Jul 2014 22:02:26 +0000 (22:02 +0000)]
am
b796d1bf: Merge "Remove incorrect check for sa_mask in signal chaining"
* commit '
b796d1bfac8cfaf4dc98f411ae6157f964d4a325':
Remove incorrect check for sa_mask in signal chaining
Ian Rogers [Thu, 10 Jul 2014 01:37:50 +0000 (01:37 +0000)]
Merge "Remove legacy CAS implementations from mutex."
Ian Rogers [Wed, 9 Jul 2014 06:50:26 +0000 (23:50 -0700)]
Remove legacy CAS implementations from mutex.
Removes the use of __sync_bool_compare_and_swap and android_atomic_cas and uses
intention revealing atomic operations from art::Atomic (which will eventually
give way to std::atomic).
Change-Id: Iea44e1923f6706ec04b5459fe25427282c189a7e
Andreas Gampe [Thu, 10 Jul 2014 08:07:54 +0000 (08:07 +0000)]
Merge "Revert "Revert "Quick compiler: remove temporary workaround."""
Andreas Gampe [Thu, 10 Jul 2014 08:03:44 +0000 (08:03 +0000)]
Revert "Revert "Quick compiler: remove temporary workaround.""
This reverts commit
f62a9fdf5d22231ce482ebdfd2ebcc1c738ca97b.
This is safe now. Join AOSP behavior.
Change-Id: I8c1b8689cda0fb369e68f1733383eaab771b2cd8
Ian Rogers [Thu, 10 Jul 2014 03:48:18 +0000 (03:48 +0000)]
am
f95e89a0: am
43b6fe02: Merge "Move another field away from android_atomic_cas."
* commit '
f95e89a00ed1a2e69c00f30ffed517e17ffd2956':
Move another field away from android_atomic_cas.
Dave Allison [Thu, 10 Jul 2014 02:03:21 +0000 (02:03 +0000)]
am
826d36e3: am
672f8367: Merge "Revert "Add implicit null and stack checks for x86""
* commit '
826d36e325fe445600407bfa847daa72b5786a68':
Revert "Add implicit null and stack checks for x86"
Ian Rogers [Thu, 10 Jul 2014 01:49:19 +0000 (01:49 +0000)]
am
60c83e0f: am
4770a2e6: Merge "Remove legacy CAS implementations from mutex."
* commit '
60c83e0f6ea1a82953f37b7ef281e5bf2172c88a':
Remove legacy CAS implementations from mutex.
Mathieu Chartier [Thu, 10 Jul 2014 00:50:22 +0000 (00:50 +0000)]
am
650385ed: am
bcb3b290: Merge "Add notion of released vs empty pages to ROSAlloc."
* commit '
650385ed68a968536290e3bb00732896ae70f094':
Add notion of released vs empty pages to ROSAlloc.
Dave Allison [Thu, 10 Jul 2014 00:50:18 +0000 (00:50 +0000)]
am
d224b8c3: am
5de52242: Merge "Add implicit null and stack checks for x86"
* commit '
d224b8c3352448ccb231f4f0f89be48afbc4659f':
Add implicit null and stack checks for x86
Ian Rogers [Thu, 10 Jul 2014 00:50:17 +0000 (00:50 +0000)]
am
a0f17e18: am
2929490d: Merge "Move card table away from android_atomic_cas."
* commit '
a0f17e18f7962912a88d888a90fca2106f6816a9':
Move card table away from android_atomic_cas.
Brian Carlstrom [Thu, 10 Jul 2014 00:49:52 +0000 (00:49 +0000)]
am
37588105: am
5472edce: Merge "CW on Master: Propagate or throw exception when no class found happens in interpreter."
* commit '
375881057878f0fce290fccb6199b565d5161521':
CW on Master: Propagate or throw exception when no class found happens in interpreter.
Elliott Hughes [Thu, 10 Jul 2014 00:49:50 +0000 (00:49 +0000)]
am
c400ffb9: am
b288a5ad: Merge "Use the icu4c headers from the new location."
* commit '
c400ffb9a015a20e3725c640f32c03796d5388dd':
Use the icu4c headers from the new location.
Andreas Gampe [Thu, 10 Jul 2014 00:49:50 +0000 (00:49 +0000)]
am
450b94dd: am
91db19b5: Merge "ART: Add simple tests for inlining of CAS"
* commit '
450b94ddabfe5b5af6b7bcb27acccb37aae1770f':
ART: Add simple tests for inlining of CAS
Ian Rogers [Thu, 10 Jul 2014 04:38:36 +0000 (04:38 +0000)]
Merge "Move thread state to art::Atomic."
Ian Rogers [Thu, 10 Jul 2014 04:12:06 +0000 (21:12 -0700)]
Move thread state to art::Atomic.
Leaves the CAS operations as relaxed although art::Atomic treats relaxed CAS
as a strong CAS when not compiling with clang.
Change-Id: I6d37c22173540d166b624385e52e4ad05e592adc
Ian Rogers [Wed, 9 Jul 2014 20:41:35 +0000 (20:41 +0000)]
am
c21dc06a: Merge "ART: Check slow_paths_.Size() every time"
* commit '
c21dc06adc8c8447561208a3fb72ccf6d0443613':
ART: Check slow_paths_.Size() every time
Ian Rogers [Wed, 9 Jul 2014 20:37:53 +0000 (20:37 +0000)]
am
68e5f442: Merge "x86_64: GenInlinedCas must use wide rl_src_offset under 64-bit targets"
* commit '
68e5f4421001a2ba885d822971c375368520ea8c':
x86_64: GenInlinedCas must use wide rl_src_offset under 64-bit targets
Vladimir Marko [Thu, 10 Jul 2014 08:21:49 +0000 (08:21 +0000)]
Merge "Faster deduplication in OatWriter."
Ian Rogers [Wed, 9 Jul 2014 19:35:04 +0000 (19:35 +0000)]
am
a76dc41f: Merge "Allow method tracing for run-test"
* commit '
a76dc41fb21b6fba74f70188fdc53e1a5bf2c2cb':
Allow method tracing for run-test
Ian Rogers [Wed, 9 Jul 2014 19:35:03 +0000 (19:35 +0000)]
am
0f635b10: Merge "Fix method tracing from command-line"
* commit '
0f635b103c1fff6439d47bdae363afeffe7327fd':
Fix method tracing from command-line
Vladimir Marko [Wed, 9 Jul 2014 15:06:40 +0000 (16:06 +0100)]
Faster deduplication in OatWriter.
Use lower_bound() to look for duplicates and use it as
a hint for insertion of new entries. Add a few useful
functions to SafeMap<>.
Change-Id: If7eab3f5d153be6e0d7ae040929849f1a636ee29
Ian Rogers [Wed, 9 Jul 2014 15:33:23 +0000 (15:33 +0000)]
am
32710dd4: Merge "x86_64: enable Peek and Poke intrinsics"
* commit '
32710dd4a0232149002a5ae7bde1c640cdffd564':
x86_64: enable Peek and Poke intrinsics
Ian Rogers [Wed, 9 Jul 2014 20:31:18 +0000 (20:31 +0000)]
Merge "ART: Check slow_paths_.Size() every time"
Chao-ying Fu [Tue, 8 Jul 2014 00:13:52 +0000 (17:13 -0700)]
ART: Check slow_paths_.Size() every time
This patch fixes a bug, when a new slow path is created
during slowpath->Compile().
Change-Id: I4896a82781102694c25f4483112c6de3c56e072c
Signed-off-by: Chao-ying Fu <chao-ying.fu@intel.com>
Ian Rogers [Wed, 9 Jul 2014 18:52:43 +0000 (18:52 +0000)]
Merge "Fix method tracing from command-line"
Ian Rogers [Wed, 9 Jul 2014 15:26:09 +0000 (15:26 +0000)]
Merge "x86_64: enable Peek and Poke intrinsics"
Andreas Gampe [Thu, 10 Jul 2014 07:54:06 +0000 (07:54 +0000)]
Merge "Use memory chunks for monitors on LP64"
Andreas Gampe [Thu, 17 Apr 2014 17:35:09 +0000 (10:35 -0700)]
Use memory chunks for monitors on LP64
Monitor IDs in lock words are only 30b. On a 32b system that works
fine, as memory is usually aligned enough that shifting works out.
On 64b systems, the virtual memory space is too large for that.
This adds memory chunks into which we allocate the monitors so that
we have base_addr + offset and can use the offset as the monitor ID.
To allow for relatively compact but growable storage, we use a list
of chunks.
Added a global lock for the monitor pool.
Change-Id: I0e290c4914a2556e0b2eef9902422d7c4dcf536d
Ian Rogers [Thu, 10 Jul 2014 03:36:51 +0000 (03:36 +0000)]
Merge "Move another field away from android_atomic_cas."
Ian Rogers [Thu, 10 Jul 2014 01:00:50 +0000 (18:00 -0700)]
Move another field away from android_atomic_cas.
Change-Id: If63aa2811e06ec401a601286a3bacb62a0da96ad
Ian Rogers [Thu, 10 Jul 2014 00:09:25 +0000 (00:09 +0000)]
Merge "Move card table away from android_atomic_cas."
Ian Rogers [Wed, 9 Jul 2014 05:55:18 +0000 (22:55 -0700)]
Move card table away from android_atomic_cas.
For x86 use byte CAS operations for byte CAS.
Fix bug in ModifyCardsAtomic where CAS was 32-bit instead of 64-bit.
Change-Id: Ieb3fe695b4699750abf04642b0abe94103976817
Mathieu Chartier [Wed, 9 Jul 2014 22:10:01 +0000 (22:10 +0000)]
Merge "Add easy way to ensure the next allocation does GC."
Mathieu Chartier [Wed, 9 Jul 2014 00:46:19 +0000 (17:46 -0700)]
Add easy way to ensure the next allocation does GC.
Added a class called ScopedHeapFill which changes the bytes allocated
counter to be equal to the growth limit. This causes the next
allocation to do a GC and possibly generate an OOM error. This is
useful for tests which need GC to happen at specific point.
Change-Id: Ibd8f3d5928b58534c5165ba7c296980002aa2c28
Dave Allison [Wed, 9 Jul 2014 21:45:13 +0000 (21:45 +0000)]
Merge "Remove incorrect check for sa_mask in signal chaining"
Dave Allison [Wed, 9 Jul 2014 01:07:18 +0000 (18:07 -0700)]
Remove incorrect check for sa_mask in signal chaining
This removes an incorrect check using the sa_mask field of the
sigaction structure when chaining to a user's signal handler.
The check prevented a user's handler being called when sa_mask
was set.
Thanks to primiano@ for the excellent bug report.
Bug:
16005022
Change-Id: I0548003f4fc3b1889a6859091e603ead4a9b0607
Ian Rogers [Wed, 9 Jul 2014 20:24:26 +0000 (20:24 +0000)]
Merge "x86_64: GenInlinedCas must use wide rl_src_offset under 64-bit targets"
Chao-ying Fu [Wed, 9 Jul 2014 18:32:31 +0000 (11:32 -0700)]
x86_64: GenInlinedCas must use wide rl_src_offset under 64-bit targets
This patch fixes to use wide rl_src_offset for int and long types
under 64-bit targets, and fixes movzx8 and movsx8 to use r8_form
on the second register only.
Change-Id: Ib8c0756609100f9bc5c228f1eb391421416f3af6
Signed-off-by: Chao-ying Fu <chao-ying.fu@intel.com>
Colin Cross [Thu, 10 Jul 2014 06:10:48 +0000 (06:10 +0000)]
Merge "art: fix host dex2oat runtime args"
Colin Cross [Thu, 10 Jul 2014 05:14:12 +0000 (22:14 -0700)]
art: fix host dex2oat runtime args
The runtime arguments need to be prefixed with -Xmx or -Xms.
This only worked before because DEX2OAT_XMS, etc. were blank
due to bugs in build/, which resulted in --runtime-arg --runtime-arg
and anything starting with -- as the argument to --runtime-arg is
silently ignored.
Change-Id: I18607a6fd8d0004466404045f8dc4495eb6ab275
Dave Allison [Thu, 10 Jul 2014 01:55:25 +0000 (01:55 +0000)]
Merge "Revert "Add implicit null and stack checks for x86""
Dave Allison [Thu, 10 Jul 2014 01:54:57 +0000 (01:54 +0000)]
Revert "Add implicit null and stack checks for x86"
It breaks cross compilation with x86_64.
This reverts commit
34e826ccc80dc1cf7c4c045de6b7f8360d504ccf.
Change-Id: I34ba07821fc0a022fda33a7ae21850957bbec5e7
Mathieu Chartier [Thu, 10 Jul 2014 00:32:52 +0000 (00:32 +0000)]
Merge "Add notion of released vs empty pages to ROSAlloc."
Mathieu Chartier [Tue, 24 Jun 2014 21:48:59 +0000 (14:48 -0700)]
Add notion of released vs empty pages to ROSAlloc.
A notion of released vs empty pages helps get a more accurate view of
how much memory was released during heap trimming. Otherwise we get
that the same pages possibly get madvised multiple times without
getting dirtied.
Also enabled heap trimming of rosalloc spaces even when we care about
jank. This is safe to do since the trimming process only acquires
locks for short periods of time.
Dalvik PSS reduces from ~52M to ~50M after boot on N4.
Bug:
9969166
Change-Id: I4012e0a2554f413d18efe1a0371fe18d1edabaa9
Elliott Hughes [Wed, 9 Jul 2014 22:54:14 +0000 (22:54 +0000)]
Merge "Use the icu4c headers from the new location."
Elliott Hughes [Wed, 9 Jul 2014 22:31:20 +0000 (15:31 -0700)]
Use the icu4c headers from the new location.
Change-Id: I6ca56e8f9909bf3644a5f79f2d705547ddba6d03
Andreas Gampe [Wed, 9 Jul 2014 22:18:27 +0000 (22:18 +0000)]
Merge "ART: Add simple tests for inlining of CAS"
Andreas Gampe [Wed, 9 Jul 2014 04:33:47 +0000 (21:33 -0700)]
ART: Add simple tests for inlining of CAS
Add simple test cases for the inlining of CAS in the quick compiler to
run-test 082. The tests are not multi-threaded and will just establish
that the baseline behavior is correct. For extensive evaluation consider
tests available in libcore.
Change-Id: I9f463599e48ab7abc725769dda84758c9c6a76c2
Ian Rogers [Wed, 9 Jul 2014 18:58:43 +0000 (18:58 +0000)]
Merge "Allow method tracing for run-test"
Alexei Zavjalov [Tue, 8 Jul 2014 09:27:17 +0000 (16:27 +0700)]
x86_64: enable Peek and Poke intrinsics
This implements intrinsics for:
Memory.peekByte/Short/Int/Long()
Memory.pokeByte/Short/Int/Long()
Change-Id: I6da6250f262dfd7aded35c2e3ade2d0916bd73cb
Signed-off-by: Alexei Zavjalov <alexei.zavjalov@intel.com>
Sebastien Hertz [Tue, 17 Dec 2013 09:42:03 +0000 (10:42 +0100)]
Fix method tracing from command-line
Transitions current thread to the new kWaitingForMethodTracingStart thread
state when starting method tracing.
Ensures there is a current thread when method tracing is stopped due to runtime
shutdown. If the current thread has been detached, we now re-attach it.
Note: we only do this if method tracing has been activated from command-line.
Fixes instrumentation when forcing interpreter mode (-Xint) with method tracing
enabled.
Removes unused parameter from UnsafeLogFatalForThreadSuspendAllTimeout.
Bug: https://code.google.com/p/android/issues/detail?id=72094
Bug:
11683397
Change-Id: I70f000fb46ddd95d6ad51ea0a8eee77697a045e9
Sebastien Hertz [Wed, 9 Jul 2014 13:59:05 +0000 (15:59 +0200)]
Allow method tracing for run-test
Adds "--trace" option to enable method tracing.
Bug:
11683397
Change-Id: I20a6b25c71067eafd848db26f13d62cfdb9a6159
Vladimir Marko [Wed, 9 Jul 2014 12:36:42 +0000 (12:36 +0000)]
am
62f28f94: Merge "Fix a compile assert name with inverted meaning."
* commit '
62f28f943e2da2873c7a09096c292f01a21c6478':
Fix a compile assert name with inverted meaning.
Vladimir Marko [Wed, 9 Jul 2014 12:36:41 +0000 (12:36 +0000)]
am
665f6810: Merge "Workaround for invalid monitor-exit catch ranges."
* commit '
665f681020ec313d6aea1aa26db582176d780079':
Workaround for invalid monitor-exit catch ranges.
Nicolas Geoffray [Wed, 9 Jul 2014 12:36:40 +0000 (12:36 +0000)]
am
8078b294: Merge "Revert "ART: Key-Value Store in Oat header""
* commit '
8078b294e8001abff5a6c8637e844b55a65fff4b':
Revert "ART: Key-Value Store in Oat header"
Ian Rogers [Wed, 9 Jul 2014 12:36:39 +0000 (12:36 +0000)]
am
608520c8: Merge "Adds PGO_GEN and PGO_USE for libart and libart-compiler."
* commit '
608520c8ba1adc7d8d0623b021b7ea509b00751c':
Adds PGO_GEN and PGO_USE for libart and libart-compiler.
Ian Rogers [Wed, 9 Jul 2014 12:36:39 +0000 (12:36 +0000)]
am
2cfe30bd: Merge "X86 Backend support for vectorized float and byte 16x16 operations"
* commit '
2cfe30bd592cb6ae63bb4c28ccaf4b069d6ab565':
X86 Backend support for vectorized float and byte 16x16 operations
Ian Rogers [Wed, 9 Jul 2014 12:36:38 +0000 (12:36 +0000)]
am
7b68fb3b: Merge "x86_64: Clean-up after cmp-long fix"
* commit '
7b68fb3b9b421d4b20c1993704986d637f1cab91':
x86_64: Clean-up after cmp-long fix
Ian Rogers [Wed, 9 Jul 2014 12:36:37 +0000 (12:36 +0000)]
am
dfc56e68: Merge "Clean-up call_x86.cc"
* commit '
dfc56e681beb055801491792026cb9976d8566e8':
Clean-up call_x86.cc
Andreas Gampe [Wed, 9 Jul 2014 12:36:36 +0000 (12:36 +0000)]
am
251a057f: Merge "ART: Fix FP promotion"
* commit '
251a057f52946452ac1c485b38d4ebafcf3bc5ad':
ART: Fix FP promotion
Brian Carlstrom [Wed, 9 Jul 2014 12:36:35 +0000 (12:36 +0000)]
am
dac3f4af: Merge "Whitelist another exception during dex2oat resolving."
* commit '
dac3f4afe1a3f5626836b6921230c150b68b9d34':
Whitelist another exception during dex2oat resolving.
Brian Carlstrom [Wed, 9 Jul 2014 12:36:34 +0000 (12:36 +0000)]
am
6e524ddc: Merge "Make dex2oat heap size product configurable [art]"
* commit '
6e524ddc060f10a493dc63fa5b6dde0deef22219':
Make dex2oat heap size product configurable [art]
Andreas Gampe [Wed, 9 Jul 2014 12:36:33 +0000 (12:36 +0000)]
am
3d30b073: Merge "ART: Do not emit load when inlining unused Thread.currentThread()"
* commit '
3d30b073541f19470e8b5dddef9377411fa587c3':
ART: Do not emit load when inlining unused Thread.currentThread()
Ian Rogers [Wed, 9 Jul 2014 12:36:32 +0000 (12:36 +0000)]
am
8746860d: Merge "Only allow instance-of to improve knowledge of a type for downcasts."
* commit '
8746860d056e64dcc832264e74bda9d511e86e2d':
Only allow instance-of to improve knowledge of a type for downcasts.
Ian Rogers [Wed, 9 Jul 2014 07:46:42 +0000 (07:46 +0000)]
Merge "Adds PGO_GEN and PGO_USE for libart and libart-compiler."
Brian Carlstrom [Wed, 9 Jul 2014 23:50:28 +0000 (23:50 +0000)]
Merge "CW on Master: Propagate or throw exception when no class found happens in interpreter."
Sean Wan [Wed, 9 Jul 2014 19:08:29 +0000 (12:08 -0700)]
CW on Master: Propagate or throw exception when no class found happens in interpreter.
The old behavior is a check fail which causes zygote process crash.
This is particular a problem for CW in which webview is not used, and
this stops CW system start.
(cherry picked from commit
41a71f3db62e5bccb162a2b18ed3801e00ff6f87)
Change-Id: Iabe091ebe4bbdd86d931ac6c06abd089f1338d59