OSDN Git Service
Roland Levillain [Tue, 28 Jul 2015 10:34:41 +0000 (10:34 +0000)]
am
6131b654: am
9af8d8dd: Merge "Added repe_cmpsw instruction to x86, x86_64 assemblers"
* commit '
6131b6548c8981b8338599bd1acc0820f987a19f':
Added repe_cmpsw instruction to x86, x86_64 assemblers
Roland Levillain [Tue, 28 Jul 2015 10:19:00 +0000 (10:19 +0000)]
am
9af8d8dd: Merge "Added repe_cmpsw instruction to x86, x86_64 assemblers"
* commit '
9af8d8dd02d7fb4902cda5167217b8687fe3f86a':
Added repe_cmpsw instruction to x86, x86_64 assemblers
Roland Levillain [Tue, 28 Jul 2015 10:11:04 +0000 (10:11 +0000)]
Merge "Added repe_cmpsw instruction to x86, x86_64 assemblers"
Fredrik Roubert [Tue, 28 Jul 2015 00:58:00 +0000 (00:58 +0000)]
am
af50e415: Bugfix: Java char is 16 bits, can not be treated as boolean.
* commit '
af50e415a187190488d4694f307c23705203c53e':
Bugfix: Java char is 16 bits, can not be treated as boolean.
Mathieu Chartier [Tue, 28 Jul 2015 00:17:19 +0000 (00:17 +0000)]
am
b5bfb2ab: am
73961d95: Merge "Add remembered set functionality for native roots"
* commit '
b5bfb2ab19a31dbc37a782ccc6f1a3d93397f1bf':
Add remembered set functionality for native roots
Mathieu Chartier [Tue, 28 Jul 2015 00:17:18 +0000 (00:17 +0000)]
am
0327b9b9: am
6e67b579: Merge "Bugfix: Java char is 16 bits, can not be treated as boolean."
* commit '
0327b9b94bb1dd135f4987173f7e87979c97384e':
Bugfix: Java char is 16 bits, can not be treated as boolean.
Mathieu Chartier [Mon, 27 Jul 2015 23:26:50 +0000 (23:26 +0000)]
am
73961d95: Merge "Add remembered set functionality for native roots"
* commit '
73961d95f2bfa9d0fbc8980cdd4aef8aeed84e1d':
Add remembered set functionality for native roots
Mathieu Chartier [Mon, 27 Jul 2015 23:26:48 +0000 (23:26 +0000)]
am
6e67b579: Merge "Bugfix: Java char is 16 bits, can not be treated as boolean."
* commit '
6e67b5797f7c57281faa72dab08319d0ced7302e':
Bugfix: Java char is 16 bits, can not be treated as boolean.
Fredrik Roubert [Mon, 27 Jul 2015 22:14:08 +0000 (00:14 +0200)]
Bugfix: Java char is 16 bits, can not be treated as boolean.
Using SetFieldBooleanVolatile() and SetFieldBoolean() happens to work
for char values that only use the lower 8 bits, but is a mistake that
was introduced by the "Add AccessibleObject and Field to mirror" commit:
https://android.googlesource.com/platform/art/+/
daaf326
(cherry picked from commit
3152c82b0d33e5fb0a4aa964ea58451c72734444)
Bug:
22772717
Change-Id: Iec02ba3084c992ea239ecef688d7d29c7e21ae16
Mathieu Chartier [Mon, 27 Jul 2015 23:19:31 +0000 (23:19 +0000)]
Merge "Add remembered set functionality for native roots"
Mathieu Chartier [Mon, 27 Jul 2015 23:08:02 +0000 (16:08 -0700)]
Add remembered set functionality for native roots
Fixes GSS tests. The issue was that there could be classes which had
native roots in the target space which we need to mark and update.
Change-Id: I33e628d40bcb74f768492f740f8f084077d80edf
Mathieu Chartier [Mon, 27 Jul 2015 23:15:59 +0000 (23:15 +0000)]
Merge "Bugfix: Java char is 16 bits, can not be treated as boolean."
Fredrik Roubert [Mon, 27 Jul 2015 22:14:08 +0000 (00:14 +0200)]
Bugfix: Java char is 16 bits, can not be treated as boolean.
Using SetFieldBooleanVolatile() and SetFieldBoolean() happens to work
for char values that only use the lower 8 bits, but is a mistake that
was introduced by the "Add AccessibleObject and Field to mirror" commit:
https://android.googlesource.com/platform/art/+/
daaf326
Change-Id: Iec02ba3084c992ea239ecef688d7d29c7e21ae16
agicsaki [Mon, 27 Jul 2015 18:34:13 +0000 (11:34 -0700)]
Added repe_cmpsw instruction to x86, x86_64 assemblers
Change-Id: I7634959eebb64d607f47497db320d5c2afdef16b
Mingyao Yang [Mon, 27 Jul 2015 20:47:54 +0000 (20:47 +0000)]
am
6dc1f8da: am
41bad0ef: Merge "HDeoptimize should hold values live in env."
* commit '
6dc1f8dae8cab916cab6f1f75d33ffffef3d4f4d':
HDeoptimize should hold values live in env.
Aart Bik [Mon, 27 Jul 2015 20:47:52 +0000 (20:47 +0000)]
am
619db792: am
9578d10b: Merge "Add checker ability to 525-arrays-and-fields tests."
* commit '
619db792bf6779f8cdab988b39dcd37e2444a8ac':
Add checker ability to 525-arrays-and-fields tests.
Roland Levillain [Mon, 27 Jul 2015 20:47:50 +0000 (20:47 +0000)]
am
9e7e2b59: am
35dfc983: Merge "Exercise constant folding of int & long mul, div and rem."
* commit '
9e7e2b5979fc4afb63c331791c202843a0888fb5':
Exercise constant folding of int & long mul, div and rem.
Roland Levillain [Mon, 27 Jul 2015 20:47:49 +0000 (20:47 +0000)]
am
df62615b: am
87bada67: Merge "Cosmetic changes in ART run-tests."
* commit '
df62615bb37ff5a15f16bd88fe29a53aad13b023':
Cosmetic changes in ART run-tests.
Roland Levillain [Mon, 27 Jul 2015 20:47:47 +0000 (20:47 +0000)]
am
814a1604: am
ee1e8987: Merge "Fix & add Checker assertions in 442-checker-constant-folding."
* commit '
814a1604896da2ef0244357755ff5a2cf3a653fa':
Fix & add Checker assertions in 442-checker-constant-folding.
Mingyao Yang [Mon, 27 Jul 2015 20:33:16 +0000 (20:33 +0000)]
am
41bad0ef: Merge "HDeoptimize should hold values live in env."
* commit '
41bad0ef883c96cd9befa1b9be5ac1a6cdf282fd':
HDeoptimize should hold values live in env.
Aart Bik [Mon, 27 Jul 2015 20:33:14 +0000 (20:33 +0000)]
am
9578d10b: Merge "Add checker ability to 525-arrays-and-fields tests."
* commit '
9578d10b5866bfab63cc4218ec5ab3f6dd10c8ce':
Add checker ability to 525-arrays-and-fields tests.
Mingyao Yang [Mon, 27 Jul 2015 20:20:01 +0000 (20:20 +0000)]
Merge "HDeoptimize should hold values live in env."
Mingyao Yang [Wed, 22 Jul 2015 22:56:34 +0000 (15:56 -0700)]
HDeoptimize should hold values live in env.
Values that are not live in compiled code anymore may still be needed in
interpreter, due to code motion, etc.
Bug:
22665511
Change-Id: I8b85833c5c462f8fe36f86d6026a51b07563995a
Aart Bik [Mon, 27 Jul 2015 16:34:39 +0000 (16:34 +0000)]
Merge "Add checker ability to 525-arrays-and-fields tests."
Roland Levillain [Mon, 27 Jul 2015 15:42:49 +0000 (15:42 +0000)]
am
35dfc983: Merge "Exercise constant folding of int & long mul, div and rem."
* commit '
35dfc983581b28e1b5db8061f7d1940e878d3f1a':
Exercise constant folding of int & long mul, div and rem.
Roland Levillain [Mon, 27 Jul 2015 15:42:47 +0000 (15:42 +0000)]
am
87bada67: Merge "Cosmetic changes in ART run-tests."
* commit '
87bada67022b877273e7aaf09546af7aa35238ff':
Cosmetic changes in ART run-tests.
Roland Levillain [Mon, 27 Jul 2015 15:42:45 +0000 (15:42 +0000)]
am
ee1e8987: Merge "Fix & add Checker assertions in 442-checker-constant-folding."
* commit '
ee1e8987a862b9c1ae1533c04162e42dbf23b964':
Fix & add Checker assertions in 442-checker-constant-folding.
Roland Levillain [Mon, 27 Jul 2015 15:31:51 +0000 (15:31 +0000)]
Merge "Exercise constant folding of int & long mul, div and rem."
Roland Levillain [Mon, 27 Jul 2015 15:29:58 +0000 (15:29 +0000)]
Merge "Cosmetic changes in ART run-tests."
Roland Levillain [Mon, 27 Jul 2015 15:28:20 +0000 (15:28 +0000)]
Merge "Fix & add Checker assertions in 442-checker-constant-folding."
Roland Levillain [Wed, 22 Jul 2015 13:12:01 +0000 (14:12 +0100)]
Exercise constant folding of int & long mul, div and rem.
Change-Id: Ic70b56dbcb4a660a4c8ca04f7b2b5201ad29952a
Roland Levillain [Thu, 23 Jul 2015 11:15:01 +0000 (12:15 +0100)]
Cosmetic changes in ART run-tests.
Perform a copyright headers clean up mostly.
Change-Id: I26c855b2f54d0887676d9b9b8281b14b7978ab29
Roland Levillain [Thu, 23 Jul 2015 11:11:42 +0000 (12:11 +0100)]
Fix & add Checker assertions in 442-checker-constant-folding.
Change-Id: Id4165b14816c04961d5c274f24861d0e7856d95e
Calin Juravle [Mon, 27 Jul 2015 11:00:31 +0000 (11:00 +0000)]
am
0117cfef: am
0fae2f58: Merge "Enable art host static builds only for checkbuilds."
* commit '
0117cfef98cc01748fb14913e64b29ff223fa0ef':
Enable art host static builds only for checkbuilds.
Calin Juravle [Mon, 27 Jul 2015 10:49:11 +0000 (10:49 +0000)]
am
0fae2f58: Merge "Enable art host static builds only for checkbuilds."
* commit '
0fae2f5851dd79c4100134a92f997b2e7a520083':
Enable art host static builds only for checkbuilds.
Calin Juravle [Mon, 27 Jul 2015 10:39:13 +0000 (10:39 +0000)]
Merge "Enable art host static builds only for checkbuilds."
Andreas Gampe [Sun, 26 Jul 2015 17:54:23 +0000 (17:54 +0000)]
am
7f925348: am
939e702b: Merge "ART: Abbreviate interpreter-access-checks"
* commit '
7f925348b6d57a4b50ccceafa978ad736ff84d04':
ART: Abbreviate interpreter-access-checks
Andreas Gampe [Sun, 26 Jul 2015 17:43:01 +0000 (17:43 +0000)]
am
939e702b: Merge "ART: Abbreviate interpreter-access-checks"
* commit '
939e702be62b059250f0e810f6bdd299186a08a0':
ART: Abbreviate interpreter-access-checks
Andreas Gampe [Sun, 26 Jul 2015 17:31:59 +0000 (17:31 +0000)]
Merge "ART: Abbreviate interpreter-access-checks"
Andreas Gampe [Sun, 26 Jul 2015 17:26:03 +0000 (10:26 -0700)]
ART: Abbreviate interpreter-access-checks
Tag is too long.
Change-Id: I49febb97cec1172bcf06438fe8e0605f266e3fde
Mathieu Chartier [Fri, 24 Jul 2015 23:43:45 +0000 (23:43 +0000)]
am
bb26acb9: am
a09d5df5: Merge "Fix gcstress tests"
* commit '
bb26acb94164e4125d2fc6c17200f8b99f65a075':
Fix gcstress tests
Mathieu Chartier [Fri, 24 Jul 2015 23:30:50 +0000 (23:30 +0000)]
am
a09d5df5: Merge "Fix gcstress tests"
* commit '
a09d5df5128c5c51226028d4a82ed461cf993024':
Fix gcstress tests
Andreas Gampe [Fri, 24 Jul 2015 23:29:47 +0000 (23:29 +0000)]
am
6b557d3d: am
34e1ed2f: Merge "ART: Make warnings into errors in InitZygote"
* commit '
6b557d3d4b62a35ef70e4f881153ba66eeffeb25':
ART: Make warnings into errors in InitZygote
Mathieu Chartier [Fri, 24 Jul 2015 23:17:16 +0000 (23:17 +0000)]
Merge "Fix gcstress tests"
Mathieu Chartier [Fri, 24 Jul 2015 23:05:55 +0000 (16:05 -0700)]
Fix gcstress tests
We may visit the native roots multiple times (e.g. temp classes).
This used to not be handled by the SS GC but is now handle by
MarkObjectIfNotInToSpace.
Change-Id: I18226e20b36ace41c155ba4c3f54eac2244f524c
Andreas Gampe [Fri, 24 Jul 2015 23:08:58 +0000 (23:08 +0000)]
am
34e1ed2f: Merge "ART: Make warnings into errors in InitZygote"
* commit '
34e1ed2ff52b4a3a1115b6ad467d6978d2b489a3':
ART: Make warnings into errors in InitZygote
Andreas Gampe [Fri, 24 Jul 2015 23:04:05 +0000 (23:04 +0000)]
am
c021cc4e: am
e3ab2a7d: Merge "ART: Change the stack dump format to be in line with debuggerd"
* commit '
c021cc4e80016a578c1280601ccb0fbe77706fbf':
ART: Change the stack dump format to be in line with debuggerd
Andreas Gampe [Fri, 24 Jul 2015 22:56:43 +0000 (22:56 +0000)]
Merge "ART: Make warnings into errors in InitZygote"
Andreas Gampe [Fri, 24 Jul 2015 22:41:20 +0000 (15:41 -0700)]
ART: Make warnings into errors in InitZygote
These warnings are actual errors and lead to failure to start the
runtime. Print them accordingly.
Change-Id: I907e32a3c5da5364ecc9678bb9a11604234d669c
Andreas Gampe [Fri, 24 Jul 2015 22:40:50 +0000 (22:40 +0000)]
am
e3ab2a7d: Merge "ART: Change the stack dump format to be in line with debuggerd"
* commit '
e3ab2a7dc3ff7ef0da6a82de7387470fb67695d0':
ART: Change the stack dump format to be in line with debuggerd
Igor Murashkin [Fri, 24 Jul 2015 22:36:22 +0000 (22:36 +0000)]
am
0c21b5cc: am
8f3402e7: Merge "Revert "runtest: Have gcstress tests skip 955-lambda-smali""
* commit '
0c21b5cc3af2efc2091f7bd6520b15f68b46e857':
Revert "runtest: Have gcstress tests skip 955-lambda-smali"
Andreas Gampe [Fri, 24 Jul 2015 22:25:01 +0000 (22:25 +0000)]
Merge "ART: Change the stack dump format to be in line with debuggerd"
Igor Murashkin [Fri, 24 Jul 2015 22:17:53 +0000 (22:17 +0000)]
am
8f3402e7: Merge "Revert "runtest: Have gcstress tests skip 955-lambda-smali""
* commit '
8f3402e70bfdd1f768ccfe7614184f71fd8e7d19':
Revert "runtest: Have gcstress tests skip 955-lambda-smali"
Andreas Gampe [Thu, 23 Jul 2015 21:37:18 +0000 (14:37 -0700)]
ART: Change the stack dump format to be in line with debuggerd
Make offsets 16 digits on 64-bit platforms.
Add the ability to provide the build fingerprint, and print it in
the traces output.
Bug:
22693991
(cherry picked from commit
242ae94dc39be53e519a6163ea1db494ceb75954)
Change-Id: Ibd3d3b3bd65dce84acfb97a487807d6f280a9508
Igor Murashkin [Fri, 24 Jul 2015 22:01:21 +0000 (22:01 +0000)]
Merge "Revert "runtest: Have gcstress tests skip 955-lambda-smali""
Andreas Gampe [Fri, 24 Jul 2015 21:45:37 +0000 (21:45 +0000)]
am
458a7c7a: (-s ours) Merge "ART: Change the stack dump format to be in line with debuggerd" into mnc-dev
* commit '
458a7c7aba37bf41e40862046846fa77046ac23c':
ART: Change the stack dump format to be in line with debuggerd
Igor Murashkin [Fri, 24 Jul 2015 21:43:26 +0000 (14:43 -0700)]
Revert "runtest: Have gcstress tests skip 955-lambda-smali"
This reverts commit
ef3119e6c75c431d9cf54e92dfe5b805597b1657.
Andreas Gampe [Fri, 24 Jul 2015 21:24:38 +0000 (21:24 +0000)]
Merge "ART: Change the stack dump format to be in line with debuggerd" into mnc-dev
Mathieu Chartier [Fri, 24 Jul 2015 21:02:59 +0000 (21:02 +0000)]
am
2f0f97c5: am
0fc01dd3: Merge "Visit class native roots from VisitReferences"
* commit '
2f0f97c549e942f7729f9b7be4f22c34cbb1146e':
Visit class native roots from VisitReferences
Mathieu Chartier [Fri, 24 Jul 2015 19:09:23 +0000 (19:09 +0000)]
am
0fc01dd3: Merge "Visit class native roots from VisitReferences"
* commit '
0fc01dd3725792a190f4c97cbdfefd2733b76e21':
Visit class native roots from VisitReferences
Mathieu Chartier [Fri, 24 Jul 2015 18:58:57 +0000 (18:58 +0000)]
Merge "Visit class native roots from VisitReferences"
Mathieu Chartier [Thu, 23 Jul 2015 23:01:26 +0000 (16:01 -0700)]
Visit class native roots from VisitReferences
Visit class roots when we call Class::VisitReferences instead of in
the class linker. This makes it easier to implement class unloading
since unmarked classes won't have their roots visited by the class
linker.
Bug:
22181835
Change-Id: I63f31e5ebef7b2a0b764b3ba3cb038b3f561b379
Aart Bik [Thu, 23 Jul 2015 21:15:22 +0000 (14:15 -0700)]
Add checker ability to 525-arrays-and-fields tests.
Rationale:
Good to verify hoisting occurs and even some
not-hoisting (although the latter is already
reflected in the computed results).
Change-Id: I23575e4fd480836b436b1f27f67e561c7b40419d
Calin Juravle [Fri, 24 Jul 2015 15:45:26 +0000 (16:45 +0100)]
Enable art host static builds only for checkbuilds.
Change-Id: I42cc850089a5ecbcc201699f0b996da4fd959bb3
Vladimir Marko [Fri, 24 Jul 2015 10:11:08 +0000 (10:11 +0000)]
am
d021e166: ART: Fix Quick/Optimizing suspend check assumption mismatch.
* commit '
d021e166babaaf131e59caf5ad84772b73acb4c5':
ART: Fix Quick/Optimizing suspend check assumption mismatch.
Andreas Gampe [Thu, 23 Jul 2015 21:37:18 +0000 (14:37 -0700)]
ART: Change the stack dump format to be in line with debuggerd
Make offsets 16 digits on 64-bit platforms.
Add the ability to provide the build fingerprint, and print it in
the traces output.
Bug:
22693991
Change-Id: Ibd3d3b3bd65dce84acfb97a487807d6f280a9508
Mathieu Chartier [Thu, 23 Jul 2015 22:19:14 +0000 (22:19 +0000)]
am
cd731ca7: am
2a7ea34c: Merge "Add some more uninterruptible annotations"
* commit '
cd731ca7e432630b8e8645e4dff04faf0ac5d5af':
Add some more uninterruptible annotations
Mathieu Chartier [Thu, 23 Jul 2015 22:04:51 +0000 (22:04 +0000)]
am
2a7ea34c: Merge "Add some more uninterruptible annotations"
* commit '
2a7ea34cda9bf776339dfc7f4a22ab01f9525f2d':
Add some more uninterruptible annotations
Mathieu Chartier [Thu, 23 Jul 2015 21:56:01 +0000 (21:56 +0000)]
Merge "Add some more uninterruptible annotations"
Mathieu Chartier [Thu, 23 Jul 2015 21:11:16 +0000 (14:11 -0700)]
Add some more uninterruptible annotations
Added to mirror sites, class linker, and intern table.
Bug:
20072211
Change-Id: I2224bcefefaab05d325f14844b1514e3d719e649
Mathieu Chartier [Thu, 23 Jul 2015 19:15:08 +0000 (19:15 +0000)]
am
71ab1c96: am
20cd654b: Merge "Fix alignments in quick_entrypoints_x86_64.S"
* commit '
71ab1c960202f0572d6f43d94e64d3c2e3ea7292':
Fix alignments in quick_entrypoints_x86_64.S
Mathieu Chartier [Thu, 23 Jul 2015 19:08:17 +0000 (19:08 +0000)]
am
20cd654b: Merge "Fix alignments in quick_entrypoints_x86_64.S"
* commit '
20cd654b84404af22aa0ac12b3952a317393b2d5':
Fix alignments in quick_entrypoints_x86_64.S
Mathieu Chartier [Thu, 23 Jul 2015 18:59:17 +0000 (18:59 +0000)]
Merge "Fix alignments in quick_entrypoints_x86_64.S"
Vladimir Marko [Thu, 23 Jul 2015 18:57:40 +0000 (18:57 +0000)]
am
dd812fa1: am
f7efc9ef: Merge "ART: Fix Quick/Optimizing suspend check assumption mismatch."
* commit '
dd812fa14a919516269cc2b0330d85aa7b3eff88':
ART: Fix Quick/Optimizing suspend check assumption mismatch.
David Brazdil [Thu, 23 Jul 2015 18:57:38 +0000 (18:57 +0000)]
am
76aabf7f: am
bea4eb4b: Merge "Disable Checker for tests that don\'t invoke the compiler."
* commit '
76aabf7f2e47754fd16fcf4d4650c3f67c9002ef':
Disable Checker for tests that don't invoke the compiler.
Roland Levillain [Thu, 23 Jul 2015 18:57:37 +0000 (18:57 +0000)]
am
e14a10aa: am
bd76db36: Merge "Fix and extend the documentation of art::Thread\'s fields offsets."
* commit '
e14a10aadd656dba23cc91ffa0797dd5b0b94cc0':
Fix and extend the documentation of art::Thread's fields offsets.
Andreas Gampe [Thu, 23 Jul 2015 18:57:35 +0000 (18:57 +0000)]
am
8a035325: am
195fa34d: Merge "ART: Fix missing role definition"
* commit '
8a035325a208266bd96d2b44ab06214974295e01':
ART: Fix missing role definition
Mathieu Chartier [Thu, 23 Jul 2015 18:57:34 +0000 (18:57 +0000)]
am
14e093db: am
d59f0b19: Merge "Fix hash set memory leaks"
* commit '
14e093dbbafd6eb684487ad05d67b3b76af3ea5d':
Fix hash set memory leaks
Mathieu Chartier [Thu, 23 Jul 2015 18:57:33 +0000 (18:57 +0000)]
am
d5a482cb: am
3c9c7760: Merge "Add uninterruptible role"
* commit '
d5a482cb2610fb7ae4f17f063cb920ce81122038':
Add uninterruptible role
Mathieu Chartier [Thu, 23 Jul 2015 18:57:31 +0000 (18:57 +0000)]
am
372e3bee: am
f64914d7: Merge "Move to newer clang annotations"
* commit '
372e3beecafaaac5e2c063eb68beca9ab3684056':
Move to newer clang annotations
Igor Murashkin [Thu, 23 Jul 2015 18:57:28 +0000 (18:57 +0000)]
am
a7cae0a6: am
fab0712a: Merge "runtest: Have gcstress tests skip 955-lambda-smali"
* commit '
a7cae0a6c29d53fb079f956cd9169169d56070b4':
runtest: Have gcstress tests skip 955-lambda-smali
Andreas Gampe [Thu, 23 Jul 2015 18:57:27 +0000 (18:57 +0000)]
am
41c2b27b: am
6078aec2: Merge "ART: Add VerboseMethods to optimizing compiler"
* commit '
41c2b27b361b851ce3537b69219f17d13db0972b':
ART: Add VerboseMethods to optimizing compiler
Richard Uhler [Thu, 23 Jul 2015 18:57:25 +0000 (18:57 +0000)]
am
67496bfb: am
d8da9dc8: Merge "More diagnostics for flaky oat file assistant test."
* commit '
67496bfbbd5f57064b5dede182d16c90bd240c66':
More diagnostics for flaky oat file assistant test.
Aart Bik [Thu, 23 Jul 2015 18:57:24 +0000 (18:57 +0000)]
am
8d060f27: am
c20d7286: Merge "Replaced CHECK with EXPECT in tests."
* commit '
8d060f2703359c58a7253ecb59d56244ab93ba12':
Replaced CHECK with EXPECT in tests.
Vladimir Marko [Thu, 23 Jul 2015 18:37:19 +0000 (18:37 +0000)]
am
f7efc9ef: Merge "ART: Fix Quick/Optimizing suspend check assumption mismatch."
* commit '
f7efc9ef90c38212f8c4fbece99080f784a53181':
ART: Fix Quick/Optimizing suspend check assumption mismatch.
David Brazdil [Thu, 23 Jul 2015 18:37:17 +0000 (18:37 +0000)]
am
bea4eb4b: Merge "Disable Checker for tests that don\'t invoke the compiler."
* commit '
bea4eb4b29aa1030aa1919dfedaa95aea2599b7a':
Disable Checker for tests that don't invoke the compiler.
Roland Levillain [Thu, 23 Jul 2015 18:37:16 +0000 (18:37 +0000)]
am
bd76db36: Merge "Fix and extend the documentation of art::Thread\'s fields offsets."
* commit '
bd76db36abc1026cdc3f737ec0f2be6174a131a1':
Fix and extend the documentation of art::Thread's fields offsets.
Andreas Gampe [Thu, 23 Jul 2015 18:37:14 +0000 (18:37 +0000)]
am
195fa34d: Merge "ART: Fix missing role definition"
* commit '
195fa34db058b12c0f53f49ded482fd28d73d7d2':
ART: Fix missing role definition
Mathieu Chartier [Thu, 23 Jul 2015 18:37:12 +0000 (18:37 +0000)]
am
d59f0b19: Merge "Fix hash set memory leaks"
* commit '
d59f0b198ae5a0bf2cc4d2f9cadbe51ebf14277e':
Fix hash set memory leaks
Mathieu Chartier [Thu, 23 Jul 2015 18:37:11 +0000 (18:37 +0000)]
am
3c9c7760: Merge "Add uninterruptible role"
* commit '
3c9c776017cd628d594fda0943634f2bdcc980b8':
Add uninterruptible role
Mathieu Chartier [Thu, 23 Jul 2015 18:37:09 +0000 (18:37 +0000)]
am
f64914d7: Merge "Move to newer clang annotations"
* commit '
f64914d7392b7d35c7f35bc917b0797b9c4605ac':
Move to newer clang annotations
Igor Murashkin [Thu, 23 Jul 2015 18:37:07 +0000 (18:37 +0000)]
am
fab0712a: Merge "runtest: Have gcstress tests skip 955-lambda-smali"
* commit '
fab0712a178670949c909f55486648c425add463':
runtest: Have gcstress tests skip 955-lambda-smali
Andreas Gampe [Thu, 23 Jul 2015 18:37:05 +0000 (18:37 +0000)]
am
6078aec2: Merge "ART: Add VerboseMethods to optimizing compiler"
* commit '
6078aec213dfaf111c29969706e8e5967cfc9bea':
ART: Add VerboseMethods to optimizing compiler
Richard Uhler [Thu, 23 Jul 2015 18:37:03 +0000 (18:37 +0000)]
am
d8da9dc8: Merge "More diagnostics for flaky oat file assistant test."
* commit '
d8da9dc897ececb8df8cafd458b48fa65a703acc':
More diagnostics for flaky oat file assistant test.
Aart Bik [Thu, 23 Jul 2015 18:37:01 +0000 (18:37 +0000)]
am
c20d7286: Merge "Replaced CHECK with EXPECT in tests."
* commit '
c20d728627c19f7d81328bed9b800a643f6ba680':
Replaced CHECK with EXPECT in tests.
Man Cao [Thu, 23 Jul 2015 18:18:49 +0000 (11:18 -0700)]
Fix alignments in quick_entrypoints_x86_64.S
Places calling artIsAssignableFromCode() were not 16-byte aligned.
Change-Id: I86ff4f73a942ede09c0206e76614eb826dd896c2
Vladimir Marko [Wed, 22 Jul 2015 16:50:37 +0000 (17:50 +0100)]
ART: Fix Quick/Optimizing suspend check assumption mismatch.
Quick's SuspendCheckElimination (SCE) expects that every
method contains a suspend check and it eliminates suspend
checks in loops containing an invoke. Optimizing eliminates
the suspend check from leaf methods, so the combination of
a Quick-compiled loop calling an Optimizing-compiled leaf
method can lead to missing suspend checks and potentially
leading to ANRs.
Enable Quick's kLeafOptimization flag to remove suspend
checks from leaf methods and disable Quick's SCE. This
aligns the suspend check placement for the two backends
and avoids the broken combination.
Currently, all methods containing a try-catch are compiled
with Quick, so it's relatively easy to create a regression
test. However, this test will not be valid when Optimizing
starts supporting try-catch.
Bug:
22657404
(cherry picked from commit
d29e8487ff1774b6eb5f0e18d854415c1ee8f6b0)
Change-Id: I733c38bf68bfc2c618f2f2e6b59f8b0e015d7be1
Vladimir Marko [Thu, 23 Jul 2015 16:53:02 +0000 (16:53 +0000)]
Merge "ART: Fix Quick/Optimizing suspend check assumption mismatch."
David Brazdil [Thu, 23 Jul 2015 16:18:59 +0000 (16:18 +0000)]
Merge "Disable Checker for tests that don't invoke the compiler."
Vladimir Marko [Wed, 22 Jul 2015 16:50:37 +0000 (17:50 +0100)]
ART: Fix Quick/Optimizing suspend check assumption mismatch.
Quick's SuspendCheckElimination (SCE) expects that every
method contains a suspend check and it eliminates suspend
checks in loops containing an invoke. Optimizing eliminates
the suspend check from leaf methods, so the combination of
a Quick-compiled loop calling an Optimizing-compiled leaf
method can lead to missing suspend checks and potentially
leading to ANRs.
Enable Quick's kLeafOptimization flag to remove suspend
checks from leaf methods and disable Quick's SCE. This
aligns the suspend check placement for the two backends
and avoids the broken combination.
Currently, all methods containing a try-catch are compiled
with Quick, so it's relatively easy to create a regression
test. However, this test will not be valid when Optimizing
starts supporting try-catch.
Bug:
22657404
Change-Id: I3bc40bf3f5c1e7d18704d1547b139e939950b770