OSDN Git Service
Mathieu Chartier [Wed, 16 Mar 2016 22:12:49 +0000 (22:12 +0000)]
Merge "Add verify-art-runtime usage to dex2oat" am:
9ee48fb
am:
669a45a
* commit '
669a45aed9caa9491e7413f5a16002d196db2033':
Add verify-art-runtime usage to dex2oat
Mathieu Chartier [Wed, 16 Mar 2016 22:09:59 +0000 (22:09 +0000)]
Merge "Add verify-art-runtime usage to dex2oat"
am:
9ee48fb
* commit '
9ee48fbf7395488ea34d7d268edb31d7abe4ebe9':
Add verify-art-runtime usage to dex2oat
Mathieu Chartier [Wed, 16 Mar 2016 22:02:20 +0000 (22:02 +0000)]
Merge "Add verify-art-runtime usage to dex2oat"
Mathieu Chartier [Wed, 16 Mar 2016 21:29:17 +0000 (14:29 -0700)]
Add verify-art-runtime usage to dex2oat
Bug:
27688793
(cherry picked from commit
c6068709a482065d6f5426640f1c9316797508e3)
Change-Id: Idcf6b8023a15c816168ce42456d2bd7b463d0951
Mathieu Chartier [Wed, 16 Mar 2016 21:15:14 +0000 (21:15 +0000)]
Merge "Fix race in AllocEntrypointsInstrumented" am:
6f1b7ec
am:
55d89b8
* commit '
55d89b8ab9c8e71ae61c88f84cbba4949a6ff64a':
Fix race in AllocEntrypointsInstrumented
Mathieu Chartier [Wed, 16 Mar 2016 21:12:52 +0000 (21:12 +0000)]
Merge "Fix race in AllocEntrypointsInstrumented"
am:
6f1b7ec
* commit '
6f1b7ecf61a7be88bcbb259726e99a78a7235d15':
Fix race in AllocEntrypointsInstrumented
Mathieu Chartier [Wed, 16 Mar 2016 21:07:31 +0000 (21:07 +0000)]
Merge "Fix race in AllocEntrypointsInstrumented"
Alex Light [Wed, 16 Mar 2016 20:48:59 +0000 (20:48 +0000)]
Merge "Fix issue with proxy invocation on default methods" am:
932e6bf
am:
8eac39e
* commit '
8eac39ea40664e48965782e9b615632e4e23a0eb':
Fix issue with proxy invocation on default methods
Alex Light [Wed, 16 Mar 2016 20:46:08 +0000 (20:46 +0000)]
Merge "Fix issue with proxy invocation on default methods"
am:
932e6bf
* commit '
932e6bf238a00ae9813e91acb7249cb063fab205':
Fix issue with proxy invocation on default methods
Alex Light [Wed, 16 Mar 2016 20:39:54 +0000 (20:39 +0000)]
Merge "Fix issue with proxy invocation on default methods"
Mathieu Chartier [Wed, 16 Mar 2016 20:39:14 +0000 (20:39 +0000)]
Fix race in AllocEntrypointsInstrumented am:
77d9931
am:
56626ba
* commit '
56626babd4b3445b1ea39f826efa9b791ec743b5':
Fix race in AllocEntrypointsInstrumented
Mathieu Chartier [Wed, 16 Mar 2016 20:36:58 +0000 (20:36 +0000)]
Fix race in AllocEntrypointsInstrumented
am:
77d9931
* commit '
77d993107773b7b9bd7f07ce08d0aaac1631bf84':
Fix race in AllocEntrypointsInstrumented
Mathieu Chartier [Wed, 16 Mar 2016 18:25:29 +0000 (11:25 -0700)]
Fix race in AllocEntrypointsInstrumented
We were using the quick_alloc_entry_points_instrumentation_counter_,
this counter is updated before the threads are suspended. The
allocator could come out of a suspend point, see that threads are
supposedly still no instrumented, continue the allocation, then
suddenly quick_alloc_entry_points_instrumentation_counter_ becomes
1 and alloc_tracking_enabled_ becomes true resulting in a failing
DCHECK.
The fix is to add a boolean that is updated only when the threads
are suspended.
Bug:
27506909
(cherry picked from commit
77d993107773b7b9bd7f07ce08d0aaac1631bf84)
Change-Id: Id12983ef77c4fddb0394e4439ce0829777f1a70b
Mathieu Chartier [Wed, 16 Mar 2016 18:25:29 +0000 (11:25 -0700)]
Fix race in AllocEntrypointsInstrumented
We were using the quick_alloc_entry_points_instrumentation_counter_,
this counter is updated before the threads are suspended. The
allocator could come out of a suspend point, see that threads are
supposedly still no instrumented, continue the allocation, then
suddenly quick_alloc_entry_points_instrumentation_counter_ becomes
1 and alloc_tracking_enabled_ becomes true resulting in a failing
DCHECK.
The fix is to add a boolean that is updated only when the threads
are suspended.
Bug:
27506909
Change-Id: Ic3c6716d2af9c00189ce9271f7a2825b03cdd8a0
David Srbecky [Wed, 16 Mar 2016 18:56:56 +0000 (18:56 +0000)]
Merge "Remove --native-debuggable compiler option." am:
8e57978
am:
15d3f56
* commit '
15d3f562fb91937dc80a6c66b99b928bbdeb43e2':
Remove --native-debuggable compiler option.
Roland Levillain [Wed, 16 Mar 2016 18:56:56 +0000 (18:56 +0000)]
Merge "Make art::HCompare support boolean, byte, short and char inputs." am:
03fdc90
am:
dd6a628
* commit '
dd6a6285dd19308df1fa70e20b85c41773af352e':
Make art::HCompare support boolean, byte, short and char inputs.
Nicolas Geoffray [Wed, 16 Mar 2016 18:56:56 +0000 (18:56 +0000)]
Merge "Forgot space." am:
1a738fc
am:
6dab0aa
* commit '
6dab0aa66bdea34a694df32e664dd54cf9718a58':
Forgot space.
Narayan Kamath [Wed, 16 Mar 2016 18:56:56 +0000 (18:56 +0000)]
Merge "runtime: delete native/java_lang_Runtime.h." am:
615017b
am:
f16d2d3
* commit '
f16d2d3c1d35f7d8fec782b86d6ab2e87a632404':
runtime: delete native/java_lang_Runtime.h.
Nicolas Geoffray [Wed, 16 Mar 2016 18:56:56 +0000 (18:56 +0000)]
Merge "Fix inliner crash related to type propagation." am:
8b5e04b
am:
e6f5e34
* commit '
e6f5e34a0cacf21ad4e71e916271f9137442f63f':
Fix inliner crash related to type propagation.
Sebastien Hertz [Wed, 16 Mar 2016 18:56:56 +0000 (18:56 +0000)]
Merge "Re-enable checker tests 536 and 537" am:
713c519
am:
f098d40
* commit '
f098d403e4c37042b3c00b88a56356a2565c3515':
Re-enable checker tests 536 and 537
David Srbecky [Wed, 16 Mar 2016 18:54:39 +0000 (18:54 +0000)]
Merge "Remove --native-debuggable compiler option."
am:
8e57978
* commit '
8e57978b5f330a322f05644c2db7fa8ce89b1b46':
Remove --native-debuggable compiler option.
Roland Levillain [Wed, 16 Mar 2016 18:54:39 +0000 (18:54 +0000)]
Merge "Make art::HCompare support boolean, byte, short and char inputs."
am:
03fdc90
* commit '
03fdc90721a1874a4aef9adfd8fc1b9b4b4bc249':
Make art::HCompare support boolean, byte, short and char inputs.
Nicolas Geoffray [Wed, 16 Mar 2016 18:54:39 +0000 (18:54 +0000)]
Merge "Forgot space."
am:
1a738fc
* commit '
1a738fc659a7b91456b168d2ee1edcd9eb777569':
Forgot space.
Narayan Kamath [Wed, 16 Mar 2016 18:54:38 +0000 (18:54 +0000)]
Merge "runtime: delete native/java_lang_Runtime.h."
am:
615017b
* commit '
615017b07b05c29604144612897e5f7989948d24':
runtime: delete native/java_lang_Runtime.h.
Nicolas Geoffray [Wed, 16 Mar 2016 18:54:38 +0000 (18:54 +0000)]
Merge "Fix inliner crash related to type propagation."
am:
8b5e04b
* commit '
8b5e04b3573f430dc0475c17f4b3c6ada8aaccf5':
Fix inliner crash related to type propagation.
Sebastien Hertz [Wed, 16 Mar 2016 18:54:38 +0000 (18:54 +0000)]
Merge "Re-enable checker tests 536 and 537"
am:
713c519
* commit '
713c519db15aaa8d6f33b744fd28adddb97a07c2':
Re-enable checker tests 536 and 537
David Srbecky [Wed, 16 Mar 2016 17:54:52 +0000 (17:54 +0000)]
Merge "Remove --native-debuggable compiler option."
Roland Levillain [Wed, 16 Mar 2016 17:54:34 +0000 (17:54 +0000)]
Merge "Make art::HCompare support boolean, byte, short and char inputs."
David Srbecky [Sun, 13 Mar 2016 22:00:07 +0000 (22:00 +0000)]
Remove --native-debuggable compiler option.
Check if both --debuggable and --generate-debug-info are set instead.
History: I have recently added the --native-debuggable flag to control
whether extra stack maps are generated in order to produce accurate
native line number mapping of all generated code. I didn't want to
include it into --debuggable since we compile boot.oat as debuggable
and so it would be affected.
On second thought, it would have been reasonable to generate the extra
stackmaps only if both --debuggable and --generate-debug-info are set,
instead of introducing another compiler flag. This means we do not
affect boot.oat but we still get the extra stack maps if DWARF debug
information is explicitly requested.
Change-Id: I7e5e557e4850a88b3b6f86178d2cb645fb1e1110
Nicolas Geoffray [Wed, 16 Mar 2016 17:10:40 +0000 (17:10 +0000)]
Merge "Forgot space."
Narayan Kamath [Wed, 16 Mar 2016 17:04:52 +0000 (17:04 +0000)]
Merge "runtime: delete native/java_lang_Runtime.h."
Nicolas Geoffray [Wed, 16 Mar 2016 17:01:39 +0000 (17:01 +0000)]
Forgot space.
Change-Id: If9eced6d5bd6d8d0248bad0e7b12095fb5a84d26
Nicolas Geoffray [Wed, 16 Mar 2016 16:58:22 +0000 (16:58 +0000)]
Merge "Fix inliner crash related to type propagation."
Roland Levillain [Tue, 15 Mar 2016 15:02:50 +0000 (15:02 +0000)]
Make art::HCompare support boolean, byte, short and char inputs.
Also extend tests covering the IntegerSignum, LongSignum,
IntegerCompare and LongCompare intrinsics and their
translation into an art::HCompare instruction.
Bug:
27629913
Change-Id: I0afc75ee6e82602b01ec348bbb36a08e8abb8bb8
Sebastien Hertz [Wed, 16 Mar 2016 16:16:41 +0000 (16:16 +0000)]
Merge "Re-enable checker tests 536 and 537"
Calin Juravle [Wed, 16 Mar 2016 16:03:02 +0000 (16:03 +0000)]
Merge "Clean up NullCheck generation and record stats about it." am:
914d71e
am:
7cee2fe
* commit '
7cee2fe1c39534d2dda4b80efcd7e7f098bc9b32':
Clean up NullCheck generation and record stats about it.
Calin Juravle [Wed, 16 Mar 2016 16:03:02 +0000 (16:03 +0000)]
Merge "Improve compiler stats" am:
1583e62
am:
c665f76
* commit '
c665f760f39d24be9101c448d884b46be41cf977':
Improve compiler stats
Nicolas Geoffray [Wed, 16 Mar 2016 16:03:02 +0000 (16:03 +0000)]
Merge "Add more statistics for memory use of the JIT." am:
532da65
am:
b9d5e9b
* commit '
b9d5e9b5e0cbe0dbcee0c3d13adee36f31b3e238':
Add more statistics for memory use of the JIT.
Calin Juravle [Wed, 16 Mar 2016 16:00:36 +0000 (16:00 +0000)]
Merge "Clean up NullCheck generation and record stats about it."
am:
914d71e
* commit '
914d71ead70bb6f2084b2ed39a9fd58fd014f67d':
Clean up NullCheck generation and record stats about it.
Calin Juravle [Wed, 16 Mar 2016 16:00:36 +0000 (16:00 +0000)]
Merge "Improve compiler stats"
am:
1583e62
* commit '
1583e624d4c970d8e571b265b9a8f08402d91f82':
Improve compiler stats
Nicolas Geoffray [Wed, 16 Mar 2016 16:00:35 +0000 (16:00 +0000)]
Merge "Add more statistics for memory use of the JIT."
am:
532da65
* commit '
532da65d01f13facd261367beb34ee41146671d4':
Add more statistics for memory use of the JIT.
Sebastien Hertz [Wed, 16 Mar 2016 15:20:10 +0000 (16:20 +0100)]
Re-enable checker tests 536 and 537
They were disabled due to a bug in Jack that is fixed now.
Bug:
25635944
Change-Id: Id68824a8b4abbb6710e61897ffb3ed5daf839413
Nicolas Geoffray [Wed, 16 Mar 2016 15:16:06 +0000 (15:16 +0000)]
Fix inliner crash related to type propagation.
- Do not agressively try to resolve a return type.
- Deal with unresolved return type.
bug:
25492619
Change-Id: Idc9c96a0b376fe5ee86b411c02ce7078c7f48c84
Narayan Kamath [Wed, 16 Mar 2016 15:11:15 +0000 (15:11 +0000)]
runtime: delete native/java_lang_Runtime.h.
Now unused, except for an unnecessary include.
bug:
27387202
Change-Id: Ie77dc0da156a64e8ea03af1878b44d20c16c5ae5
Calin Juravle [Wed, 16 Mar 2016 14:40:08 +0000 (14:40 +0000)]
Merge "Clean up NullCheck generation and record stats about it."
Calin Juravle [Wed, 16 Mar 2016 14:39:49 +0000 (14:39 +0000)]
Merge "Improve compiler stats"
Nicolas Geoffray [Wed, 16 Mar 2016 14:39:16 +0000 (14:39 +0000)]
Merge "Add more statistics for memory use of the JIT."
David Srbecky [Wed, 16 Mar 2016 14:22:42 +0000 (14:22 +0000)]
Merge "Call __jit_debug_register_code() indirectly via global variable." am:
011b511
am:
e3ac49b
* commit '
e3ac49b02a07024649b64f915c2b7cc812768882':
Call __jit_debug_register_code() indirectly via global variable.
Nicolas Geoffray [Wed, 16 Mar 2016 14:20:06 +0000 (14:20 +0000)]
Add more statistics for memory use of the JIT.
Collect data for stack maps, profiling info, and compiled code.
bug:
27520994
Change-Id: Ic87361230c96ce0090027a37d750e948d806c597
David Srbecky [Wed, 16 Mar 2016 14:20:23 +0000 (14:20 +0000)]
Merge "Call __jit_debug_register_code() indirectly via global variable."
am:
011b511
* commit '
011b51175b9e4c96f26aea376afdf23b84276e9a':
Call __jit_debug_register_code() indirectly via global variable.
David Srbecky [Wed, 16 Mar 2016 14:13:02 +0000 (14:13 +0000)]
Merge "Call __jit_debug_register_code() indirectly via global variable."
Calin Juravle [Wed, 16 Mar 2016 14:05:09 +0000 (14:05 +0000)]
Clean up NullCheck generation and record stats about it.
This removes redundant code from the generators and allows for easier
stat recording.
Change-Id: Iccd4368f9e9d87a6fecb863dee4e2145c97851c4
Calin Juravle [Wed, 16 Mar 2016 11:53:41 +0000 (11:53 +0000)]
Improve compiler stats
- report the max size of arena alloc
- report how many virtual or interface invokes were inlined
Change-Id: I82f154a8e25b5e3890181a1aa11346cdc3f93e37
Nicolas Geoffray [Wed, 16 Mar 2016 14:02:58 +0000 (14:02 +0000)]
Merge "Set USE_JACK to true." am:
9a70d58
am:
e02c237
* commit '
e02c237f89a43d8962d128a83901aea5ff5fcb2f':
Set USE_JACK to true.
Nicolas Geoffray [Wed, 16 Mar 2016 14:00:26 +0000 (14:00 +0000)]
Merge "Set USE_JACK to true."
am:
9a70d58
* commit '
9a70d583029958d033f2ceca864032ca8fdd6598':
Set USE_JACK to true.
Nicolas Geoffray [Wed, 16 Mar 2016 13:55:51 +0000 (13:55 +0000)]
Merge "Set USE_JACK to true."
Nicolas Geoffray [Wed, 16 Mar 2016 10:55:57 +0000 (10:55 +0000)]
Set USE_JACK to true.
This fixes running checker when just doing art/test/run-test.
Change-Id: Icfac5896cdfd64eb16b0127d5f16f552b93ad03e
Nicolas Geoffray [Wed, 16 Mar 2016 13:01:50 +0000 (13:01 +0000)]
Merge "Move specific build rule of 529 into the default script." am:
767c3b9
am:
6016aef
* commit '
6016aefdd2dedbc3c024248a2f6ea99d7832273e':
Move specific build rule of 529 into the default script.
Nicolas Geoffray [Wed, 16 Mar 2016 12:59:29 +0000 (12:59 +0000)]
Merge "Move specific build rule of 529 into the default script."
am:
767c3b9
* commit '
767c3b9779cfa877867ba0e8b9f66a726cf24ecf':
Move specific build rule of 529 into the default script.
Narayan Kamath [Wed, 16 Mar 2016 12:56:32 +0000 (12:56 +0000)]
runtime: delete native/java_lang_Runtime.cc am:
f525272
am:
6cede46
* commit '
6cede46aadca418414a636397262c099b8d1b1eb':
runtime: delete native/java_lang_Runtime.cc
Narayan Kamath [Wed, 16 Mar 2016 12:54:15 +0000 (12:54 +0000)]
runtime: delete native/java_lang_Runtime.cc
am:
f525272
* commit '
f525272b1edec721058e7d888545dd5d97b5045d':
runtime: delete native/java_lang_Runtime.cc
Nicolas Geoffray [Wed, 16 Mar 2016 12:52:06 +0000 (12:52 +0000)]
Merge "Move specific build rule of 529 into the default script."
Nicolas Geoffray [Wed, 16 Mar 2016 12:39:17 +0000 (12:39 +0000)]
Move specific build rule of 529 into the default script.
Change-Id: I90ff4b4c64a4e077b360bbec7a8e21b52139f395
Narayan Kamath [Tue, 15 Mar 2016 14:47:29 +0000 (14:47 +0000)]
runtime: delete native/java_lang_Runtime.cc
We're now using Runtime.c from ojluni, which does the same set
of things via the JVM interface. This removes unnecessary duplication
of code between Runtime.cc and OpenJdkJvm.cc.
Also includes a few changes to JVM_NativeLoad to bring it in sync
with the version in Runtime.cc.
bug:
27387202
(cherry picked from commit
5f97157263d1b52bf4aea523b28294b21d694da1)
Change-Id: Ic2848755505a0cb25da8237150b07dadf0a42929
Nicolas Geoffray [Wed, 16 Mar 2016 11:25:46 +0000 (11:25 +0000)]
Merge "Collect memory use for the JIT." am:
f808e8a
am:
516c19e
* commit '
516c19e0bad42273cb7f5c93c3402d0389c357f6':
Collect memory use for the JIT.
Nicolas Geoffray [Wed, 16 Mar 2016 11:25:46 +0000 (11:25 +0000)]
Merge "Accept boolean as an input of HDivZeroCheck." am:
576a13a
am:
d3ad597
* commit '
d3ad597d5bcf11f85ff8afd4b873c51bd30145e8':
Accept boolean as an input of HDivZeroCheck.
Nicolas Geoffray [Wed, 16 Mar 2016 11:23:13 +0000 (11:23 +0000)]
Merge "Collect memory use for the JIT."
am:
f808e8a
* commit '
f808e8a0cc218c2b98023ef0e91f3c5b74ad2962':
Collect memory use for the JIT.
Nicolas Geoffray [Wed, 16 Mar 2016 11:23:13 +0000 (11:23 +0000)]
Merge "Accept boolean as an input of HDivZeroCheck."
am:
576a13a
* commit '
576a13ab2f1bc82e72245db5fbb4dd8587b19bf1':
Accept boolean as an input of HDivZeroCheck.
Nicolas Geoffray [Wed, 16 Mar 2016 11:19:18 +0000 (11:19 +0000)]
Merge "Collect memory use for the JIT."
Nicolas Geoffray [Tue, 8 Mar 2016 16:57:48 +0000 (16:57 +0000)]
Collect memory use for the JIT.
bug:
27520994
Change-Id: I67b0c5b822001bfde8738a988c1ade69f1a26e3f
Nicolas Geoffray [Wed, 16 Mar 2016 11:15:43 +0000 (11:15 +0000)]
Merge "Accept boolean as an input of HDivZeroCheck."
Nicolas Geoffray [Wed, 16 Mar 2016 11:03:54 +0000 (11:03 +0000)]
Accept boolean as an input of HDivZeroCheck.
All our arithmetic operations accept it.
bug:
27624718
Change-Id: I1f6bb95dc77ecb3fb2fcabb35a93b31c524bfa0a
Nicolas Geoffray [Wed, 16 Mar 2016 11:03:43 +0000 (11:03 +0000)]
Merge "Fix checker test." am:
41954d8
am:
e7bf193
* commit '
e7bf19386393e4de5eb20ca643cd91552f66b8e4':
Fix checker test.
Nicolas Geoffray [Wed, 16 Mar 2016 11:01:20 +0000 (11:01 +0000)]
Merge "Fix checker test."
am:
41954d8
* commit '
41954d8f0d1cdada0886875508b0653b1be4996c':
Fix checker test.
Nicolas Geoffray [Wed, 16 Mar 2016 10:54:51 +0000 (10:54 +0000)]
Merge "Fix checker test."
Nicolas Geoffray [Wed, 16 Mar 2016 10:41:53 +0000 (10:41 +0000)]
Fix checker test.
Change-Id: I1388868ca69c9f964f2019ff79d5c7aa0f00d57c
Nicolas Geoffray [Wed, 16 Mar 2016 10:31:40 +0000 (10:31 +0000)]
Merge "Revert "Assembly TLAB allocation fast path for arm64."" am:
d35f4a2
am:
16a9481
* commit '
16a94819df173efb9656106680c46bbcadee7aeb':
Revert "Assembly TLAB allocation fast path for arm64."
Nicolas Geoffray [Wed, 16 Mar 2016 10:31:40 +0000 (10:31 +0000)]
Merge "Revert "Tentative fix for build breakage with read barriers."" am:
4344e11
am:
073bd90
* commit '
073bd90912b7060139f58ad4014384bfb30b72a3':
Revert "Tentative fix for build breakage with read barriers."
Nicolas Geoffray [Wed, 16 Mar 2016 10:29:11 +0000 (10:29 +0000)]
Merge "Revert "Assembly TLAB allocation fast path for arm64.""
am:
d35f4a2
* commit '
d35f4a2eacf9ee9c9d75bb0c00eec7ae31ad1949':
Revert "Assembly TLAB allocation fast path for arm64."
Nicolas Geoffray [Wed, 16 Mar 2016 10:29:11 +0000 (10:29 +0000)]
Merge "Revert "Tentative fix for build breakage with read barriers.""
am:
4344e11
* commit '
4344e11598b3079032773ad7e381658f39bed92e':
Revert "Tentative fix for build breakage with read barriers."
Nicolas Geoffray [Wed, 16 Mar 2016 10:23:43 +0000 (10:23 +0000)]
Merge "Revert "Assembly TLAB allocation fast path for arm64.""
Nicolas Geoffray [Wed, 16 Mar 2016 10:23:03 +0000 (10:23 +0000)]
Revert "Assembly TLAB allocation fast path for arm64."
Assembly code does not compile
Bug:
9986565
This reverts commit
b7e52b02a82c69e59c88f06945fb21672dfe9923.
Change-Id: I80de1bcd6270e2d76f79cb708811a41c039ea5bb
Nicolas Geoffray [Wed, 16 Mar 2016 10:23:20 +0000 (10:23 +0000)]
Merge "Revert "Tentative fix for build breakage with read barriers.""
Nicolas Geoffray [Wed, 16 Mar 2016 10:22:09 +0000 (10:22 +0000)]
Revert "Tentative fix for build breakage with read barriers."
This reverts commit
448f21e2c1cb43b193736598719979ebd2aed0b0.
Change-Id: Id821effa06697b1464581bcd9c8f34cd0ea69896
Vladimir Marko [Wed, 16 Mar 2016 10:21:46 +0000 (10:21 +0000)]
Merge "Optimizing: Fix arm64 shifter operand test." am:
a0ef558
am:
001bde0
* commit '
001bde00bedde01cb2bbdaf65ecdd8a56846920c':
Optimizing: Fix arm64 shifter operand test.
Roland Levillain [Wed, 16 Mar 2016 10:21:46 +0000 (10:21 +0000)]
Merge "Make art::HCompare side effect free." am:
3e90681
am:
c96960e
* commit '
c96960ed067d2ee569b461eb1a2780470939877c':
Make art::HCompare side effect free.
Vladimir Marko [Wed, 16 Mar 2016 10:19:17 +0000 (10:19 +0000)]
Merge "Optimizing: Fix arm64 shifter operand test."
am:
a0ef558
* commit '
a0ef5582d325485866d34fbaa6276a43bc72de09':
Optimizing: Fix arm64 shifter operand test.
Roland Levillain [Wed, 16 Mar 2016 10:19:17 +0000 (10:19 +0000)]
Merge "Make art::HCompare side effect free."
am:
3e90681
* commit '
3e906819c33d19c9586ecd9441f0ffb8433f2bad':
Make art::HCompare side effect free.
Vladimir Marko [Wed, 16 Mar 2016 10:13:48 +0000 (10:13 +0000)]
Merge "Optimizing: Fix arm64 shifter operand test."
Roland Levillain [Wed, 16 Mar 2016 10:12:39 +0000 (10:12 +0000)]
Merge "Make art::HCompare side effect free."
Vladimir Marko [Wed, 16 Mar 2016 10:06:49 +0000 (10:06 +0000)]
Merge "ART: Fix ignoring duplicate fields." am:
d9ebad9
am:
9506bb1
* commit '
9506bb186f4186001a4a7ff4fb3755fe40c2407a':
ART: Fix ignoring duplicate fields.
Vladimir Marko [Wed, 16 Mar 2016 10:04:21 +0000 (10:04 +0000)]
Merge "ART: Fix ignoring duplicate fields."
am:
d9ebad9
* commit '
d9ebad9b52605ed785222a86c84e58fa7cb66686':
ART: Fix ignoring duplicate fields.
Vladimir Marko [Wed, 16 Mar 2016 10:02:39 +0000 (10:02 +0000)]
Optimizing: Fix arm64 shifter operand test.
Generic simplifier removes 3 shifts from the test since
https://android-review.googlesource.com/208199
and then the arm64-specific shifter operands don't apply.
Bug:
27638111
Change-Id: Ie6c6ec1f40ec263f3e40e8129f29e0191fd9de50
Vladimir Marko [Wed, 16 Mar 2016 09:56:14 +0000 (09:56 +0000)]
Merge "ART: Fix ignoring duplicate fields."
Nicolas Geoffray [Wed, 16 Mar 2016 09:46:46 +0000 (09:46 +0000)]
Merge "Tentative fix for build breakage with read barriers." am:
41bcd81
am:
9136bb2
* commit '
9136bb20ce7bb8bdd283177390483fb47d0c669c':
Tentative fix for build breakage with read barriers.
Nicolas Geoffray [Wed, 16 Mar 2016 09:44:17 +0000 (09:44 +0000)]
Merge "Tentative fix for build breakage with read barriers."
am:
41bcd81
* commit '
41bcd81aebfb48cb848c84bc40f241a18c376af3':
Tentative fix for build breakage with read barriers.
Nicolas Geoffray [Wed, 16 Mar 2016 09:37:52 +0000 (09:37 +0000)]
Merge "Tentative fix for build breakage with read barriers."
Nicolas Geoffray [Wed, 16 Mar 2016 09:36:35 +0000 (09:36 +0000)]
Tentative fix for build breakage with read barriers.
Change-Id: I490821357525bdeb19c330f350635bd645f8ab53
Nicolas Geoffray [Wed, 16 Mar 2016 09:30:09 +0000 (09:30 +0000)]
Merge "Fix HDoubleConstant::IsZero and HFloatConstant::IsZero." am:
4d20c08
am:
f8cc36d
* commit '
f8cc36d212d13d8fbc44acd162e2f2e3616ca77f':
Fix HDoubleConstant::IsZero and HFloatConstant::IsZero.
Nicolas Geoffray [Wed, 16 Mar 2016 09:27:50 +0000 (09:27 +0000)]
Merge "Fix HDoubleConstant::IsZero and HFloatConstant::IsZero."
am:
4d20c08
* commit '
4d20c081ec372a5ec2a405e9ac4521fe09148922':
Fix HDoubleConstant::IsZero and HFloatConstant::IsZero.