OSDN Git Service
Andreas Gampe [Thu, 25 Jun 2015 20:34:58 +0000 (20:34 +0000)]
am
1d6053c4: am
d7dcb25c: am
6415013f: ART: Reset runtime_throw_failure flag
* commit '
1d6053c47cad155d2fbe81d84777e92360e4bd9b':
ART: Reset runtime_throw_failure flag
Andreas Gampe [Thu, 25 Jun 2015 20:21:27 +0000 (20:21 +0000)]
am
d7dcb25c: am
6415013f: ART: Reset runtime_throw_failure flag
* commit '
d7dcb25c86a0db2346521a9013eb24208f22f110':
ART: Reset runtime_throw_failure flag
Andreas Gampe [Thu, 25 Jun 2015 20:07:39 +0000 (20:07 +0000)]
am
6415013f: ART: Reset runtime_throw_failure flag
* commit '
6415013f0b9509fed8367871daaf66c6841223f1':
ART: Reset runtime_throw_failure flag
Andreas Gampe [Thu, 25 Jun 2015 20:07:06 +0000 (20:07 +0000)]
am
2cc48676: am
c4df3b9a: am
f3274f85: Merge "ART: Reset runtime_throw_failure flag"
* commit '
2cc486760784bb4667ccccf73e099808ef4a5198':
ART: Reset runtime_throw_failure flag
Andreas Gampe [Thu, 25 Jun 2015 19:54:51 +0000 (19:54 +0000)]
am
c4df3b9a: am
f3274f85: Merge "ART: Reset runtime_throw_failure flag"
* commit '
c4df3b9a46475c7e0e4d5815f11d374ec06cfb77':
ART: Reset runtime_throw_failure flag
Andreas Gampe [Thu, 25 Jun 2015 17:26:40 +0000 (10:26 -0700)]
ART: Reset runtime_throw_failure flag
The flag is instruction-specific. It transports the info from Fail
to the main loop. It must be cleared after each iteration.
Introduce a second flag to store whether we saw such a failure at
all.
Update test expectations.
Bug:
22080519
(cherry picked from commit
d12e782bcee03ecb6dec41aa9673ef53b638dcea)
Change-Id: I32be914819946233babaa4cb7343844d97b61ba5
Andreas Gampe [Thu, 25 Jun 2015 19:42:40 +0000 (19:42 +0000)]
am
f3274f85: Merge "ART: Reset runtime_throw_failure flag"
* commit '
f3274f8514636e7f52171a2e6b018017b34784e5':
ART: Reset runtime_throw_failure flag
Andreas Gampe [Thu, 25 Jun 2015 19:34:41 +0000 (19:34 +0000)]
Merge "ART: Reset runtime_throw_failure flag"
Andreas Gampe [Thu, 25 Jun 2015 17:26:40 +0000 (10:26 -0700)]
ART: Reset runtime_throw_failure flag
The flag is instruction-specific. It transports the info from Fail
to the main loop. It must be cleared after each iteration.
Introduce a second flag to store whether we saw such a failure at
all.
Update test expectations.
Bug:
22080519
Change-Id: I32be914819946233babaa4cb7343844d97b61ba5
Andreas Gampe [Thu, 25 Jun 2015 18:26:24 +0000 (18:26 +0000)]
am
8cd28518: am
e993dfd1: am
005deb0a: ART: Set methods to preverified in verify-none
* commit '
8cd28518ebcf9c724e2b0097f65976465171ce15':
ART: Set methods to preverified in verify-none
Andreas Gampe [Thu, 25 Jun 2015 18:17:03 +0000 (18:17 +0000)]
am
e993dfd1: am
005deb0a: ART: Set methods to preverified in verify-none
* commit '
e993dfd1e8b75d1085b15e59f384926769cd078f':
ART: Set methods to preverified in verify-none
Andreas Gampe [Thu, 25 Jun 2015 18:06:31 +0000 (18:06 +0000)]
am
005deb0a: ART: Set methods to preverified in verify-none
* commit '
005deb0a1683f9ee03a2cf2785dc6a7d7a8f16be':
ART: Set methods to preverified in verify-none
Andreas Gampe [Thu, 25 Jun 2015 17:55:49 +0000 (17:55 +0000)]
am
d07f4741: am
ea65e429: am
292edf0d: Merge "ART: Set methods to preverified in verify-none"
* commit '
d07f47413896b23a7a9b04bf9a2b00f27e9366fd':
ART: Set methods to preverified in verify-none
Andreas Gampe [Thu, 25 Jun 2015 17:48:48 +0000 (17:48 +0000)]
am
ea65e429: am
292edf0d: Merge "ART: Set methods to preverified in verify-none"
* commit '
ea65e429e0170d032e4dc1460dbe20f386b25fbf':
ART: Set methods to preverified in verify-none
Andreas Gampe [Thu, 25 Jun 2015 17:34:31 +0000 (17:34 +0000)]
am
292edf0d: Merge "ART: Set methods to preverified in verify-none"
* commit '
292edf0dacca4b0220522c9b4465638da18dadf4':
ART: Set methods to preverified in verify-none
Andreas Gampe [Wed, 24 Jun 2015 23:25:33 +0000 (16:25 -0700)]
ART: Set methods to preverified in verify-none
Actually mark all methods to be verified, so that the interpreter
doesn't do access checks. Speedup is about 2x on a Nexus 6 when booting
in verify-none mode.
Bug:
22040916
(cherry picked from commit
1c284f2abdfe1b0ed87d5216021e69146f10b116)
Change-Id: I2d6c8df2a68eae6e358da2639d980cb8bfcc1560
Richard Uhler [Thu, 25 Jun 2015 17:28:25 +0000 (17:28 +0000)]
am
d6438e53: am
d4c47ec9: am
1f77078d: Merge "Do not try to compile resource-only dex files."
* commit '
d6438e53a474f1a986ac51a3787af8a41c3f3f6a':
Do not try to compile resource-only dex files.
Andreas Gampe [Thu, 25 Jun 2015 17:24:31 +0000 (17:24 +0000)]
Merge "ART: Set methods to preverified in verify-none"
Andreas Gampe [Wed, 24 Jun 2015 23:25:33 +0000 (16:25 -0700)]
ART: Set methods to preverified in verify-none
Actually mark all methods to be verified, so that the interpreter
doesn't do access checks. Speedup is about 2x on a Nexus 6 when booting
in verify-none mode.
Bug:
22040916
Change-Id: I2d6c8df2a68eae6e358da2639d980cb8bfcc1560
Richard Uhler [Thu, 25 Jun 2015 17:15:54 +0000 (17:15 +0000)]
am
d4c47ec9: am
1f77078d: Merge "Do not try to compile resource-only dex files."
* commit '
d4c47ec9c41e481ea9d2d10672eccb99564f916e':
Do not try to compile resource-only dex files.
Richard Uhler [Thu, 25 Jun 2015 17:09:15 +0000 (17:09 +0000)]
am
1f77078d: Merge "Do not try to compile resource-only dex files."
* commit '
1f77078d818648415f9cf193c2b36ae56bd1cf38':
Do not try to compile resource-only dex files.
Richard Uhler [Thu, 25 Jun 2015 16:52:45 +0000 (16:52 +0000)]
Merge "Do not try to compile resource-only dex files."
Richard Uhler [Thu, 25 Jun 2015 16:10:05 +0000 (16:10 +0000)]
am
deae5fcc: am
c45f922c: am
9ae03f09: Merge "Do not try to compile resource-only dex files." into mnc-dev
* commit '
deae5fcc08e7c8df3f9e5a7970dd79b2d7aec66a':
Do not try to compile resource-only dex files.
Vladimir Marko [Thu, 25 Jun 2015 16:03:23 +0000 (16:03 +0000)]
am
0658783a: resolved conflicts for merge of
85e9888d to mnc-dev-plus-aosp
* commit '
0658783a606fb9a5d4505f257ec10a223e946092':
Hard-fail get-/put-object to a non-reference field.
Nicolas Geoffray [Thu, 25 Jun 2015 16:03:22 +0000 (16:03 +0000)]
am
1bef4afe: resolved conflicts for merge of
f717cfc6 to mnc-dev-plus-aosp
* commit '
1bef4afe828aeed8f47b27ac649c0cf2dc1c433e':
Only do some checks when compiling against the core image.
Richard Uhler [Thu, 25 Jun 2015 16:02:03 +0000 (16:02 +0000)]
am
c45f922c: am
9ae03f09: Merge "Do not try to compile resource-only dex files." into mnc-dev
* commit '
c45f922c8fc1be789798236c9aeef0db55143dbd':
Do not try to compile resource-only dex files.
Vladimir Marko [Thu, 25 Jun 2015 15:56:06 +0000 (16:56 +0100)]
resolved conflicts for merge of
85e9888d to mnc-dev-plus-aosp
Nicolas Geoffray [Thu, 25 Jun 2015 15:38:51 +0000 (15:38 +0000)]
am
3e07522f: am
de85ec30: am
7467fa30: Merge "Pass LD_USE_LOAD_BIAS to the art script."
* commit '
3e07522f3cf088798f26111a7395519c41ba71df':
Pass LD_USE_LOAD_BIAS to the art script.
Nicolas Geoffray [Thu, 25 Jun 2015 15:34:52 +0000 (16:34 +0100)]
resolved conflicts for merge of
f717cfc6 to mnc-dev-plus-aosp
Change-Id: Idbdcf3971240bace78e59cabb35d1815a794d903
Richard Uhler [Wed, 24 Jun 2015 15:44:19 +0000 (08:44 -0700)]
Do not try to compile resource-only dex files.
This changes behavior in the case where we are asked to load a dex
file that does not exist or has no classes.dex entry.
Previously we would run dex2oat, which would log an error message and
fail. Now we skip running dex2oat, we report the DexOptStatus as
kNoDexOptNeeded, and we do not try to fall back to the missing
original dex files.
Bug:
21722039
(cherry picked from commit
cb44b11a926696e34b3dc44288e762b4303cc128)
Change-Id: I84a85dc9ece54bcc0a5283f871e09bf68471c6e7
Richard Uhler [Thu, 25 Jun 2015 15:32:37 +0000 (15:32 +0000)]
am
9ae03f09: Merge "Do not try to compile resource-only dex files." into mnc-dev
* commit '
9ae03f09f33c64b6589e85faeac4142b80531b10':
Do not try to compile resource-only dex files.
Nicolas Geoffray [Thu, 25 Jun 2015 15:27:13 +0000 (15:27 +0000)]
am
de85ec30: am
7467fa30: Merge "Pass LD_USE_LOAD_BIAS to the art script."
* commit '
de85ec30d99997f0606dc4bc51dbf5918c4ee0aa':
Pass LD_USE_LOAD_BIAS to the art script.
Lazar Trsic [Thu, 25 Jun 2015 15:21:36 +0000 (15:21 +0000)]
am
9703fe2c: am
02d662d4: am
559b1cc2: [MIPS64] JNI Compiler: Sign-extend int function arguments
* commit '
9703fe2ca98f846e07831be8f615232ceb5eed6b':
[MIPS64] JNI Compiler: Sign-extend int function arguments
Richard Uhler [Thu, 25 Jun 2015 15:21:12 +0000 (15:21 +0000)]
Merge "Do not try to compile resource-only dex files." into mnc-dev
Nicolas Geoffray [Thu, 25 Jun 2015 15:13:53 +0000 (15:13 +0000)]
am
7467fa30: Merge "Pass LD_USE_LOAD_BIAS to the art script."
* commit '
7467fa30adceb7287e70075b7c8de0cdade60c4c':
Pass LD_USE_LOAD_BIAS to the art script.
Lazar Trsic [Thu, 25 Jun 2015 15:12:18 +0000 (15:12 +0000)]
am
02d662d4: am
559b1cc2: [MIPS64] JNI Compiler: Sign-extend int function arguments
* commit '
02d662d4f5269ec7a1820f0d5b03534aa37d50d1':
[MIPS64] JNI Compiler: Sign-extend int function arguments
Nicolas Geoffray [Thu, 25 Jun 2015 15:03:18 +0000 (15:03 +0000)]
Merge "Pass LD_USE_LOAD_BIAS to the art script."
Nicolas Geoffray [Thu, 25 Jun 2015 14:53:54 +0000 (15:53 +0100)]
Pass LD_USE_LOAD_BIAS to the art script.
The move to using dlopen requires it on the host.
Change-Id: I593818eac4e7c9ea15adbb86c5204e51f776cae4
Vladimir Marko [Thu, 25 Jun 2015 13:38:11 +0000 (13:38 +0000)]
am
92067896: Hard-fail get-/put-object to a non-reference field.
* commit '
92067896c6583d59171dbee9c720a316d63be177':
Hard-fail get-/put-object to a non-reference field.
Nicolas Geoffray [Thu, 25 Jun 2015 11:13:03 +0000 (11:13 +0000)]
am
785b1ea4: am
a1a495e4: am
6c52aaf4: Merge "Disable test for all runs."
* commit '
785b1ea4fbaf06c2bc3b73fe94001b87130c59c1':
Disable test for all runs.
Nicolas Geoffray [Thu, 25 Jun 2015 11:00:48 +0000 (11:00 +0000)]
am
a1a495e4: am
6c52aaf4: Merge "Disable test for all runs."
* commit '
a1a495e40d7531af949d495de585bea23d23a375':
Disable test for all runs.
Vladimir Marko [Thu, 25 Jun 2015 11:00:45 +0000 (11:00 +0000)]
am
12db0b91: am
89f74bcf: am
a397746e: Merge "Hard-fail get-/put-object to a non-reference field."
* commit '
12db0b91c0a0d0be7d0904891ca59839445c615c':
Hard-fail get-/put-object to a non-reference field.
Vladimir Marko [Tue, 23 Jun 2015 16:45:21 +0000 (17:45 +0100)]
Hard-fail get-/put-object to a non-reference field.
Bug:
21886894
(cherry picked from commit
414000ec4d728b5c85f8c6dee4f867fecde59b01)
Change-Id: Iafc32f0e45d26f3aaa2d521b98353e7cede16c6f
Vladimir Marko [Thu, 25 Jun 2015 10:49:33 +0000 (10:49 +0000)]
am
89f74bcf: am
a397746e: Merge "Hard-fail get-/put-object to a non-reference field."
* commit '
89f74bcf062a22852c4589df5b1e6a92d95ba0af':
Hard-fail get-/put-object to a non-reference field.
Nicolas Geoffray [Thu, 25 Jun 2015 10:48:43 +0000 (10:48 +0000)]
am
6c52aaf4: Merge "Disable test for all runs."
* commit '
6c52aaf45256c858476c0ec4bba8fbb116349275':
Disable test for all runs.
Nicolas Geoffray [Thu, 25 Jun 2015 10:41:39 +0000 (10:41 +0000)]
Merge "Disable test for all runs."
Nicolas Geoffray [Thu, 25 Jun 2015 10:40:42 +0000 (11:40 +0100)]
Disable test for all runs.
Change-Id: I2925e4172bee2751788e779b87e7f1165b8c81fc
Vladimir Marko [Thu, 25 Jun 2015 10:37:25 +0000 (10:37 +0000)]
am
a397746e: Merge "Hard-fail get-/put-object to a non-reference field."
* commit '
a397746ecce0b991f0ae9cb783154dd7da79a2e8':
Hard-fail get-/put-object to a non-reference field.
Vladimir Marko [Thu, 25 Jun 2015 10:28:15 +0000 (10:28 +0000)]
Merge "Hard-fail get-/put-object to a non-reference field."
Nicolas Geoffray [Thu, 25 Jun 2015 10:18:36 +0000 (10:18 +0000)]
am
20d60dd2: Only do some checks when compiling against the core image.
* commit '
20d60dd249e07a17351427770f0e0f6c68945b7a':
Only do some checks when compiling against the core image.
Nicolas Geoffray [Thu, 25 Jun 2015 10:18:31 +0000 (10:18 +0000)]
am
88d55621: am
196cb3c3: am
bcc9d2b5: Merge "Only do some checks when compiling against the core image."
* commit '
88d556216fcd4abfc2cc890bfd78aee011a20598':
Only do some checks when compiling against the core image.
Nicolas Geoffray [Thu, 25 Jun 2015 10:06:46 +0000 (10:06 +0000)]
am
196cb3c3: am
bcc9d2b5: Merge "Only do some checks when compiling against the core image."
* commit '
196cb3c34502734116fa0068224b208e2ff5af6e':
Only do some checks when compiling against the core image.
Nicolas Geoffray [Thu, 25 Jun 2015 09:55:08 +0000 (09:55 +0000)]
am
bcc9d2b5: Merge "Only do some checks when compiling against the core image."
* commit '
bcc9d2b5f07afb6d7e83d71179c3069825a69d7c':
Only do some checks when compiling against the core image.
Nicolas Geoffray [Thu, 25 Jun 2015 09:01:47 +0000 (10:01 +0100)]
Only do some checks when compiling against the core image.
This will avoid false negatives when running dex2oatd on apks.
bug:
21865473
(cherry picked from commit
335005e2b3a179f26b7a8ae64ca60a1406b669bd)
Change-Id: Iac6dbe30c9d576077a0384b88696f79937d89471
Vladimir Marko [Tue, 23 Jun 2015 16:45:21 +0000 (17:45 +0100)]
Hard-fail get-/put-object to a non-reference field.
Bug:
21886894
Change-Id: Iec870c223ce97fd90dcce05ae80c002e2b24cb5d
Nicolas Geoffray [Thu, 25 Jun 2015 09:41:39 +0000 (09:41 +0000)]
Merge "Only do some checks when compiling against the core image."
Nicolas Geoffray [Thu, 25 Jun 2015 09:01:47 +0000 (10:01 +0100)]
Only do some checks when compiling against the core image.
This will avoid false negatives when running dex2oatd on apks.
bug:
21865473
Change-Id: Id8eacaefae0bcf07a2ada8aedd7951854cdb5c4f
Andreas Gampe [Thu, 25 Jun 2015 05:51:10 +0000 (05:51 +0000)]
am
0d1c4899: am
5b2fdbd5: am
1dd3136d: Merge "[MIPS64] JNI Compiler: Sign-extend int function arguments"
* commit '
0d1c489922ed710b2add206d4a5ac9abaf79b56d':
[MIPS64] JNI Compiler: Sign-extend int function arguments
Andreas Gampe [Thu, 25 Jun 2015 05:51:09 +0000 (05:51 +0000)]
am
746eb92a: am
4de22934: am
a3c9b467: Merge "ART: Fix arm32 instrumentation exit stub"
* commit '
746eb92a9c001aceebc9f90226aab60a81c0b07b':
ART: Fix arm32 instrumentation exit stub
Andreas Gampe [Thu, 25 Jun 2015 05:43:05 +0000 (05:43 +0000)]
am
5b2fdbd5: am
1dd3136d: Merge "[MIPS64] JNI Compiler: Sign-extend int function arguments"
* commit '
5b2fdbd50b20481754a49cc0f179fd7501b2a68e':
[MIPS64] JNI Compiler: Sign-extend int function arguments
Andreas Gampe [Thu, 25 Jun 2015 05:43:01 +0000 (05:43 +0000)]
am
4de22934: am
a3c9b467: Merge "ART: Fix arm32 instrumentation exit stub"
* commit '
4de229342bb9221a1f3c1543f05ac37badb4c248':
ART: Fix arm32 instrumentation exit stub
Andreas Gampe [Thu, 25 Jun 2015 05:32:03 +0000 (05:32 +0000)]
am
d83303dd: am
f7cf2dcc: am
2eb85431: Merge "ART: Fix arm32 instrumentation exit stub" into mnc-dev
* commit '
d83303dd2c0b82756a7fc487a26ad97b8b2a0900':
ART: Fix arm32 instrumentation exit stub
Mathieu Chartier [Thu, 25 Jun 2015 05:32:01 +0000 (05:32 +0000)]
Lazar Trsic [Thu, 25 Jun 2015 05:27:14 +0000 (05:27 +0000)]
am
559b1cc2: [MIPS64] JNI Compiler: Sign-extend int function arguments
* commit '
559b1cc279deb9299414ddd46595bb8bca7fa090':
[MIPS64] JNI Compiler: Sign-extend int function arguments
Andreas Gampe [Thu, 25 Jun 2015 05:26:44 +0000 (05:26 +0000)]
am
1dd3136d: Merge "[MIPS64] JNI Compiler: Sign-extend int function arguments"
* commit '
1dd3136d9f6b1c7d551897a2d96c8314e40f7324':
[MIPS64] JNI Compiler: Sign-extend int function arguments
Andreas Gampe [Thu, 25 Jun 2015 05:20:35 +0000 (05:20 +0000)]
am
f7cf2dcc: am
2eb85431: Merge "ART: Fix arm32 instrumentation exit stub" into mnc-dev
* commit '
f7cf2dcc9be4f5a553d72a0ee77d12e9b8f87d57':
ART: Fix arm32 instrumentation exit stub
Mathieu Chartier [Thu, 25 Jun 2015 05:20:34 +0000 (05:20 +0000)]
Lazar Trsic [Wed, 24 Jun 2015 14:30:21 +0000 (16:30 +0200)]
[MIPS64] JNI Compiler: Sign-extend int function arguments
MIPS n64 ABI differs from arm64. Arguments smaller than the 8B stack
slot need to be sign-extended.
Use combination (lw,sd), instead of (lw,sw) for 4B values.
Change fixes software keyboard crash on mips64.
Bug:
21555893
(cherry picked from commit
f652d605753f1387e7797461b47116c5dcdf928d)
Change-Id: I7574d37f6039e9e8c9e0047254be71d28d4c829a
Andreas Gampe [Thu, 25 Jun 2015 05:16:20 +0000 (05:16 +0000)]
Merge "[MIPS64] JNI Compiler: Sign-extend int function arguments"
Andreas Gampe [Thu, 25 Jun 2015 05:08:53 +0000 (05:08 +0000)]
am
2eb85431: Merge "ART: Fix arm32 instrumentation exit stub" into mnc-dev
* commit '
2eb85431142f5f45f5f5b3dd67dad42bb1dc4a8a':
ART: Fix arm32 instrumentation exit stub
Mathieu Chartier [Thu, 25 Jun 2015 05:08:44 +0000 (05:08 +0000)]
Andreas Gampe [Thu, 25 Jun 2015 04:38:42 +0000 (04:38 +0000)]
am
a3c9b467: Merge "ART: Fix arm32 instrumentation exit stub"
* commit '
a3c9b4671d4ea89fb7175d5688a13656429d3ab7':
ART: Fix arm32 instrumentation exit stub
Andreas Gampe [Thu, 25 Jun 2015 04:28:34 +0000 (04:28 +0000)]
Merge "ART: Fix arm32 instrumentation exit stub"
Andreas Gampe [Wed, 24 Jun 2015 06:28:59 +0000 (23:28 -0700)]
ART: Fix arm32 instrumentation exit stub
Properly store, pass and restore floating point result.
Bug:
22047833
(cherry picked from commit
844fb67a8b5638c4e195dbbe510dc1626824a16c)
Change-Id: If5d9efbe63334c9b6353f76ce6e4fe519602482a
Andreas Gampe [Thu, 25 Jun 2015 04:12:06 +0000 (04:12 +0000)]
Merge "ART: Fix arm32 instrumentation exit stub" into mnc-dev
Mathieu Chartier [Thu, 25 Jun 2015 03:34:52 +0000 (03:34 +0000)]
am
944cd1dd: am
3bc5c8ad: am
eab80576: Merge "Fix force copy"
* commit '
944cd1dd92f7775dabe1354f386f4a603de7662a':
Fix force copy
Mathieu Chartier [Thu, 25 Jun 2015 03:23:33 +0000 (03:23 +0000)]
am
3bc5c8ad: am
eab80576: Merge "Fix force copy"
* commit '
3bc5c8ad0ae7b5346f68c5f87d64dd082b850b64':
Fix force copy
Mathieu Chartier [Thu, 25 Jun 2015 03:11:07 +0000 (03:11 +0000)]
am
eab80576: Merge "Fix force copy"
* commit '
eab80576240892148d14321c56c8869358e131ab':
Fix force copy
Mathieu Chartier [Thu, 25 Jun 2015 00:04:17 +0000 (17:04 -0700)]
Fix force copy
We now correctly pass the returned pointer back onto the release functions.
Bug:
22056708
Change-Id: I1a7300d3a4522a3c81b432ec742ae1c0bd00b51e
(cherry picked from commit
b735bd9c04aa291d0a1bdc2c0a094a1a75ad0596)
Mathieu Chartier [Thu, 25 Jun 2015 03:00:33 +0000 (03:00 +0000)]
Merge "Fix force copy"
Andreas Gampe [Thu, 25 Jun 2015 00:44:32 +0000 (00:44 +0000)]
am
be5cafe5: resolved conflicts for merge of
684ceef6 to mnc-dev-plus-aosp
* commit '
be5cafe5feb513189877f14fe241adc6907fe915':
ART: Correctly hard-fail method with undefined register
Mathieu Chartier [Thu, 25 Jun 2015 00:04:17 +0000 (17:04 -0700)]
Fix force copy
We now correctly pass the returned pointer back onto the release functions.
Bug:
22056708
Change-Id: I1a7300d3a4522a3c81b432ec742ae1c0bd00b51e
Andreas Gampe [Thu, 25 Jun 2015 00:16:52 +0000 (17:16 -0700)]
resolved conflicts for merge of
684ceef6 to mnc-dev-plus-aosp
Change-Id: If22efef0668537d27632893a476c7b78b07df36b
Andreas Gampe [Wed, 24 Jun 2015 06:28:59 +0000 (23:28 -0700)]
ART: Fix arm32 instrumentation exit stub
Properly store, pass and restore floating point result.
Bug:
22047833
Change-Id: If5d9efbe63334c9b6353f76ce6e4fe519602482a
Andreas Gampe [Wed, 24 Jun 2015 21:43:40 +0000 (21:43 +0000)]
am
1f1d53eb: Merge "ART: Correctly hard-fail method with undefined register"
* commit '
1f1d53ebfc7f955c28f8d5659b7811ad6cef8f19':
ART: Correctly hard-fail method with undefined register
Andreas Gampe [Wed, 24 Jun 2015 21:31:01 +0000 (21:31 +0000)]
Merge "ART: Correctly hard-fail method with undefined register"
Andreas Gampe [Wed, 24 Jun 2015 17:26:13 +0000 (10:26 -0700)]
ART: Correctly hard-fail method with undefined register
In case a return-object gets an undefined return value register
and an unresolved return type, the "undefined" must take precedence
and lead to a hard fail of the method.
Bug:
22045582
Change-Id: Id5595a72331cd6272aa9ebc8ff3b9cea046294a2
Mathieu Chartier [Wed, 24 Jun 2015 21:13:16 +0000 (21:13 +0000)]
am
1bd6cf50: am
b43189b2: (-s ours) am
6d20c2e2: Merge "Fix imt conflict trampoline for mips64" into mnc-dev
* commit '
1bd6cf50aceea5e028b416407eb9c9a6412c312e':
Fix imt conflict trampoline for mips64
Mathieu Chartier [Wed, 24 Jun 2015 20:55:42 +0000 (20:55 +0000)]
am
b43189b2: (-s ours) am
6d20c2e2: Merge "Fix imt conflict trampoline for mips64" into mnc-dev
* commit '
b43189b26f62f2b17569b07ab935ba7344be7433':
Fix imt conflict trampoline for mips64
Mathieu Chartier [Wed, 24 Jun 2015 20:37:06 +0000 (20:37 +0000)]
am
6d20c2e2: Merge "Fix imt conflict trampoline for mips64" into mnc-dev
* commit '
6d20c2e2d88de0116203e2d6ba80b996f858abc1':
Fix imt conflict trampoline for mips64
Mathieu Chartier [Wed, 24 Jun 2015 20:25:25 +0000 (20:25 +0000)]
Merge "Fix imt conflict trampoline for mips64" into mnc-dev
Mathieu Chartier [Wed, 24 Jun 2015 20:11:06 +0000 (13:11 -0700)]
Fix imt conflict trampoline for mips64
Changed lwu to ld
Bug:
21815962
Change-Id: I137e871d9c00f83cd5efc9d3a87fa05e84dc5d23
Christopher Ferris [Wed, 24 Jun 2015 19:41:42 +0000 (19:41 +0000)]
am
fa483461: am
2195ea0f: am
94e7c05f: Increase alt signal stack to 32K on host.
* commit '
fa48346186cd409e917e62c989ac00bfcadc69bd':
Increase alt signal stack to 32K on host.
Christopher Ferris [Wed, 24 Jun 2015 19:29:18 +0000 (19:29 +0000)]
am
2195ea0f: am
94e7c05f: Increase alt signal stack to 32K on host.
* commit '
2195ea0faf04c326c655a5e7a2b8aa6e2c54db2d':
Increase alt signal stack to 32K on host.
Christopher Ferris [Wed, 24 Jun 2015 19:18:38 +0000 (19:18 +0000)]
am
94e7c05f: Increase alt signal stack to 32K on host.
* commit '
94e7c05f11056cc49cb66c752d68069866432d51':
Increase alt signal stack to 32K on host.
Christopher Ferris [Wed, 24 Jun 2015 16:37:39 +0000 (09:37 -0700)]
Increase alt signal stack to 32K on host.
On host, when there is a crash, the code tries to do an unwind
from the signal handler. Under some conditions this can require
a stack larger than 16K, so increase this value to 32K.
The symptom of this is that you get an empty backtrace running
art tests when there is a crash.
Bug:
21949571
(cherry picked from commit
e34c71ce21dbc9fac3427df887e90e1311b6fa8e)
Change-Id: Ib1105a3470064d98843bd46f32d4fadb1d20e416
Jeff Hao [Wed, 24 Jun 2015 18:15:32 +0000 (18:15 +0000)]
am
c0ef7622: am
24daa9d5: am
2f233b48: Merge "Adding optimizing compiler test case for String.<init>."
* commit '
c0ef76220de355be5cdf4e8696a69f7fdcea5cae':
Adding optimizing compiler test case for String.<init>.
Jeff Hao [Wed, 24 Jun 2015 17:58:31 +0000 (17:58 +0000)]
am
24daa9d5: am
2f233b48: Merge "Adding optimizing compiler test case for String.<init>."
* commit '
24daa9d554d654a1a195d8394af961ae7288bdb8':
Adding optimizing compiler test case for String.<init>.
Jeff Hao [Wed, 24 Jun 2015 17:44:56 +0000 (17:44 +0000)]
am
2f233b48: Merge "Adding optimizing compiler test case for String.<init>."
* commit '
2f233b481d8423bf09e295fea9608b68f09a1862':
Adding optimizing compiler test case for String.<init>.
Christopher Ferris [Wed, 24 Jun 2015 17:37:35 +0000 (17:37 +0000)]
am
d82faf80: am
784bde8c: am
f46e9d76: Merge "Increase alt signal stack to 32K on host."
* commit '
d82faf804f1db7ce59fb01cffa0f631118348aa5':
Increase alt signal stack to 32K on host.