OSDN Git Service
Andreas Gampe [Thu, 11 Sep 2014 05:56:08 +0000 (05:56 +0000)]
am
b19e9bb5: am
df1532b9: ART: Correctly make methods preverified
* commit '
b19e9bb527bd156d1dccbc5c6e388917be28b16c':
ART: Correctly make methods preverified
Andreas Gampe [Thu, 11 Sep 2014 05:46:06 +0000 (05:46 +0000)]
am
df1532b9: ART: Correctly make methods preverified
* commit '
df1532b9ba0cda2d00b78fbdef461f8a6cf8a737':
ART: Correctly make methods preverified
Andreas Gampe [Thu, 11 Sep 2014 02:48:05 +0000 (19:48 -0700)]
ART: Correctly make methods preverified
Bug:
16828525
Change-Id: I66756348b2aa50e41dacca59769b6810a91c73b0
Andreas Gampe [Thu, 11 Sep 2014 00:06:00 +0000 (00:06 +0000)]
am
b9620f30: Merge "ART: Fix things for valgrind"
* commit '
b9620f305c79914f5159cf9279a7ccd173af1186':
ART: Fix things for valgrind
Andreas Gampe [Wed, 10 Sep 2014 23:43:32 +0000 (23:43 +0000)]
Merge "ART: Fix things for valgrind"
Stephen Hines [Wed, 10 Sep 2014 23:32:48 +0000 (23:32 +0000)]
am
575a5649: Merge "Revert "Disable Clang internal assembler.""
* commit '
575a5649715ee50e0de8a107e8a5379d4c465382':
Revert "Disable Clang internal assembler."
Ian Rogers [Wed, 10 Sep 2014 23:18:16 +0000 (23:18 +0000)]
am
6c8f8f63: Merge "Re-add read barrier to roots in the verifier."
* commit '
6c8f8f632da00bbc0cffc89a12b0716f8500f039':
Re-add read barrier to roots in the verifier.
Ian Rogers [Wed, 10 Sep 2014 23:18:15 +0000 (23:18 +0000)]
am
a87a7950: Merge "Revert "Add read barriers for the roots in the verifier.""
* commit '
a87a7950ee79f42351992d211517f9f22e9393ee':
Revert "Add read barriers for the roots in the verifier."
Bill Buzbee [Wed, 10 Sep 2014 23:18:12 +0000 (23:18 +0000)]
am
be428b4d: Merge "ART: Fix variable formatting and CodeLayout\'s multiple visits"
* commit '
be428b4da47339409aac0cfa153888c384dfaef7':
ART: Fix variable formatting and CodeLayout's multiple visits
Stephen Hines [Wed, 10 Sep 2014 23:15:15 +0000 (23:15 +0000)]
Merge "Revert "Disable Clang internal assembler.""
Stephen Hines [Wed, 10 Sep 2014 23:14:26 +0000 (23:14 +0000)]
Revert "Disable Clang internal assembler."
This reverts commit
d619cab991f116d7a90c9abeff8770e7d7a3a45a.
Change-Id: I69da36d734678dd5e9a99c1c53093fcaf81a66c3
Andreas Gampe [Wed, 10 Sep 2014 02:53:48 +0000 (19:53 -0700)]
ART: Fix things for valgrind
Wire up valgrind gtests. Add valgrind-test-art-host, currently
only depending on valgrind-test-art-host-gtest32.
Fix an Alloc setting to allow running valgrind.
Refactor the fault handler to manage (and correctly release) the
handlers.
Fix minor failure-case leaks exposed by tests.
Failing tests:
The optimizing compiler is leaking non-arena-ed structures
(e.g., assembler buffers), as code generators are not destroyed.
The solution has been moved to a follow-up CL.
Note: All 64b tests are failing as we cannot allocate a heap.
Change-Id: I7f854cfd098d9f68107ce492363e7dba9a82b9fa
Ian Rogers [Wed, 10 Sep 2014 22:41:54 +0000 (22:41 +0000)]
Merge "Re-add read barrier to roots in the verifier."
Ian Rogers [Wed, 10 Sep 2014 22:41:42 +0000 (22:41 +0000)]
Merge "Revert "Add read barriers for the roots in the verifier.""
Mingyao Yang [Wed, 10 Sep 2014 22:33:34 +0000 (22:33 +0000)]
am
958d78e5: Merge "Remove reference_static_offsets used for iterating through class static fields."
* commit '
958d78e51725730ccc38c33ff9424887adc7343b':
Remove reference_static_offsets used for iterating through class static fields.
Ian Rogers [Wed, 10 Sep 2014 22:33:05 +0000 (15:33 -0700)]
Re-add read barrier to roots in the verifier.
Fixes read-barriers but keeps verifier API invariants. Based on:
https://android-review.googlesource.com/#/c/102962
Bug:
17398101
Change-Id: Iad986784a5d735ccb3214362ccfc7ef69bc02c57
Bill Buzbee [Wed, 10 Sep 2014 22:30:52 +0000 (22:30 +0000)]
Merge "ART: Fix variable formatting and CodeLayout's multiple visits"
Bill Buzbee [Wed, 10 Sep 2014 22:23:31 +0000 (22:23 +0000)]
am
73f7d79c: Merge "Fix kThumb2Vldrd definition to set correct flag."
* commit '
73f7d79c1755f85b2be590aa9d9b18e054f76a1a':
Fix kThumb2Vldrd definition to set correct flag.
Mingyao Yang [Wed, 10 Sep 2014 22:22:13 +0000 (22:22 +0000)]
Merge "Remove reference_static_offsets used for iterating through class static fields."
Ian Rogers [Wed, 10 Sep 2014 21:43:52 +0000 (21:43 +0000)]
Revert "Add read barriers for the roots in the verifier."
This reverts commit
7da9586b559290e1c16207c6513ffe485de61655.
Bug:
17398101
Change-Id: I1d6110fdf0d3a3c9241c8e7e7f4b85a298f9dd8e
Bill Buzbee [Wed, 10 Sep 2014 22:10:13 +0000 (22:10 +0000)]
Merge "Fix kThumb2Vldrd definition to set correct flag."
Mingyao Yang [Wed, 10 Sep 2014 19:03:22 +0000 (12:03 -0700)]
Remove reference_static_offsets used for iterating through class static fields.
Since static fields are contiguous in class object and there is no need to
traverse super classes, it's not meaningful to use reference_static_offsets.
Also especially with embedded vtable/imt, static field offset can't be encoded
with an unsigned integer anyway.
A corresponding change is made to Class.java to remove the member field.
Bug:
16236588
Change-Id: I1fde3cd9efce884945876f0658c63d992164fd94
Jean Christophe Beyler [Thu, 4 Sep 2014 15:15:11 +0000 (08:15 -0700)]
ART: Fix variable formatting and CodeLayout's multiple visits
The CodeLayout pass visits multiple times the same BasicBlock. This patch
fixes that issue to reduce its overhead.
The patch also fixes cUnit to c_unit in the bb_optimization files.
Change-Id: I76afa73dc79b9ee9993223c066a974ca81adf203
Signed-off-by: Jean Christophe Beyler <jean.christophe.beyler@intel.com>
Mathieu Chartier [Wed, 10 Sep 2014 18:49:34 +0000 (18:49 +0000)]
am
2adccb61: Merge "Ensure class is linked before resolution"
* commit '
2adccb618c0de207fde96e5e90ce99c79eb8eb85':
Ensure class is linked before resolution
Mathieu Chartier [Wed, 10 Sep 2014 18:29:32 +0000 (18:29 +0000)]
Merge "Ensure class is linked before resolution"
Christopher Ferris [Wed, 10 Sep 2014 18:26:34 +0000 (18:26 +0000)]
am
833ec8ff: Merge "Add proper cfi directives."
* commit '
833ec8ff84a25078f5755489d7a36db3015c069a':
Add proper cfi directives.
Brian Carlstrom [Wed, 10 Sep 2014 18:21:53 +0000 (18:21 +0000)]
am
435351df: am
827645f2: Merge "Ensure class is linked before resolution" into lmp-dev
* commit '
435351df2e13088508146d1009b3e1ebb2c8c409':
Ensure class is linked before resolution
Brian Carlstrom [Wed, 10 Sep 2014 18:11:22 +0000 (18:11 +0000)]
am
827645f2: Merge "Ensure class is linked before resolution" into lmp-dev
* commit '
827645f27237f3e77c87cb5e49e90389a22337a6':
Ensure class is linked before resolution
Sebastien Hertz [Wed, 10 Sep 2014 17:44:39 +0000 (19:44 +0200)]
Ensure class is linked before resolution
Adds a missing call to ClassLinker::EnsureResolved to ensure we did link the
class and retired the temp class (placeholder) before doing the resolution.
Bug:
17435441
(cherry picked from commit
72da76359aa5599f78ddca79b294e9bf30e004ed)
Change-Id: I3b368567c7b24ec2ff7ee1dec7bcd3501a6061f8
Christopher Ferris [Wed, 10 Sep 2014 18:10:20 +0000 (18:10 +0000)]
am
b46cfb53: am
44332cc2: Merge "Add proper cfi directives." into lmp-dev
* commit '
b46cfb5312821639994db3f739f372c15a3a7fe9':
Add proper cfi directives.
Christopher Ferris [Wed, 10 Sep 2014 18:07:01 +0000 (18:07 +0000)]
Merge "Add proper cfi directives."
Christopher Ferris [Tue, 9 Sep 2014 20:55:13 +0000 (13:55 -0700)]
Add proper cfi directives.
This function has a mix of arm and cfi directives. Since our unwinders
can work with both, remove the arm directives and fix the cfi directives.
Bug:
17392751
(cherry picked from commit
7fae7c40e62ffe669fc224c57ed530b4d9c8da2c)
Change-Id: I82a84db47ffa283f9e392d24de9a8c9958a59631
Brian Carlstrom [Wed, 10 Sep 2014 18:02:55 +0000 (18:02 +0000)]
Merge "Ensure class is linked before resolution" into lmp-dev
Christopher Ferris [Wed, 10 Sep 2014 17:59:24 +0000 (17:59 +0000)]
am
44332cc2: Merge "Add proper cfi directives." into lmp-dev
* commit '
44332cc21494726c9ba90ac8f23af8acc2dc4536':
Add proper cfi directives.
Sebastien Hertz [Wed, 10 Sep 2014 17:44:39 +0000 (19:44 +0200)]
Ensure class is linked before resolution
Adds a missing call to ClassLinker::EnsureResolved to ensure we did link the
class and retired the temp class (placeholder) before doing the resolution.
Bug:
17435441
Change-Id: Ib1a7181d6e5e814ca9299d0504e739a2b69475ef
Christopher Ferris [Wed, 10 Sep 2014 17:49:51 +0000 (17:49 +0000)]
Merge "Add proper cfi directives." into lmp-dev
Nicolas Geoffray [Wed, 10 Sep 2014 17:32:43 +0000 (17:32 +0000)]
am
6a64c6cd: Merge "Fix misuse of ArenaAllocator."
* commit '
6a64c6cd9922035f26d1f92b52605b9ee37ada6a':
Fix misuse of ArenaAllocator.
Hiroshi Yamauchi [Wed, 10 Sep 2014 17:21:10 +0000 (17:21 +0000)]
am
44ff4700: Merge "Address read barrier issue with cl/106467"
* commit '
44ff47008394f4451ab37dec2852e52b794e6e4a':
Address read barrier issue with cl/106467
Chih-Hung Hsieh [Wed, 10 Sep 2014 17:21:09 +0000 (17:21 +0000)]
am
55454c52: Merge "Disable Clang internal assembler."
* commit '
55454c52abdb496bb6fc070f0fd1c618f7a926aa':
Disable Clang internal assembler.
Vladimir Marko [Wed, 10 Sep 2014 17:21:08 +0000 (17:21 +0000)]
am
cf71e0b6: Merge "Improve dex location canonicalization-related performance."
* commit '
cf71e0b62cf8e21082204de120416c776706b6c6':
Improve dex location canonicalization-related performance.
Nicolas Geoffray [Wed, 10 Sep 2014 17:18:37 +0000 (17:18 +0000)]
Merge "Fix misuse of ArenaAllocator."
Hiroshi Yamauchi [Wed, 10 Sep 2014 17:02:31 +0000 (17:02 +0000)]
Merge "Address read barrier issue with cl/106467"
Chih-Hung Hsieh [Wed, 10 Sep 2014 16:33:08 +0000 (16:33 +0000)]
Merge "Disable Clang internal assembler."
Vladimir Marko [Wed, 10 Sep 2014 16:11:18 +0000 (16:11 +0000)]
Merge "Improve dex location canonicalization-related performance."
Vladimir Marko [Fri, 5 Sep 2014 13:01:17 +0000 (14:01 +0100)]
Improve dex location canonicalization-related performance.
Eagerly add canonical dex file locations to the OatFile's
primary lookup map in Setup(). This moves the boot.oat work
from every app startup to the zygote initialization. Since
we always ended up initializing the canonical location map
anyway due to the way that we're loading dex files, the lazy
initialization didn't save anything.
Clean up dex file name canonicalization to make sure we
free() the memory returned by realpath() rather than using
std::unique_ptr<> with the default deleter.
Avoid some unnecessary duplicate OatDexFile lookups.
Bug:
16828525
Bug:
17346103
Change-Id: Id8fbc8992f62996138eb2006a0046c6529747c09
Ian Rogers [Wed, 10 Sep 2014 14:51:06 +0000 (14:51 +0000)]
am
cdb7ce2e: am
5875a488: Merge "VisitClassesWithoutClassesLock isn\'t safe if classes move." into lmp-dev
* commit '
cdb7ce2e5ecd225e34fbfbf81382d84c91f3327f':
VisitClassesWithoutClassesLock isn't safe if classes move.
Ian Rogers [Wed, 10 Sep 2014 14:38:05 +0000 (14:38 +0000)]
am
5875a488: Merge "VisitClassesWithoutClassesLock isn\'t safe if classes move." into lmp-dev
* commit '
5875a4884efcfc7bf80b0bbb50148611286dbe30':
VisitClassesWithoutClassesLock isn't safe if classes move.
Ian Rogers [Wed, 10 Sep 2014 14:31:36 +0000 (14:31 +0000)]
Merge "VisitClassesWithoutClassesLock isn't safe if classes move." into lmp-dev
Nicolas Geoffray [Wed, 10 Sep 2014 09:34:01 +0000 (10:34 +0100)]
Fix misuse of ArenaAllocator.
Allocator must survive its allocations (the pool is not enough).
Spotted by valgrind.
Change-Id: I7104a93e625995f1205710e6d07904b3d315e412
Mathieu Chartier [Wed, 10 Sep 2014 07:20:29 +0000 (07:20 +0000)]
am
8c8a5bc5: am
0bff4f37: Increase dex2oat timeouts for debug builds
* commit '
8c8a5bc50282aea354cb556ef88130c82e7c2d7d':
Increase dex2oat timeouts for debug builds
Mathieu Chartier [Wed, 10 Sep 2014 07:07:05 +0000 (07:07 +0000)]
am
0bff4f37: Increase dex2oat timeouts for debug builds
* commit '
0bff4f375d8013a4a59cf70b3427fb461a17e6de':
Increase dex2oat timeouts for debug builds
Mathieu Chartier [Wed, 10 Sep 2014 07:06:51 +0000 (07:06 +0000)]
am
6724a953: Merge "Increase dex2oat timeouts for debug builds"
* commit '
6724a9531c92368491dd17937d0087f73a7c0642':
Increase dex2oat timeouts for debug builds
Christopher Ferris [Tue, 9 Sep 2014 20:55:13 +0000 (13:55 -0700)]
Add proper cfi directives.
This function has a mix of arm and cfi directives. Since our unwinders
can work with both, remove the arm directives and fix the cfi directives.
Bug:
17392751
Change-Id: Ibd4859a4f0b8f2da751a0928a2f5f4afa3df7df8
Mathieu Chartier [Wed, 10 Sep 2014 02:15:05 +0000 (02:15 +0000)]
Merge "Increase dex2oat timeouts for debug builds"
Mathieu Chartier [Wed, 10 Sep 2014 00:26:58 +0000 (17:26 -0700)]
Increase dex2oat timeouts for debug builds
Should fix the 056-const-string-jumbo test.
(cherry picked from commit
0bff4f375d8013a4a59cf70b3427fb461a17e6de)
Change-Id: I38d03fa7f981f0c067c52782e57938bbcbabef17
Mathieu Chartier [Wed, 10 Sep 2014 00:26:58 +0000 (17:26 -0700)]
Increase dex2oat timeouts for debug builds
Should fix the 056-const-string-jumbo test.
Change-Id: I04d98dfd59003b964c1feee6eee31079f9f4a476
Junmo Park [Wed, 10 Sep 2014 01:50:24 +0000 (10:50 +0900)]
Fix kThumb2Vldrd definition to set correct flag.
kThumb2Vldrd shoud be set IS_LOAD_OFF4 not IS_LOAD_OFF.
Change-Id: I6b8ec3c54513f687a846ba7f3a817f6e439abcc9
Signed-off-by: Junmo Park <junmoz.park@samsung.com>
Mathieu Chartier [Wed, 10 Sep 2014 00:59:45 +0000 (00:59 +0000)]
am
03e1f83c: am
4e67841e: Change Reference.get() intrinsic to Reference.getReferent().
* commit '
03e1f83caa8700c4c8055ce9f10c37546b78426c':
Change Reference.get() intrinsic to Reference.getReferent().
Mathieu Chartier [Wed, 10 Sep 2014 00:44:55 +0000 (00:44 +0000)]
am
4e67841e: Change Reference.get() intrinsic to Reference.getReferent().
* commit '
4e67841e99e4a206133e7010653ccd132682296a':
Change Reference.get() intrinsic to Reference.getReferent().
Mathieu Chartier [Tue, 9 Sep 2014 20:51:09 +0000 (13:51 -0700)]
Change Reference.get() intrinsic to Reference.getReferent().
The reference intrinsic was incorrectly inlining
PhantomReference.get(). We now get around this by adding a
layer of indirection. Reference.get() now calls getReferent()
which is intrinsified and inlined.
Requires:
https://android-review.googlesource.com/#/c/107100/
Bug:
17429865
(cherry picked from commit
cd48f2d86197d4fe87cc88077bc4af5ba66e5295)
Change-Id: Ie91e70abf43cedf3c707c7bb8a5059e19d2a2577
Mathieu Chartier [Tue, 9 Sep 2014 22:20:33 +0000 (22:20 +0000)]
am
e1a851c1: Merge "Change Reference.get() intrinsic to Reference.getReferent()."
* commit '
e1a851c161db964e42be642c6db470e289100f40':
Change Reference.get() intrinsic to Reference.getReferent().
Mathieu Chartier [Tue, 9 Sep 2014 21:59:47 +0000 (21:59 +0000)]
Merge "Change Reference.get() intrinsic to Reference.getReferent()."
Jeff Hao [Tue, 9 Sep 2014 21:55:50 +0000 (21:55 +0000)]
am
ef24a280: am
f8aed38f: Merge "Change 099-vmdebug test to use File.createTempFile." into lmp-dev
* commit '
ef24a28040cd6c39bc46f68db0a4dd880d81a693':
Change 099-vmdebug test to use File.createTempFile.
Brian Carlstrom [Tue, 9 Sep 2014 21:26:59 +0000 (21:26 +0000)]
am
05382d22: Merge "Remove art-* targets in favor of build-art-* targets."
* commit '
05382d22a2ebbc95142ec2fc46e2d56b23e699ee':
Remove art-* targets in favor of build-art-* targets.
Hiroshi Yamauchi [Mon, 8 Sep 2014 20:22:56 +0000 (13:22 -0700)]
Address read barrier issue with cl/106467
And tidy/add a check.
Bug:
12687968
Change-Id: If63dc0d9d0a0ce5f2eeb81734ff8f4307865f67d
Brian Carlstrom [Tue, 9 Sep 2014 21:08:19 +0000 (21:08 +0000)]
Merge "Remove art-* targets in favor of build-art-* targets."
Jeff Hao [Tue, 9 Sep 2014 21:00:26 +0000 (21:00 +0000)]
am
dab9ed52: Merge "Change 099-vmdebug test to use File.createTempFile."
* commit '
dab9ed52f2df7189b81ccf3237b030ff638a492a':
Change 099-vmdebug test to use File.createTempFile.
Jeff Hao [Tue, 9 Sep 2014 21:00:25 +0000 (21:00 +0000)]
am
7c2c52b2: Merge "Disable tracing if enabled by default for new tracing test."
* commit '
7c2c52b2276c97b6a0db973a3a3e784e3d4bed24':
Disable tracing if enabled by default for new tracing test.
Chih-Hung Hsieh [Tue, 9 Sep 2014 20:59:33 +0000 (13:59 -0700)]
Disable Clang internal assembler.
To avoid compilation errors with macros and directives in asm_support_x86.S.
BUG:
17443165
Change-Id: Ia89387bf2213cf1bfd4dd7248a19b47391e8fb67
Jeff Hao [Tue, 9 Sep 2014 20:57:54 +0000 (13:57 -0700)]
resolved conflicts for merge of
52b75281 to lmp-dev-plus-aosp
Change-Id: I7226868522e2e0d8a772f55140f5db8fc3e7c542
Mathieu Chartier [Tue, 9 Sep 2014 20:51:09 +0000 (13:51 -0700)]
Change Reference.get() intrinsic to Reference.getReferent().
The reference intrinsic was incorrectly inlining
PhantomReference.get(). We now get around this by adding a
layer of indirection. Reference.get() now calls getReferent()
which is intrinsified and inlined.
Requires:
https://android-review.googlesource.com/#/c/107100/
Bug:
17429865
Change-Id: Ie91e70abf43cedf3c707c7bb8a5059e19d2a2577
Brian Carlstrom [Mon, 8 Sep 2014 18:13:47 +0000 (11:13 -0700)]
Remove art-* targets in favor of build-art-* targets.
- Build both archs version when available.
- Add --64 and --32 command line flags to the art script.
Change-Id: I037ec94670767f1761adb26f44aafc5592ea3a2b
Jeff Hao [Tue, 9 Sep 2014 20:22:30 +0000 (20:22 +0000)]
Merge "Change 099-vmdebug test to use File.createTempFile."
Jeff Hao [Tue, 9 Sep 2014 20:21:23 +0000 (20:21 +0000)]
am
f8aed38f: Merge "Change 099-vmdebug test to use File.createTempFile." into lmp-dev
* commit '
f8aed38fd66b14ca31638362050cbfaa64f6135e':
Change 099-vmdebug test to use File.createTempFile.
Jeff Hao [Tue, 9 Sep 2014 20:07:59 +0000 (13:07 -0700)]
Change 099-vmdebug test to use File.createTempFile.
Avoids issues with concurrency.
Bug:
17439227
(cherry picked from commit
1ae33d6839a0e14a7e37bf9b88896479e30282d2)
Change-Id: I672e83537a12110a77c589697b721b9b26f3c53b
Jeff Hao [Tue, 9 Sep 2014 20:19:15 +0000 (20:19 +0000)]
Merge "Disable tracing if enabled by default for new tracing test."
Jeff Hao [Mon, 8 Sep 2014 22:32:39 +0000 (15:32 -0700)]
Disable tracing if enabled by default for new tracing test.
Bug:
17412385
(cherry picked from commit
b087849f5bbbf25bf5b03cf6172d2a50c08119e9)
Change-Id: I3641d6649cddda82c36e52658bf6d743c6446935
Jeff Hao [Tue, 9 Sep 2014 20:16:43 +0000 (20:16 +0000)]
Merge "Change when sampling thread is reset during shutdown to prevent races."
Jeff Hao [Tue, 9 Sep 2014 20:13:24 +0000 (20:13 +0000)]
Merge "Change 099-vmdebug test to use File.createTempFile." into lmp-dev
Jeff Hao [Tue, 9 Sep 2014 20:07:59 +0000 (13:07 -0700)]
Change 099-vmdebug test to use File.createTempFile.
Avoids issues with concurrency.
Bug:
17439227
Change-Id: I4a5956d9f26fad416a244216c2c77d5e6f072c62
Jeff Hao [Mon, 8 Sep 2014 16:38:18 +0000 (09:38 -0700)]
Change when sampling thread is reset during shutdown to prevent races.
Also adds some extra argument checking and testing for tracing.
Bug:
17412385
(cherry picked from commit
f8bdd4e783842577e49f418a0b5962ba49dfdd93)
Change-Id: Ifc4f1a296155d73255b29d264b5475024e6419da
Mathieu Chartier [Tue, 9 Sep 2014 17:57:59 +0000 (17:57 +0000)]
am
7bcbf264: am
3298611e: Merge "Temporarily disable LOS on 64 bit" into lmp-dev
* commit '
7bcbf264ebf8a38efb304069ece4840f58ca0b34':
Temporarily disable LOS on 64 bit
Mathieu Chartier [Tue, 9 Sep 2014 17:46:55 +0000 (17:46 +0000)]
am
3298611e: Merge "Temporarily disable LOS on 64 bit" into lmp-dev
* commit '
3298611e205a299612f2e403bfaeb955ec0a2bdd':
Temporarily disable LOS on 64 bit
Mathieu Chartier [Tue, 9 Sep 2014 17:39:37 +0000 (17:39 +0000)]
Merge "Temporarily disable LOS on 64 bit" into lmp-dev
Bill Buzbee [Tue, 9 Sep 2014 14:01:48 +0000 (14:01 +0000)]
am
5bc47ebe: Merge "x86: evaluation destination should be after load of source in RA"
* commit '
5bc47ebe278af65e8e2a2d6b603ac94a020285f7':
x86: evaluation destination should be after load of source in RA
Bill Buzbee [Tue, 9 Sep 2014 13:50:53 +0000 (13:50 +0000)]
Merge "x86: evaluation destination should be after load of source in RA"
Vladimir Marko [Tue, 9 Sep 2014 09:30:32 +0000 (09:30 +0000)]
am
6be5a284: Merge "Small error reporting fix in class linker."
* commit '
6be5a284194f34b5316982c6afa0d3a15bcbcfef':
Small error reporting fix in class linker.
Andreas Gampe [Tue, 9 Sep 2014 09:30:32 +0000 (09:30 +0000)]
am
42bc2f1f: Merge "ART: Better error reporting on broken oat file"
* commit '
42bc2f1fac342a01d38bc452da1e70f8099f7c2f':
ART: Better error reporting on broken oat file
Sebastien Hertz [Tue, 9 Sep 2014 09:30:31 +0000 (09:30 +0000)]
am
cf254a2f: Merge "Fix monitor visit for class initializer"
* commit '
cf254a2fcf69bdd032e4f2726fc1bd751544b0b6':
Fix monitor visit for class initializer
Andreas Gampe [Tue, 9 Sep 2014 09:29:21 +0000 (09:29 +0000)]
am
51c4684c: am
1b2140c9: ART: Better error reporting on broken oat file
* commit '
51c4684c39346d9b0d5ad3f13adf7f9f715b22f2':
ART: Better error reporting on broken oat file
Andreas Gampe [Tue, 9 Sep 2014 09:18:24 +0000 (09:18 +0000)]
am
1b2140c9: ART: Better error reporting on broken oat file
* commit '
1b2140c9bf46388e4f59ecf3d62d99cd78fed12c':
ART: Better error reporting on broken oat file
Vladimir Marko [Tue, 9 Sep 2014 09:08:41 +0000 (09:08 +0000)]
Merge "Small error reporting fix in class linker."
Andreas Gampe [Tue, 9 Sep 2014 08:22:59 +0000 (08:22 +0000)]
Merge "ART: Better error reporting on broken oat file"
Andreas Gampe [Tue, 9 Sep 2014 06:39:45 +0000 (23:39 -0700)]
ART: Better error reporting on broken oat file
Do not blow up when in GetHashBucket if GetHashBucketNum is zero.
Instead back-step to ElfFileOpen, which prints which symbol was
missing from which file.
Bug:
17422404
(cherry picked from commit
1b2140c9bf46388e4f59ecf3d62d99cd78fed12c)
Change-Id: I3b890dd1c31c08b1ccc0f7f668afcceee95f8d00
Sebastien Hertz [Tue, 9 Sep 2014 07:59:13 +0000 (07:59 +0000)]
Merge "Fix monitor visit for class initializer"
Sebastien Hertz [Mon, 8 Sep 2014 08:15:19 +0000 (10:15 +0200)]
Fix monitor visit for class initializer
We do not hold class object's lock when invoking class initializer. Therefore
it is wrong to visit it when looking for monitors owned by a thread.
Bug:
17377924
(cherry picked from commit
6d06f1b34322d91226c9dcd61e53c2b6731f8bb6)
Change-Id: I9a18c421297608dc3109624111f9fea021a16d24
Andreas Gampe [Tue, 9 Sep 2014 06:39:45 +0000 (23:39 -0700)]
ART: Better error reporting on broken oat file
Do not blow up when in GetHashBucket if GetHashBucketNum is zero.
Instead back-step to ElfFileOpen, which prints which symbol was
missing from which file.
Bug:
17422404
Change-Id: I3b890dd1c31c08b1ccc0f7f668afcceee95f8d00
Brian Carlstrom [Tue, 9 Sep 2014 06:21:10 +0000 (06:21 +0000)]
am
cefd7aa0: am
6b8f8688: Merge "Workaround Darwin ContainedWithinExistingMap issue" into lmp-dev
* commit '
cefd7aa002165731ae189f641bcd6c4ffc1b5c6c':
Workaround Darwin ContainedWithinExistingMap issue
Sebastien Hertz [Tue, 9 Sep 2014 06:16:41 +0000 (06:16 +0000)]
am
652984e4: am
77c318d5: Merge "Fix monitor visit for class initializer" into lmp-dev
* commit '
652984e4b32d06344fae8cad52524d4de7ac5c79':
Fix monitor visit for class initializer
Andreas Gampe [Tue, 9 Sep 2014 06:16:40 +0000 (06:16 +0000)]
am
dc5e4e38: am
5300d478: Merge "ART: Fix unchecked register index validity" into lmp-dev
* commit '
dc5e4e388fed80ba81d522d9ade8944a2cbacbe3':
ART: Fix unchecked register index validity