OSDN Git Service
David Brazdil [Thu, 5 Mar 2015 14:41:26 +0000 (14:41 +0000)]
am
62c190e0: am
ea19b369: Merge "ART: Optimize iteration of safepoints"
* commit '
62c190e0e8fe409551576c1d7bcf7fb24d7543f1':
ART: Optimize iteration of safepoints
David Brazdil [Thu, 5 Mar 2015 14:35:37 +0000 (14:35 +0000)]
am
ea19b369: Merge "ART: Optimize iteration of safepoints"
* commit '
ea19b3696f90e07c72acb383f84305ace9b16097':
ART: Optimize iteration of safepoints
David Brazdil [Thu, 5 Mar 2015 14:29:48 +0000 (14:29 +0000)]
Merge "ART: Optimize iteration of safepoints"
David Brazdil [Tue, 3 Mar 2015 10:44:24 +0000 (10:44 +0000)]
ART: Optimize iteration of safepoints
The LiveInterval::Covers method is optimized for multiple calls with
non-decreasing positions. This patch reverts the order of iteration
over safepoints in RegisterAllocator::ConnectSiblings to capitalize
on this effect.
Change-Id: Ieb70eb9d5c0a06ee79379aab6c87cb3290c15bf7
Nicolas Geoffray [Thu, 5 Mar 2015 11:34:50 +0000 (11:34 +0000)]
am
e759e228: am
af8db2ea: Merge "[optimizing] Use callee-save registers for x86"
* commit '
e759e228287415995f703393d7cddae0012d8a96':
[optimizing] Use callee-save registers for x86
Nicolas Geoffray [Thu, 5 Mar 2015 11:28:35 +0000 (11:28 +0000)]
am
af8db2ea: Merge "[optimizing] Use callee-save registers for x86"
* commit '
af8db2ea18135588b267fe9a0b2f7af734b906cc':
[optimizing] Use callee-save registers for x86
Nicolas Geoffray [Thu, 5 Mar 2015 11:22:00 +0000 (11:22 +0000)]
Merge "[optimizing] Use callee-save registers for x86"
Mark Mendell [Wed, 4 Mar 2015 20:42:45 +0000 (15:42 -0500)]
[optimizing] Use callee-save registers for x86
Add ESI, EDI, EBP to available registers for non-baseline mode. Ensure
that they aren't used when byte addressible registers are needed.
Change-Id: Ie7130d4084c2ae9cfcd1e47c26eb3e5dcac1ebd6
Signed-off-by: Mark Mendell <mark.p.mendell@intel.com>
Andreas Gampe [Thu, 5 Mar 2015 07:14:43 +0000 (07:14 +0000)]
am
1989af6a: am
65b50272: Merge "ART: Fix compile-time-init fail"
* commit '
1989af6a05ba8336909ac81085370d62001f6c8c':
ART: Fix compile-time-init fail
Andreas Gampe [Thu, 5 Mar 2015 07:08:52 +0000 (07:08 +0000)]
am
65b50272: Merge "ART: Fix compile-time-init fail"
* commit '
65b50272a15c52d753f68df2468fe1792f2516ea':
ART: Fix compile-time-init fail
Andreas Gampe [Thu, 5 Mar 2015 07:03:27 +0000 (07:03 +0000)]
Merge "ART: Fix compile-time-init fail"
Andreas Gampe [Thu, 5 Mar 2015 06:46:35 +0000 (22:46 -0800)]
ART: Fix compile-time-init fail
It is possible that a class that isn't itself marked as an image
class and would be skipped for compile-time-initialization by the
compiler driver is initialized when initializing a second class
that is an image class.
If the second class only depended on the first class during
initialization, e.g., to read field values, the compiler driver
may discard the class object (not reachable from image classes),
but record the oat class status as initialized (as it has been).
In that case we miss the initialization when we load the class at
runtime.
Ensure that all initialized classes with a class initializer are
considered image classes and retained.
Bug:
19323020
Change-Id: I4e537f328d9a4ea23ed5ff7166d532b8855f7acd
Andreas Gampe [Thu, 5 Mar 2015 00:05:59 +0000 (00:05 +0000)]
am
b2856037: am
51867b3c: Merge "ART: Report zip opening error"
* commit '
b285603737ebc87e3eca93663ccb1b2961dfb654':
ART: Report zip opening error
Dan Albert [Thu, 5 Mar 2015 00:05:58 +0000 (00:05 +0000)]
am
290f27fe: am
dbba41df: Merge "Include what we use."
* commit '
290f27fe73f65113660750504a113378a29b4bb9':
Include what we use.
Andreas Gampe [Thu, 5 Mar 2015 00:05:56 +0000 (00:05 +0000)]
am
07636b45: am
18cd8711: Merge "ART: Do not produce CFI when not asked for"
* commit '
07636b45b11c26638b65eea2fd57b27a27cbf530':
ART: Do not produce CFI when not asked for
Andreas Gampe [Wed, 4 Mar 2015 23:55:29 +0000 (23:55 +0000)]
am
51867b3c: Merge "ART: Report zip opening error"
* commit '
51867b3cdc0481048ea8c22a846932f2a207cf53':
ART: Report zip opening error
Dan Albert [Wed, 4 Mar 2015 23:55:20 +0000 (23:55 +0000)]
am
dbba41df: Merge "Include what we use."
* commit '
dbba41df51fe364349dbaf1cc5d310fd7f24d269':
Include what we use.
Andreas Gampe [Wed, 4 Mar 2015 23:55:18 +0000 (23:55 +0000)]
am
18cd8711: Merge "ART: Do not produce CFI when not asked for"
* commit '
18cd8711d0059415dc8a99470fc105279a9ce0c6':
ART: Do not produce CFI when not asked for
Andreas Gampe [Wed, 4 Mar 2015 23:45:29 +0000 (23:45 +0000)]
Merge "ART: Report zip opening error"
Andreas Gampe [Wed, 4 Mar 2015 23:38:51 +0000 (15:38 -0800)]
ART: Report zip opening error
Do not swallow the error message from ZipArchive::OpenFromFd.
Bug:
19574093
Change-Id: I14ea771e63b7bc3e8051012a841e66b9e894aa3a
Dan Albert [Wed, 4 Mar 2015 23:12:02 +0000 (23:12 +0000)]
Merge "Include what we use."
Dan Albert [Wed, 4 Mar 2015 23:06:16 +0000 (15:06 -0800)]
Include what we use.
Newest libc++ update fixes some of the header cruft.
Change-Id: Ic5019ffcb272274ac3b21627218d65a887074458
Andreas Gampe [Wed, 4 Mar 2015 23:00:18 +0000 (23:00 +0000)]
Merge "ART: Do not produce CFI when not asked for"
Andreas Gampe [Wed, 4 Mar 2015 22:00:56 +0000 (14:00 -0800)]
ART: Do not produce CFI when not asked for
Insignificant time savings on the host, but also reduces native
allocation size.
Change-Id: Iea3d335e5375a0076306059d094e5b994e24b9e6
Andreas Gampe [Wed, 4 Mar 2015 22:51:30 +0000 (22:51 +0000)]
am
65fe6dbe: am
b8fef11a: Merge "[optimizing] Improve x86/x86_64 bound check code"
* commit '
65fe6dbed753b2e053ef82fc5a773889e44a5e42':
[optimizing] Improve x86/x86_64 bound check code
Andreas Gampe [Wed, 4 Mar 2015 22:51:29 +0000 (22:51 +0000)]
am
c4d27a4b: am
c670efd6: Merge "ART: Add debuggable compiler flag"
* commit '
c4d27a4b86323f595f7499542692525249ec384b':
ART: Add debuggable compiler flag
Andreas Gampe [Wed, 4 Mar 2015 22:51:28 +0000 (22:51 +0000)]
am
9213dcb5: am
029113f1: Merge "ART: Fix missing handles"
* commit '
9213dcb582f46d3ee03db237db53f2ada2b3e47b':
ART: Fix missing handles
Andreas Gampe [Wed, 4 Mar 2015 22:44:49 +0000 (22:44 +0000)]
am
b8fef11a: Merge "[optimizing] Improve x86/x86_64 bound check code"
* commit '
b8fef11aef3732f97ef9192e14c49d4993c26e22':
[optimizing] Improve x86/x86_64 bound check code
Andreas Gampe [Wed, 4 Mar 2015 22:44:40 +0000 (22:44 +0000)]
am
c670efd6: Merge "ART: Add debuggable compiler flag"
* commit '
c670efd6ba9dbd1166bfd8c805bb6b2df7d4313a':
ART: Add debuggable compiler flag
Andreas Gampe [Wed, 4 Mar 2015 22:44:39 +0000 (22:44 +0000)]
am
029113f1: Merge "ART: Fix missing handles"
* commit '
029113f1013e2ce9027ea241a68f93072ce1bfe9':
ART: Fix missing handles
Andreas Gampe [Wed, 4 Mar 2015 22:17:56 +0000 (22:17 +0000)]
Merge "[optimizing] Improve x86/x86_64 bound check code"
Andreas Gampe [Wed, 4 Mar 2015 21:12:27 +0000 (21:12 +0000)]
Merge "ART: Add debuggable compiler flag"
Andreas Gampe [Wed, 4 Mar 2015 21:05:59 +0000 (21:05 +0000)]
Merge "ART: Fix missing handles"
Mingyao Yang [Wed, 4 Mar 2015 20:35:11 +0000 (20:35 +0000)]
am
7f9b19d9: am
c4371cd0: Merge "Fix bce gtest."
* commit '
7f9b19d93589f2bfe57807c7e38d4c4ede0d5ded':
Fix bce gtest.
Mingyao Yang [Wed, 4 Mar 2015 20:28:51 +0000 (20:28 +0000)]
am
c4371cd0: Merge "Fix bce gtest."
* commit '
c4371cd0fe506703b5249cd9d7cad936b9fb4379':
Fix bce gtest.
Mingyao Yang [Wed, 4 Mar 2015 20:22:26 +0000 (20:22 +0000)]
Merge "Fix bce gtest."
Andreas Gampe [Mon, 2 Mar 2015 22:07:33 +0000 (14:07 -0800)]
ART: Add debuggable compiler flag
Add a flag to compiler options that shows debuggability.
Change-Id: Id17ec72babe2ee88713a0d274eff86508de30666
Andreas Gampe [Wed, 4 Mar 2015 01:48:39 +0000 (17:48 -0800)]
ART: Fix missing handles
Follow-up to https://android-review.googlesource.com/137010.
Change-Id: Ie97bd01f3cd6eeef9ae38fd189b933b905832d52
Mark Mendell [Wed, 4 Mar 2015 20:12:59 +0000 (15:12 -0500)]
[optimizing] Improve x86/x86_64 bound check code
Don't force a constant index into a register just to compare to the
array size. Allow a constant, and compare the constant to the size.
Change-Id: I1c5732fbd42e63f7eac5c6219a19e9c431c22664
Signed-off-by: Mark Mendell <mark.p.mendell@intel.com>
Mingyao Yang [Wed, 4 Mar 2015 20:10:34 +0000 (12:10 -0800)]
Fix bce gtest.
Change-Id: I8b974b68bbebef704fa3c8a073f2920f8a78d1fa
Mingyao Yang [Wed, 4 Mar 2015 19:41:17 +0000 (19:41 +0000)]
am
4b50ca8c: am
d8de6f2f: Merge "Make BCE a no-op if there is no array access."
* commit '
4b50ca8cecfb8675613a8dda82b560cc9468e549':
Make BCE a no-op if there is no array access.
Mingyao Yang [Wed, 4 Mar 2015 19:37:29 +0000 (19:37 +0000)]
am
d8de6f2f: Merge "Make BCE a no-op if there is no array access."
* commit '
d8de6f2f6083c119a56b6d4abe537a67c070ebea':
Make BCE a no-op if there is no array access.
Mingyao Yang [Wed, 4 Mar 2015 19:30:50 +0000 (19:30 +0000)]
Merge "Make BCE a no-op if there is no array access."
Sebastien Hertz [Wed, 4 Mar 2015 17:10:39 +0000 (17:10 +0000)]
am
88486509: am
dc68bafc: Merge "Update run-test 031-class-attributes"
* commit '
88486509260ef535bca8405a120261580cb750a2':
Update run-test 031-class-attributes
Sebastien Hertz [Wed, 4 Mar 2015 17:05:01 +0000 (17:05 +0000)]
am
dc68bafc: Merge "Update run-test 031-class-attributes"
* commit '
dc68bafc29a457b1cc5b29a03f2ef5f2af77865d':
Update run-test 031-class-attributes
Sebastien Hertz [Wed, 4 Mar 2015 16:55:21 +0000 (16:55 +0000)]
Merge "Update run-test 031-class-attributes"
Sebastien Hertz [Wed, 4 Mar 2015 15:45:31 +0000 (16:45 +0100)]
Update run-test 031-class-attributes
Ensure types are printed in alphabetical order.
Bug:
19499481
Change-Id: Ia14d2529f8031bc4c2bfb8911fdebebf97638dc9
Nicolas Geoffray [Wed, 4 Mar 2015 11:23:59 +0000 (11:23 +0000)]
am
4cac71c8: am
3d7d2af4: Merge "Change how we report exceptions to the debugger."
* commit '
4cac71c8daf86bf1b6eaa22d41298c4c10de7bbd':
Change how we report exceptions to the debugger.
Nicolas Geoffray [Wed, 4 Mar 2015 11:17:06 +0000 (11:17 +0000)]
am
3d7d2af4: Merge "Change how we report exceptions to the debugger."
* commit '
3d7d2af4c6502b771b032ee9bf3ab30e78f9c60d':
Change how we report exceptions to the debugger.
Nicolas Geoffray [Wed, 4 Mar 2015 11:13:16 +0000 (11:13 +0000)]
Merge "Change how we report exceptions to the debugger."
Nicolas Geoffray [Wed, 4 Mar 2015 10:37:05 +0000 (10:37 +0000)]
am
8bf6ac2e: am
87896b3a: Merge "Fix arm64 build."
* commit '
8bf6ac2e5d23b9a876df1a61f061cb954601da3f':
Fix arm64 build.
Nicolas Geoffray [Wed, 4 Mar 2015 10:33:21 +0000 (10:33 +0000)]
am
87896b3a: Merge "Fix arm64 build."
* commit '
87896b3a1f97c815fe02c7490c1f27951c58bbbf':
Fix arm64 build.
Nicolas Geoffray [Wed, 4 Mar 2015 10:29:22 +0000 (10:29 +0000)]
Merge "Fix arm64 build."
Nicolas Geoffray [Wed, 4 Mar 2015 10:28:04 +0000 (10:28 +0000)]
Fix arm64 build.
Change-Id: Ib6babc1c6e8f2e78badc93cfcf89950e53f71bbb
Brian Carlstrom [Wed, 4 Mar 2015 05:52:52 +0000 (05:52 +0000)]
am
e06a852e: am
44d95a22: Merge "Switch from memalign to posix_memalign for Mac build"
* commit '
e06a852e93834d2d1cb84b6af9e051de405cfe09':
Switch from memalign to posix_memalign for Mac build
Brian Carlstrom [Wed, 4 Mar 2015 05:46:08 +0000 (05:46 +0000)]
am
44d95a22: Merge "Switch from memalign to posix_memalign for Mac build"
* commit '
44d95a22b2d9127f9b803a70dbe00d0816e922ad':
Switch from memalign to posix_memalign for Mac build
Brian Carlstrom [Wed, 4 Mar 2015 05:40:05 +0000 (05:40 +0000)]
Merge "Switch from memalign to posix_memalign for Mac build"
Brian Carlstrom [Wed, 4 Mar 2015 05:21:29 +0000 (21:21 -0800)]
Switch from memalign to posix_memalign for Mac build
Change-Id: Id320015ea3999605954f53b5e266f53e968c7065
Hiroshi Yamauchi [Wed, 4 Mar 2015 01:50:15 +0000 (01:50 +0000)]
am
2a3edf08: am
ff3ef43f: Merge "Reserve bits in the lock word for read barriers."
* commit '
2a3edf08eb9201557b71cf6d20f98081d9fab8c7':
Reserve bits in the lock word for read barriers.
Hiroshi Yamauchi [Wed, 4 Mar 2015 01:43:57 +0000 (01:43 +0000)]
am
ff3ef43f: Merge "Reserve bits in the lock word for read barriers."
* commit '
ff3ef43f3d0f0986fe23286af028b352277b6e1e':
Reserve bits in the lock word for read barriers.
Mingyao Yang [Mon, 2 Mar 2015 23:14:13 +0000 (15:14 -0800)]
Make BCE a no-op if there is no array access.
Change-Id: I8456182808c1dbaa0c0ae1b8c2e94bb17baf5f29
Hiroshi Yamauchi [Wed, 4 Mar 2015 01:37:11 +0000 (01:37 +0000)]
Merge "Reserve bits in the lock word for read barriers."
Hiroshi Yamauchi [Tue, 10 Feb 2015 01:11:42 +0000 (17:11 -0800)]
Reserve bits in the lock word for read barriers.
This prepares for the CC collector to use the standard object header
model by storing the read barrier state in the lock word.
Bug:
19355854
Bug:
12687968
Change-Id: Ia7585662dd2cebf0479a3e74f734afe5059fb70f
Mathieu Chartier [Wed, 4 Mar 2015 00:58:53 +0000 (00:58 +0000)]
am
e59ff2e5: am
5e42cd3e: Merge "Wait for threads to finish unregistering"
* commit '
e59ff2e56a1f273b8ec019df378c9a0f5dad68bf':
Wait for threads to finish unregistering
Mathieu Chartier [Wed, 4 Mar 2015 00:51:57 +0000 (00:51 +0000)]
am
5e42cd3e: Merge "Wait for threads to finish unregistering"
* commit '
5e42cd3eee2c89214a331a36fe226cfcc57917a3':
Wait for threads to finish unregistering
Mathieu Chartier [Wed, 4 Mar 2015 00:46:47 +0000 (00:46 +0000)]
Merge "Wait for threads to finish unregistering"
Mingyao Yang [Wed, 4 Mar 2015 00:35:04 +0000 (00:35 +0000)]
am
4c00740d: am
c8fb9184: Merge "Add a change that should be part of "enhance gvn for commutative ops.""
* commit '
4c00740d80d9c4816bebe8359f6c6070512d9459':
Add a change that should be part of "enhance gvn for commutative ops."
Mathieu Chartier [Tue, 3 Mar 2015 21:51:04 +0000 (13:51 -0800)]
Wait for threads to finish unregistering
There was a race where Thread::join would return before the thread was
unregistered. This caused a problem with Daemons.stop since the thread
list could get deleted before the daemon thread was removed from list_.
This caused occasional "Request to unregister unattached thread"
errors and warnings.
The fix is to wait until threads finish registering before destroying
the thread list. The only threads which can be unregistering at this
point are the daemons we stopped earlier during the runtime shutdown
process. The issue is that thread join finishes before we remove the
thread from the thread list.
Also some cleanup.
Bug:
18713034
Change-Id: I8921122fe8462643a6b814b5f00632481e3831fb
Brian Carlstrom [Wed, 4 Mar 2015 00:31:17 +0000 (00:31 +0000)]
am
85079b29: am
2347d60a: Merge "Remove old build options from .gitignore"
* commit '
85079b29ee15da5fcedcfd9f7e46e64750be1ef1':
Remove old build options from .gitignore
Mingyao Yang [Wed, 4 Mar 2015 00:31:14 +0000 (00:31 +0000)]
am
0a857961: am
49ccb6e6: Merge "Opt compiler: enhance gvn for commutative ops."
* commit '
0a857961b3d336d02a66b9cf5786b08699d6a69d':
Opt compiler: enhance gvn for commutative ops.
Jeff Hao [Wed, 4 Mar 2015 00:31:12 +0000 (00:31 +0000)]
am
091af0cc: am
86a4db46: Merge "Remove ART_SMALL_MODE ifdefs."
* commit '
091af0cce037cf8242b6aad23f3df48ba0572822':
Remove ART_SMALL_MODE ifdefs.
Mingyao Yang [Wed, 4 Mar 2015 00:25:37 +0000 (00:25 +0000)]
am
c8fb9184: Merge "Add a change that should be part of "enhance gvn for commutative ops.""
* commit '
c8fb918428c1846da321b9d138c48c1ec4b56bef':
Add a change that should be part of "enhance gvn for commutative ops."
Mingyao Yang [Wed, 4 Mar 2015 00:19:59 +0000 (00:19 +0000)]
Merge "Add a change that should be part of "enhance gvn for commutative ops.""
Mingyao Yang [Wed, 4 Mar 2015 00:15:23 +0000 (16:15 -0800)]
Add a change that should be part of "enhance gvn for commutative ops."
Change-Id: Id1a30afb095b2c7e27a4ef8a1ef7293022c1aaed
Brian Carlstrom [Wed, 4 Mar 2015 00:09:49 +0000 (00:09 +0000)]
am
2347d60a: Merge "Remove old build options from .gitignore"
* commit '
2347d60ac02a9d0c7b1a279756f8093f3d66173a':
Remove old build options from .gitignore
Brian Carlstrom [Wed, 4 Mar 2015 00:05:52 +0000 (00:05 +0000)]
Merge "Remove old build options from .gitignore"
Brian Carlstrom [Tue, 3 Mar 2015 23:31:15 +0000 (15:31 -0800)]
Remove old build options from .gitignore
Change-Id: I1f1eaef57e3a3b4109cc6b312ecfa429d7797b92
Mingyao Yang [Tue, 3 Mar 2015 23:41:44 +0000 (23:41 +0000)]
am
49ccb6e6: Merge "Opt compiler: enhance gvn for commutative ops."
* commit '
49ccb6e6e126bbb7af5e16e608e080fd07968caf':
Opt compiler: enhance gvn for commutative ops.
Jeff Hao [Tue, 3 Mar 2015 23:38:02 +0000 (23:38 +0000)]
am
86a4db46: Merge "Remove ART_SMALL_MODE ifdefs."
* commit '
86a4db469e9ab31d6574a58fe67702c7fc5222d7':
Remove ART_SMALL_MODE ifdefs.
Mingyao Yang [Tue, 3 Mar 2015 23:37:31 +0000 (23:37 +0000)]
Merge "Opt compiler: enhance gvn for commutative ops."
Jeff Hao [Tue, 3 Mar 2015 23:32:31 +0000 (23:32 +0000)]
Merge "Remove ART_SMALL_MODE ifdefs."
Mingyao Yang [Wed, 25 Feb 2015 19:28:05 +0000 (11:28 -0800)]
Opt compiler: enhance gvn for commutative ops.
Change-Id: I415b50d58b30cab4ec38077be22373eb9598ec40
Brian Carlstrom [Tue, 3 Mar 2015 21:14:56 +0000 (21:14 +0000)]
am
6bd8c542: am
0e5e728a: Merge "Fix build lint issue."
* commit '
6bd8c5427797579f3b990d38569e0d18c6928526':
Fix build lint issue.
Brian Carlstrom [Tue, 3 Mar 2015 21:10:37 +0000 (21:10 +0000)]
am
0e5e728a: Merge "Fix build lint issue."
* commit '
0e5e728a4a4f042f157e1897cc8bbc2b0bb110b1':
Fix build lint issue.
Brian Carlstrom [Tue, 3 Mar 2015 21:05:14 +0000 (21:05 +0000)]
Merge "Fix build lint issue."
Brian Carlstrom [Tue, 3 Mar 2015 20:53:49 +0000 (12:53 -0800)]
Fix build lint issue.
Change-Id: I53d5bdefdf79b376f99dfaa17591a0d2103921d5
Mingyao Yang [Tue, 3 Mar 2015 20:06:21 +0000 (20:06 +0000)]
am
d8e266df: am
ea84bf72: Merge "bce: add support to narrow two MonotonicValueRange\'s at the same time."
* commit '
d8e266dfa884eb67cde8b556a3588f1f7f89ba82':
bce: add support to narrow two MonotonicValueRange's at the same time.
Mingyao Yang [Tue, 3 Mar 2015 20:00:08 +0000 (20:00 +0000)]
am
ea84bf72: Merge "bce: add support to narrow two MonotonicValueRange\'s at the same time."
* commit '
ea84bf7246f47693594eb5acc9a25c438289bd9f':
bce: add support to narrow two MonotonicValueRange's at the same time.
Mingyao Yang [Tue, 3 Mar 2015 19:53:14 +0000 (19:53 +0000)]
Merge "bce: add support to narrow two MonotonicValueRange's at the same time."
Nicolas Geoffray [Thu, 26 Feb 2015 10:56:09 +0000 (10:56 +0000)]
Change how we report exceptions to the debugger.
This is only a refactoring/cleanup. Bug fixes with respect
to catch location, and more cleanups will follow.
Change-Id: I30d3c6260b0c8f8115a811621397225b88f2063a
Nicolas Geoffray [Tue, 3 Mar 2015 17:40:02 +0000 (17:40 +0000)]
am
65b768e7: am
dc47e986: Merge "Fix generic JNI stubs to not discard the Java native frame."
* commit '
65b768e77d2b6f333cbcced4593b0bb463785f71':
Fix generic JNI stubs to not discard the Java native frame.
Nicolas Geoffray [Tue, 3 Mar 2015 17:34:00 +0000 (17:34 +0000)]
am
dc47e986: Merge "Fix generic JNI stubs to not discard the Java native frame."
* commit '
dc47e986941b1a3754447fabea272485f3f0f382':
Fix generic JNI stubs to not discard the Java native frame.
Nicolas Geoffray [Tue, 3 Mar 2015 17:28:05 +0000 (17:28 +0000)]
Merge "Fix generic JNI stubs to not discard the Java native frame."
Nicolas Geoffray [Tue, 3 Mar 2015 14:28:35 +0000 (14:28 +0000)]
Fix generic JNI stubs to not discard the Java native frame.
Change-Id: Ic856b442fdde5ce91673fc5856eb0dfc84c75d28
Sebastien Hertz [Tue, 3 Mar 2015 13:49:47 +0000 (13:49 +0000)]
am
332877c7: am
775f1d40: Merge "Follow-up 128393"
* commit '
332877c7728a9c96b90bf7a931ecec4097a2f0c0':
Follow-up 128393
Sebastien Hertz [Tue, 3 Mar 2015 13:43:56 +0000 (13:43 +0000)]
am
775f1d40: Merge "Follow-up 128393"
* commit '
775f1d4096efce112a3bd1e5897c84f898c5f7ce':
Follow-up 128393
Sebastien Hertz [Tue, 3 Mar 2015 13:39:30 +0000 (13:39 +0000)]
Merge "Follow-up 128393"
Sebastien Hertz [Tue, 3 Mar 2015 11:16:13 +0000 (12:16 +0100)]
Follow-up 128393
Avoids false warning when initializing the exception's class by
marking the transaction aborted after throwing the InternalError
exception.
Also uses VLOG(compiler) to print the warning since it's only useful
when investigating ahead-of-time class initialization.
Bug:
19202032
Change-Id: I3c53639cbb888086ad345d668d1e5b73c5aaf861
Nicolas Geoffray [Tue, 3 Mar 2015 13:03:29 +0000 (13:03 +0000)]
am
6b8e3ae8: am
cd934156: Merge "Tests use libarttest.so, so does not work on ndebug."
* commit '
6b8e3ae838798f3894acbf37e8d9270977213a60':
Tests use libarttest.so, so does not work on ndebug.
Nicolas Geoffray [Tue, 3 Mar 2015 13:03:28 +0000 (13:03 +0000)]
am
be4eb480: am
57f49931: Merge "Revert GetThisObject change."
* commit '
be4eb480587ee18f1bcfc3105c4f42eb2ebe200a':
Revert GetThisObject change.