OSDN Git Service
Andreas Gampe [Wed, 23 Jul 2014 01:50:17 +0000 (01:50 +0000)]
am
ab9167bd: Merge "Changed default non-full tests to be prebuild."
* commit '
ab9167bd054eaa8469a73250e33034b5109a7b6e':
Changed default non-full tests to be prebuild.
Mathieu Chartier [Wed, 23 Jul 2014 01:15:23 +0000 (01:15 +0000)]
am
2ac30da0: (-s ours) Merge "Recycle mem-maps for collector transitions."
* commit '
2ac30da089ed9f2a27c177a972f4d67754454637':
Recycle mem-maps for collector transitions.
Mingyao Yang [Wed, 23 Jul 2014 00:45:22 +0000 (00:45 +0000)]
am
7326ff0a: Merge "Fix build, missing spaces around =/<."
* commit '
7326ff0a5a602ebefde76b2785a0c6c0401e815a':
Fix build, missing spaces around =/<.
Ian Rogers [Tue, 22 Jul 2014 22:12:09 +0000 (22:12 +0000)]
am
ddc21198: Merge "Put oat test output on stderr."
* commit '
ddc211980aa2f6149905d8d26f67201ac8e400b3':
Put oat test output on stderr.
Mingyao Yang [Tue, 22 Jul 2014 22:12:08 +0000 (22:12 +0000)]
am
c389c97c: Merge "Set vtable in class object to null after linking."
* commit '
c389c97ca93b73b3cb380cedfe438d153b524225':
Set vtable in class object to null after linking.
Andreas Gampe [Tue, 22 Jul 2014 21:46:29 +0000 (21:46 +0000)]
am
c836fcbb: Merge "Made sync-test actually wait for first thread to start."
* commit '
c836fcbb52d99efdd9ed4f5c104aebd0c37cb121':
Made sync-test actually wait for first thread to start.
Andreas Gampe [Tue, 22 Jul 2014 21:15:24 +0000 (21:15 +0000)]
am
f645a02c: Merge "ART: Fix checks for relocation delta"
* commit '
f645a02cc669232a33b2c2a3c309ed878615d4a9':
ART: Fix checks for relocation delta
Andreas Gampe [Tue, 22 Jul 2014 21:08:40 +0000 (21:08 +0000)]
am
306cd217: Merge "ART: Blacklist relocate option in oat tests"
* commit '
306cd2179fc73c0b187102b7e70abf12cb47debf':
ART: Blacklist relocate option in oat tests
Mathieu Chartier [Wed, 23 Jul 2014 01:01:30 +0000 (01:01 +0000)]
Merge "Recycle mem-maps for collector transitions."
Mathieu Chartier [Wed, 16 Jul 2014 20:28:58 +0000 (13:28 -0700)]
Recycle mem-maps for collector transitions.
We now create spaces when we need them for collector transitions or
homogeneous compaction by recycling mem maps. Change the bump
pointer space size to be as large as the heap capacity instead of
1/2 heap capacity like it used to be. For GSS, bump pointer spaces
are set to 32MB currently.
Changed GSS to have main space == non moving space since we don't
need to copy from the main space.
Fixes GC stress tests 074, 096.
Fixed test 080 oom throw with -Xmx2m for GC stress test, this was
broken since it was allocating a 4 MB array before starting the
OOM process.
Bug:
14059466
Bug:
16406852
Change-Id: I62877cfa24ec944a6f34ffac30334f454a8002fd
Nicolas Geoffray [Tue, 22 Jul 2014 17:19:22 +0000 (17:19 +0000)]
am
d2d90ecc: Merge "Make unit test tell if a method is a leaf."
* commit '
d2d90ecc099eee55b2c9b38c921951ff9288b020':
Make unit test tell if a method is a leaf.
Andreas Gampe [Tue, 22 Jul 2014 21:40:47 +0000 (21:40 +0000)]
Merge "Made sync-test actually wait for first thread to start."
Alex Light [Tue, 22 Jul 2014 21:04:31 +0000 (14:04 -0700)]
Made sync-test actually wait for first thread to start.
This makes sure that the threads execute in the order we expect.
Change-Id: I0c4976e72ef2eb9e5fd66184eb1cd4821ea1e42b
Andreas Gampe [Tue, 22 Jul 2014 21:09:07 +0000 (21:09 +0000)]
Merge "ART: Fix checks for relocation delta"
Andreas Gampe [Tue, 22 Jul 2014 21:04:34 +0000 (14:04 -0700)]
ART: Fix checks for relocation delta
Change < to <= and > to >=.
Change-Id: I7579e3c13dc1b33801ace3a0f8d85cadaee41e6e
Andreas Gampe [Tue, 22 Jul 2014 20:57:39 +0000 (20:57 +0000)]
Merge "ART: Blacklist relocate option in oat tests"
Andreas Gampe [Tue, 22 Jul 2014 18:46:28 +0000 (11:46 -0700)]
ART: Blacklist relocate option in oat tests
To avoid overwriting issues when running the relocate option for
oat tests, blacklist them.
Change-Id: I37685a761fd0949502da134690d88ba2a399ea44
Andreas Gampe [Wed, 23 Jul 2014 01:43:30 +0000 (01:43 +0000)]
Merge "Changed default non-full tests to be prebuild."
Alex Light [Wed, 23 Jul 2014 01:07:12 +0000 (18:07 -0700)]
Changed default non-full tests to be prebuild.
Also added ability to turn off non-prebuild manually.
Change-Id: I0315ac43703a9c7e79812658523013799fb5d5dd
Mingyao Yang [Wed, 23 Jul 2014 00:35:01 +0000 (00:35 +0000)]
Merge "Fix build, missing spaces around =/<."
Mingyao Yang [Wed, 23 Jul 2014 00:33:25 +0000 (17:33 -0700)]
Fix build, missing spaces around =/<.
Change-Id: I2e7824075626a07eccb0a5eb77ef157214fe70fb
Ian Rogers [Tue, 22 Jul 2014 22:05:57 +0000 (22:05 +0000)]
Merge "Put oat test output on stderr."
Ian Rogers [Tue, 22 Jul 2014 21:22:22 +0000 (14:22 -0700)]
Put oat test output on stderr.
Change-Id: Iad318f63263dc5d264d8a84eacedf5065a4e5248
Mingyao Yang [Tue, 22 Jul 2014 22:05:50 +0000 (22:05 +0000)]
Merge "Set vtable in class object to null after linking."
Mingyao Yang [Wed, 16 Jul 2014 17:44:41 +0000 (10:44 -0700)]
Set vtable in class object to null after linking.
This is follow-up work of embedding imt and vtable for
faster interface/virtual call dispatching.
Once vtable becomes embedded, the original vtable is nulled.
Change-Id: I307696657d1e283654169dbecb8f7815c42bbabc
Andreas Gampe [Tue, 22 Jul 2014 15:34:01 +0000 (15:34 +0000)]
am
16fc9f61: Merge "Runtime can now be set to require relocation"
* commit '
16fc9f617e395758eb95b5f2124c79a828186b55':
Runtime can now be set to require relocation
Nicolas Geoffray [Tue, 22 Jul 2014 15:25:12 +0000 (15:25 +0000)]
am
84568fdf: Merge "Interpreter can kick in even when implicit checks are enabled."
* commit '
84568fdf08f8f476292996ad653b4453d2894d23':
Interpreter can kick in even when implicit checks are enabled.
Nicolas Geoffray [Tue, 22 Jul 2014 15:19:33 +0000 (15:19 +0000)]
am
e10a0bd0: Merge "Stack overflow checks and NPE checks for optimizing."
* commit '
e10a0bd05b195f71cc0ff2d59568d02d29939927':
Stack overflow checks and NPE checks for optimizing.
Vladimir Marko [Tue, 22 Jul 2014 14:43:14 +0000 (14:43 +0000)]
am
2983d230: Merge "Use vabs/fabs on arm/arm64 for intrinsic abs()."
* commit '
2983d230534aee99090d28b2666dae094440f1c4':
Use vabs/fabs on arm/arm64 for intrinsic abs().
Ian Rogers [Tue, 22 Jul 2014 13:34:56 +0000 (13:34 +0000)]
am
ebb6b5c9: Merge "Avoid marking erroneous classes as erroneous twice."
* commit '
ebb6b5c90857f390db5a4f840bbe67b3a59a22d8':
Avoid marking erroneous classes as erroneous twice.
Andreas Gampe [Tue, 22 Jul 2014 13:34:55 +0000 (13:34 +0000)]
am
9d9fec65: Merge "ART: Throw StackOverflowError in native code"
* commit '
9d9fec65366ea4996b17141c97ff94416239b63e':
ART: Throw StackOverflowError in native code
Andreas Gampe [Tue, 22 Jul 2014 12:17:52 +0000 (12:17 +0000)]
am
7ff831f6: Merge "ART: Check high part of dalvik register pairs on put-wide"
* commit '
7ff831f63111de69c71bc8c5cb1042d698b72070':
ART: Check high part of dalvik register pairs on put-wide
Ian Rogers [Tue, 22 Jul 2014 03:47:12 +0000 (03:47 +0000)]
am
0a142c96: Merge "Redirect failing test output to stderr."
* commit '
0a142c96c50ca9d2edb6ef995107fe368cd0a3fa':
Redirect failing test output to stderr.
Ian Rogers [Tue, 22 Jul 2014 03:05:00 +0000 (03:05 +0000)]
am
9cdde520: Merge "ART: Increase command buffer size in assembler_thumb_test"
* commit '
9cdde5200a890e203c23e15593a9a01b06160368':
ART: Increase command buffer size in assembler_thumb_test
Mathieu Chartier [Tue, 22 Jul 2014 01:17:44 +0000 (01:17 +0000)]
am
01bd8e3d: Merge "Revert "Disable adding main and non moving spaces to immune region in GSS"" into lmp-dev
* commit '
01bd8e3d8e663fcc48d6941e4876a09657fee6c9':
Revert "Disable adding main and non moving spaces to immune region in GSS"
Mathieu Chartier [Mon, 21 Jul 2014 22:40:50 +0000 (22:40 +0000)]
am
96823a65: Merge "Add detection of zygote vs app vs image objects in hprof"
* commit '
96823a6504d28cfbf2806ab301084291ddd1159e':
Add detection of zygote vs app vs image objects in hprof
Hiroshi Yamauchi [Mon, 21 Jul 2014 18:10:37 +0000 (18:10 +0000)]
am
c62944ad: Merge "Add read barriers for the GC roots in Instrumentation."
* commit '
c62944adcd427dca55489d234428da47c43a0aab':
Add read barriers for the GC roots in Instrumentation.
Ian Rogers [Mon, 21 Jul 2014 16:42:38 +0000 (16:42 +0000)]
am
719ca5ad: Merge "Fix erroneous behaviors with OOME present."
* commit '
719ca5ade262c5ace6a2ea32a3e4e48619d8439e':
Fix erroneous behaviors with OOME present.
Andreas Gampe [Tue, 22 Jul 2014 15:25:28 +0000 (15:25 +0000)]
Merge "Runtime can now be set to require relocation"
Alex Light [Wed, 2 Jul 2014 23:28:08 +0000 (16:28 -0700)]
Runtime can now be set to require relocation
Add a pair of runtime flags -Xrelocate and -Xnorelocate that can force
the runtime to require that all files that are run are relocated, to
prevent attacks based on the known art base address.
Add support for running patchoat on oat files compiled without an image.
Change run-test to have new --prebuild and --relocate flags.
Bug:
15358152
Change-Id: I91166c62dd1ab80e5cbcb7883a2cd0d56afca32d
Andreas Gampe [Tue, 22 Jul 2014 06:51:47 +0000 (06:51 +0000)]
Merge "ART: Throw StackOverflowError in native code"
Andreas Gampe [Mon, 14 Jul 2014 23:21:44 +0000 (16:21 -0700)]
ART: Throw StackOverflowError in native code
Initialize stack-overflow errors in native code to be able to reduce
the preserved area size of the stack.
Includes a refactoring away from constexpr in instruction_set.h to allow
for easy changing of the values.
Change-Id: I117cc8485f43da5f0a470f0f5e5b3dc3b5a06246
Ian Rogers [Tue, 22 Jul 2014 02:58:25 +0000 (02:58 +0000)]
Merge "ART: Increase command buffer size in assembler_thumb_test"
Andreas Gampe [Tue, 22 Jul 2014 01:32:59 +0000 (18:32 -0700)]
ART: Increase command buffer size in assembler_thumb_test
Change-Id: I5fe0014a2928772650bdb120a877eb9624bf7651
Mathieu Chartier [Mon, 21 Jul 2014 20:54:24 +0000 (20:54 +0000)]
Merge "Add detection of zygote vs app vs image objects in hprof"
Mathieu Chartier [Sat, 19 Jul 2014 00:58:22 +0000 (17:58 -0700)]
Add detection of zygote vs app vs image objects in hprof
Bug:
16406673
Change-Id: Ic3e4a809c00b8379e42b074f9032ac106138be67
Hiroshi Yamauchi [Mon, 21 Jul 2014 18:01:22 +0000 (18:01 +0000)]
Merge "Add read barriers for the GC roots in Instrumentation."
Hiroshi Yamauchi [Fri, 18 Jul 2014 22:38:17 +0000 (15:38 -0700)]
Add read barriers for the GC roots in Instrumentation.
Bug:
12687968
Change-Id: I324e2f950ce4500b0e00722044af3a9c82487b23
Calin Juravle [Mon, 21 Jul 2014 13:58:50 +0000 (13:58 +0000)]
am
1e5bc0bc: Fix bad comment in class_linker
* commit '
1e5bc0bc5257cb1fce5fe71a1b922527fe6b8fa4':
Fix bad comment in class_linker
Calin Juravle [Thu, 17 Jul 2014 20:14:23 +0000 (21:14 +0100)]
Fix bad comment in class_linker
(cherry picked from commit
ff5a372be9b5ecaa4c3a9887f064a8a98069d036)
Change-Id: I04b2156fbd85929b082097e6faab8097552744c3
Narayan Kamath [Mon, 21 Jul 2014 13:52:53 +0000 (13:52 +0000)]
am
1a5272ed: Merge "Rename openDexFileNative to openDexFile." into lmp-dev
* commit '
1a5272edde69f7ac6ebff2352827c20241496564':
Rename openDexFileNative to openDexFile.
Narayan Kamath [Mon, 21 Jul 2014 13:49:27 +0000 (14:49 +0100)]
resolved conflicts for merge of
5554c0c0 to lmp-dev-plus-aosp
Change-Id: Ic07d4f265d58c7a56da2aeabb1c8007950e6f3fc
Nicolas Geoffray [Mon, 21 Jul 2014 12:47:11 +0000 (12:47 +0000)]
am
a6d4bc19: Merge "Fix sizeof -> strlen to get the test to run on build servers."
* commit '
a6d4bc19b0f68286862ce315377aaeb1e26a726b':
Fix sizeof -> strlen to get the test to run on build servers.
Nicolas Geoffray [Mon, 21 Jul 2014 12:22:59 +0000 (12:22 +0000)]
am
043f89b4: Merge "Add write barriers to optimizing compiler."
* commit '
043f89b4e0e761c61350c2e620795826bde8f941':
Add write barriers to optimizing compiler.
Nicolas Geoffray [Mon, 21 Jul 2014 12:22:59 +0000 (12:22 +0000)]
am
b5a21410: Merge "Add assembly operations with constants in optimizing compiler."
* commit '
b5a214105d4c9b6c14de1649764950dd35bd620f':
Add assembly operations with constants in optimizing compiler.
Andreas Gampe [Sun, 20 Jul 2014 17:59:29 +0000 (17:59 +0000)]
am
f021cc08: ART: Also accept java.lang.Throwable as a catch-all handler.
* commit '
f021cc085ac00ee2b6eaac6ffdf8f01596289dc7':
ART: Also accept java.lang.Throwable as a catch-all handler.
Andreas Gampe [Sun, 20 Jul 2014 02:16:50 +0000 (02:16 +0000)]
am
4a3a3d4e: Merge "ART: Improve overflow detection in dex file verifier" into lmp-dev
* commit '
4a3a3d4e3705b94c281764f2e7173de5590e74cb':
ART: Improve overflow detection in dex file verifier
Dave Allison [Sun, 20 Jul 2014 02:16:50 +0000 (02:16 +0000)]
am
147eb41b: (-s ours) Revert "Revert "Revert "Revert "Add implicit null and stack checks for x86""""
* commit '
147eb41b53729ec8d5c188d1cac90964a51afb8a':
Revert "Revert "Revert "Revert "Add implicit null and stack checks for x86""""
Andreas Gampe [Tue, 22 Jul 2014 05:32:12 +0000 (05:32 +0000)]
Merge "ART: Check high part of dalvik register pairs on put-wide"
Andreas Gampe [Tue, 22 Jul 2014 05:11:42 +0000 (22:11 -0700)]
ART: Check high part of dalvik register pairs on put-wide
When verifying a put-wide, it is necessary to check the lo and the hi
register for the right type.
Bug:
16018242
Change-Id: I9e661951d592e155e0f281ea959e778d8f4a67ab
Ian Rogers [Tue, 22 Jul 2014 03:39:52 +0000 (03:39 +0000)]
Merge "Redirect failing test output to stderr."
Ian Rogers [Tue, 22 Jul 2014 03:28:31 +0000 (20:28 -0700)]
Redirect failing test output to stderr.
Change-Id: I8feeeef569854476d33fdc613182dbe16f7ba53c
Ian Rogers [Mon, 21 Jul 2014 16:37:48 +0000 (16:37 +0000)]
Merge "Fix erroneous behaviors with OOME present."
Ian Rogers [Mon, 21 Jul 2014 15:55:01 +0000 (08:55 -0700)]
Fix erroneous behaviors with OOME present.
Bug:
16454510
Change-Id: I757088a7b82ff73f58aba8d357080028b56442e6
Mathieu Chartier [Tue, 22 Jul 2014 01:07:54 +0000 (01:07 +0000)]
Merge "Revert "Disable adding main and non moving spaces to immune region in GSS"" into lmp-dev
Mathieu Chartier [Tue, 22 Jul 2014 01:07:36 +0000 (01:07 +0000)]
Revert "Disable adding main and non moving spaces to immune region in GSS"
Bug:
16399257
This reverts commit
be0562fb14e6754ee932b8d9c97e2a6df3a91119.
Change-Id: I29e07a8fa1e972990e5bf1ddf8c9a3538ea5f9cf
Ian Rogers [Sat, 19 Jul 2014 11:49:23 +0000 (11:49 +0000)]
am
4436e926: Merge "Fix the name of a black listed run-test."
* commit '
4436e926aa8e64ac7e4c4afb81f2a59b2477045a':
Fix the name of a black listed run-test.
Ian Rogers [Sat, 19 Jul 2014 04:05:58 +0000 (04:05 +0000)]
am
4ebed4ac: Merge "Black list timing sensitive tests from gcverify and gcstress"
* commit '
4ebed4acf8bfdbeef1d907238425baa8b7698806':
Black list timing sensitive tests from gcverify and gcstress
Ian Rogers [Sat, 19 Jul 2014 03:19:01 +0000 (03:19 +0000)]
am
607cf217: Merge "Black list more trace tests."
* commit '
607cf2177cd0faceb6c7ca425774557dd62f092b':
Black list more trace tests.
Andreas Gampe [Fri, 18 Jul 2014 22:41:00 +0000 (15:41 -0700)]
ART: Also accept java.lang.Throwable as a catch-all handler.
Accept catch handlers with catch type of java.lang.Throwable as
catch-all handlers.
(cherry picked from commit
f91baf17ad11a86c84c9fc34ff70feee65a43233)
Bug:
16308310
Change-Id: Ie9b9582ee71c94c82b7695dc6f9c2c6df3d869d8
Andreas Gampe [Fri, 18 Jul 2014 23:45:24 +0000 (23:45 +0000)]
am
d4a6e5cc: Merge "ART: Also accept java.lang.Throwable as a catch-all handler."
* commit '
d4a6e5cc16217bf3e9205d45b728c3d4dc1ddc54':
ART: Also accept java.lang.Throwable as a catch-all handler.
Ian Rogers [Fri, 18 Jul 2014 23:20:46 +0000 (23:20 +0000)]
am
50246792: Merge "Run-test fix."
* commit '
50246792ff37fe25446b70564c0942f04d3e5f48':
Run-test fix.
Ian Rogers [Fri, 18 Jul 2014 22:20:26 +0000 (22:20 +0000)]
am
a9ca9816: Merge "Add a GC stress run that uses a moving collector and small heap sizes."
* commit '
a9ca98163408642e78968e8263ac649843cad504':
Add a GC stress run that uses a moving collector and small heap sizes.
Dave Allison [Fri, 11 Jul 2014 17:11:58 +0000 (17:11 +0000)]
Revert "Revert "Revert "Revert "Add implicit null and stack checks for x86""""
This reverts commit
0025a86411145eb7cd4971f9234fc21c7b4aced1.
Bug:
16256184
Change-Id: Ie0760a0c293aa3b62e2885398a8c512b7a946a73
Conflicts:
compiler/dex/quick/arm64/target_arm64.cc
compiler/image_test.cc
runtime/fault_handler.cc
Conflicts:
compiler/dex/quick/x86/target_x86.cc
Andreas Gampe [Fri, 18 Jul 2014 19:40:18 +0000 (19:40 +0000)]
am
ca906544: Merge "ART: Improve overflow detection in dex file verifier"
* commit '
ca9065446bdffe5f9c940ae7a0c3a73ec636db7e':
ART: Improve overflow detection in dex file verifier
Ian Rogers [Fri, 18 Jul 2014 19:04:09 +0000 (19:04 +0000)]
am
0d55759b: Merge "Add GC verification test rules."
* commit '
0d55759bf30c049b38c88ca492d00bee14667843':
Add GC verification test rules.
Ian Rogers [Fri, 18 Jul 2014 19:04:08 +0000 (19:04 +0000)]
am
bcacf161: Merge "Allow optimizing and trace tests to be not run."
* commit '
bcacf161f43ecf0686154bc5c5ea4b54ba9761d2':
Allow optimizing and trace tests to be not run.
Andreas Gampe [Fri, 18 Jul 2014 19:04:06 +0000 (19:04 +0000)]
am
e72ff802: Merge "ART: Do not attempt to compile a method with too many registers"
* commit '
e72ff8022968b23efedc56c0afdc1d24e8a928c2':
ART: Do not attempt to compile a method with too many registers
Andreas Gampe [Fri, 18 Jul 2014 19:17:01 +0000 (19:17 +0000)]
Merge "ART: Improve overflow detection in dex file verifier"
Andreas Gampe [Fri, 18 Jul 2014 17:25:40 +0000 (17:25 +0000)]
am
f491680e: Merge "ART: Fail dex file verification on invalid access flags" into lmp-dev
* commit '
f491680e304b691c763ea146c5f6147fd3c36adb':
ART: Fail dex file verification on invalid access flags
Dave Allison [Fri, 11 Jul 2014 17:11:58 +0000 (17:11 +0000)]
Revert "Revert "Revert "Revert "Add implicit null and stack checks for x86""""
This reverts commit
0025a86411145eb7cd4971f9234fc21c7b4aced1.
Bug:
16256184
Change-Id: Ie0760a0c293aa3b62e2885398a8c512b7a946a73
Conflicts:
compiler/dex/quick/arm64/target_arm64.cc
compiler/image_test.cc
runtime/fault_handler.cc
Ian Rogers [Fri, 18 Jul 2014 16:58:56 +0000 (16:58 +0000)]
am
72b660ec: Merge "x86_64: Fix GenDalvikArgsRange for 64-bit ref"
* commit '
72b660ec5df56cad8ff6d526b4377a462fc53ce5':
x86_64: Fix GenDalvikArgsRange for 64-bit ref
Narayan Kamath [Fri, 18 Jul 2014 16:09:37 +0000 (16:09 +0000)]
am
66a11617: Merge "Fix identifier size in the heap dump." into lmp-dev
* commit '
66a116172bd943387be667e515a4d86aabe330b0':
Fix identifier size in the heap dump.
Ian Rogers [Fri, 18 Jul 2014 15:46:34 +0000 (15:46 +0000)]
am
027fd2f2: Merge "Improved implementation of inline of String.indexOf"
* commit '
027fd2f21c24100f14c584f18dbe39ec2c4fb6aa':
Improved implementation of inline of String.indexOf
Ian Rogers [Fri, 18 Jul 2014 15:27:00 +0000 (15:27 +0000)]
am
d6523332: Merge "Add optimized assembler implementation of __memcmp16 for x86."
* commit '
d652333207321ff20153e74985366b4d5cdec89a':
Add optimized assembler implementation of __memcmp16 for x86.
Ian Rogers [Fri, 18 Jul 2014 15:15:20 +0000 (15:15 +0000)]
am
03fc5abc: Merge "ART: inline Math.Max/Min (float and double)"
* commit '
03fc5abc4c6372c4583179d35e56f6d521806698':
ART: inline Math.Max/Min (float and double)
Calin Juravle [Fri, 18 Jul 2014 13:36:16 +0000 (13:36 +0000)]
am
d5673e47: Merge "Fix bad comment in class_linker"
* commit '
d5673e47000fcfe8ff8f4df4329a842d4096c226':
Fix bad comment in class_linker
Vladimir Marko [Fri, 18 Jul 2014 11:45:40 +0000 (11:45 +0000)]
am
acb4eb12: Fix GVN to handle normal paths leading to catch entry.
* commit '
acb4eb12108d5890bf722bed91f2e80708af0c75':
Fix GVN to handle normal paths leading to catch entry.
Vladimir Marko [Fri, 18 Jul 2014 11:37:46 +0000 (11:37 +0000)]
am
fd60fbcc: Merge "Fix GVN to handle normal paths leading to catch entry."
* commit '
fd60fbcce909655aad71fa3094aa51d49302f19f':
Fix GVN to handle normal paths leading to catch entry.
Nicolas Geoffray [Fri, 18 Jul 2014 11:37:45 +0000 (11:37 +0000)]
am
990288d5: Merge "We can also run the linear scan register allocator on thumb."
* commit '
990288d5124c436a18a8eaffabd3253945d8a237':
We can also run the linear scan register allocator on thumb.
Vladimir Marko [Thu, 17 Jul 2014 19:50:07 +0000 (20:50 +0100)]
Fix GVN to handle normal paths leading to catch entry.
When the catch block is empty, the catch entry is actually
the normal path block after the try block. Fix the LVN
merge for catch entries that didn't expect it during GVN.
Bug:
16360024
(cherry-picked from
11ca61259be6ec8e03eaff1e98905232728b3d45)
Change-Id: Ifc771edfec702ab2f0ff50bf7f8e69c846d13a46
Andreas Gampe [Fri, 18 Jul 2014 04:49:24 +0000 (21:49 -0700)]
ART: Improve overflow detection in dex file verifier
Overflows were hidden by the design of the checks. Push all range
checks as lists, so we can explicitly check against the count.
Bug:
16017886
Change-Id: I0083f83006ef1e55518b0919dff319004b66dcb8
Andreas Gampe [Fri, 18 Jul 2014 04:02:19 +0000 (04:02 +0000)]
am
f2a85591: Merge "ART: Fail dex file verification on invalid access flags"
* commit '
f2a85591a432037efb3a114d8c6d22f3f6f7a284':
ART: Fail dex file verification on invalid access flags
Ian Rogers [Fri, 18 Jul 2014 03:09:47 +0000 (03:09 +0000)]
am
a2f85ca0: Merge "Avoid race in single thread suspension." into lmp-dev
* commit '
a2f85ca0dd0ddab384f395ab270d844affb8fdac':
Avoid race in single thread suspension.
Andreas Gampe [Fri, 18 Jul 2014 03:09:46 +0000 (03:09 +0000)]
am
493c9beb: ART: Make a soft failure in method verifier hard, add check
* commit '
493c9beb3635d091c159043337836d6fa5d10107':
ART: Make a soft failure in method verifier hard, add check
Ian Rogers [Fri, 18 Jul 2014 02:19:05 +0000 (02:19 +0000)]
am
d5cd8bc8: Merge "Avoid race in single thread suspension."
* commit '
d5cd8bc88d60f4e516e3441651f35c183131e318':
Avoid race in single thread suspension.
Andreas Gampe [Fri, 18 Jul 2014 01:37:58 +0000 (01:37 +0000)]
am
31029988: Merge "ART: Make a soft failure in method verifier hard, add check"
* commit '
31029988d48074b4193e44856eb863305a2658fb':
ART: Make a soft failure in method verifier hard, add check
Andreas Gampe [Fri, 18 Jul 2014 01:37:57 +0000 (01:37 +0000)]
am
9cd20b21: Merge "ART: Use array-inl.h in reference_table_test"
* commit '
9cd20b21c78a85c0ec01a6e282d23a2b2b5df0c5':
ART: Use array-inl.h in reference_table_test
Andreas Gampe [Thu, 17 Jul 2014 23:13:35 +0000 (16:13 -0700)]
ART: Make a soft failure in method verifier hard, add check
Make the soft error of using a primitive type in an instanceof a
hard verifier error.
Add a check when doing check_cast peep-hole optimization to check
whether the cast type is valid.
(cherry picked from commit
00633eb490ad21f711dcfccfb3a70992b2f8a72a)
Bug:
16020300
Change-Id: Icaea560d17804f24a13dc09c115e9ec7039cb472
Hiroshi Yamauchi [Fri, 18 Jul 2014 00:24:34 +0000 (00:24 +0000)]
am
b12d6055: Merge "Fix two read barrier bugs introduced in CL 97882."
* commit '
b12d6055432f6974317ca1b5c9260db0d410df3e':
Fix two read barrier bugs introduced in CL 97882.