OSDN Git Service
Alex Light [Thu, 17 Dec 2015 23:48:01 +0000 (15:48 -0800)]
resolve merge conflicts of
9f784b26a1 to master.
Change-Id: I9ebcb6e3d51be922e08e5f867fb8dcaf5cb9788d
Vladimir Marko [Thu, 17 Dec 2015 23:39:24 +0000 (23:39 +0000)]
Merge "Revert "Revert "ART: Reduce the instructions generated by packed switch.""" am:
14c4e90f67
am:
b0276da8ac
* commit '
b0276da8aceda970092b97ccb49aae73755f478b':
Revert "Revert "ART: Reduce the instructions generated by packed switch.""
Nicolas Geoffray [Thu, 17 Dec 2015 23:39:16 +0000 (23:39 +0000)]
Merge "Fix braino in parallel move resolver." am:
6132a3884a
am:
ab971e37cf
* commit '
ab971e37cfecf46e33fd09ce3d18d7b95112818c':
Fix braino in parallel move resolver.
Nicolas Geoffray [Thu, 17 Dec 2015 23:39:07 +0000 (23:39 +0000)]
Merge "Revert "Tweak inlining heuristics."" am:
8e00676291
am:
55c0f49cf1
* commit '
55c0f49cf185a9457acd32d6e5f3a79900983702':
Revert "Tweak inlining heuristics."
Vladimir Marko [Thu, 17 Dec 2015 23:38:59 +0000 (23:38 +0000)]
Merge "Optimizing/ARM: Fix AddConstant() to adhere to set_cc." am:
0ac7a8e505
am:
84f8ba6329
* commit '
84f8ba632953b08fd9d73c1e152cef9c9652c961':
Optimizing/ARM: Fix AddConstant() to adhere to set_cc.
Nicolas Geoffray [Thu, 17 Dec 2015 23:38:51 +0000 (23:38 +0000)]
Merge "Tweak inlining heuristics." am:
ff6ab45547
am:
a2ade148e3
* commit '
a2ade148e34988b19b0e3f5d166c9f71be6e7f47':
Tweak inlining heuristics.
Nicolas Geoffray [Thu, 17 Dec 2015 23:38:42 +0000 (23:38 +0000)]
Merge "Change DCHECK into CHECK to diagnose sporadic crash." am:
2dbab9548b
am:
b7346d5f93
* commit '
b7346d5f936f74a2c320b57c6a9c539d0fb0cc85':
Change DCHECK into CHECK to diagnose sporadic crash.
Nicolas Geoffray [Thu, 17 Dec 2015 23:38:34 +0000 (23:38 +0000)]
Merge "Add some dumping when SIGQUIT for the JIT." am:
bdd12e0e04
am:
88e3342e07
* commit '
88e3342e07d607c07d886eebf195e2d0359067ed':
Add some dumping when SIGQUIT for the JIT.
Hiroshi Yamauchi [Thu, 17 Dec 2015 23:38:23 +0000 (23:38 +0000)]
Merge "Fix (non-intrinsic) UnsafeCASObject for the read barrier config." am:
fb9f4ad455
am:
e667c7622e
* commit '
e667c7622e20b9644c4b2e46e35ba147428ed62c':
Fix (non-intrinsic) UnsafeCASObject for the read barrier config.
Alex Light [Thu, 17 Dec 2015 23:38:14 +0000 (23:38 +0000)]
Merge "Ensure that ClassTable has correct alignment in image." am:
d16bb3f0dc
am:
a93138b7d6
* commit '
a93138b7d679cc21331f098af43de6f1f4fecf5e':
Ensure that ClassTable has correct alignment in image.
Alex Light [Thu, 17 Dec 2015 18:40:04 +0000 (18:40 +0000)]
Merge "Revert "Revert "Combine direct_methods_ and virtual_methods_ fields of mirror::Class"""
am:
ec178ee584
* commit '
ec178ee58447ba23e5954eb824265e9b30f95009':
Revert "Revert "Combine direct_methods_ and virtual_methods_ fields of mirror::Class""
Alex Light [Thu, 17 Dec 2015 18:33:57 +0000 (18:33 +0000)]
Merge "Revert "Revert "Combine direct_methods_ and virtual_methods_ fields of mirror::Class"""
Vladimir Marko [Thu, 17 Dec 2015 16:52:47 +0000 (16:52 +0000)]
Merge "Revert "Revert "ART: Reduce the instructions generated by packed switch."""
am:
14c4e90f67
* commit '
14c4e90f67e71430dade7d4f20920e6352be386e':
Revert "Revert "ART: Reduce the instructions generated by packed switch.""
Vladimir Marko [Thu, 17 Dec 2015 16:46:19 +0000 (16:46 +0000)]
Merge "Revert "Revert "ART: Reduce the instructions generated by packed switch."""
Nicolas Geoffray [Thu, 17 Dec 2015 15:36:35 +0000 (15:36 +0000)]
Merge "Fix braino in parallel move resolver."
am:
6132a3884a
* commit '
6132a3884a912a704010f22ea2991f3d9d432af2':
Fix braino in parallel move resolver.
Nicolas Geoffray [Thu, 17 Dec 2015 15:36:27 +0000 (15:36 +0000)]
Merge "Revert "Tweak inlining heuristics.""
am:
8e00676291
* commit '
8e006762917a2ee193e12c74ba24e69a5e1b9144':
Revert "Tweak inlining heuristics."
Nicolas Geoffray [Thu, 17 Dec 2015 15:27:16 +0000 (15:27 +0000)]
Merge "Fix braino in parallel move resolver."
Nicolas Geoffray [Thu, 17 Dec 2015 15:26:44 +0000 (15:26 +0000)]
Merge "Revert "Tweak inlining heuristics.""
Nicolas Geoffray [Thu, 17 Dec 2015 15:26:21 +0000 (15:26 +0000)]
Revert "Tweak inlining heuristics."
This reverts commit
fcb7613d3aaa9a6802800b6e957aaad51cedf6dc.
Change-Id: Idc0df6a2f68e8b5aa740bb1259f19c2953811510
Vladimir Marko [Thu, 17 Dec 2015 15:23:13 +0000 (15:23 +0000)]
Revert "Revert "ART: Reduce the instructions generated by packed switch.""
This reverts commit
b4c137630fd2226ad07dfd178ab15725374220f1.
The underlying issue was fixed by https://android-review.googlesource.com/188271 .
Bug:
26121945
Change-Id: I58b08eb1a9f0a5c861f8cda93522af64bcf63920
Vladimir Marko [Thu, 17 Dec 2015 15:22:16 +0000 (07:22 -0800)]
Merge "Optimizing/ARM: Fix AddConstant() to adhere to set_cc."
am:
0ac7a8e505
* commit '
0ac7a8e505e14e65ff989c483a40348a3d4b6a86':
Optimizing/ARM: Fix AddConstant() to adhere to set_cc.
Vladimir Marko [Thu, 17 Dec 2015 15:14:59 +0000 (15:14 +0000)]
Merge "Optimizing/ARM: Fix AddConstant() to adhere to set_cc."
Vladimir Marko [Thu, 17 Dec 2015 12:08:08 +0000 (12:08 +0000)]
Optimizing/ARM: Fix AddConstant() to adhere to set_cc.
And improve it to use shorter code sequences.
Bug:
26121945
Change-Id: Ia4f1688652c195a7ca19af36d919388a550e2841
Nicolas Geoffray [Thu, 17 Dec 2015 14:28:35 +0000 (14:28 +0000)]
Fix braino in parallel move resolver.
Reiterating over the moves needs to set i to -1, not 0.
bug:
26241132
Change-Id: Iaae7eac5b421b0ee1b1ce89577c8b951b2d4dae8
Nicolas Geoffray [Thu, 17 Dec 2015 14:06:39 +0000 (14:06 +0000)]
Merge "Tweak inlining heuristics."
am:
ff6ab45547
* commit '
ff6ab45547a629b1e237a1bf4b8530a5c99377e5':
Tweak inlining heuristics.
Nicolas Geoffray [Thu, 17 Dec 2015 13:59:47 +0000 (13:59 +0000)]
Merge "Tweak inlining heuristics."
Nicolas Geoffray [Thu, 17 Dec 2015 12:43:00 +0000 (12:43 +0000)]
Tweak inlining heuristics.
go/lem driven:
Performance:
Richards +41%
CaffeineMethod +43%
ReversiBench: +52%
Towers: +73%
Tak: +85%
Memory use: 7% less memory
CompileTime: 14% increase
CodeSize: 8% increase
Last three measures are now more acceptable given we JIT.
Change-Id: Ic4aa6535d2b76cf3545ef00e9b2ae32330f10745
Narayan Kamath [Thu, 17 Dec 2015 12:34:57 +0000 (12:34 +0000)]
Fix typo in LOG_TAG.
Change-Id: I9d87af857bc2206d70bb9ec7bc3efc8f82c01899
Nicolas Geoffray [Thu, 17 Dec 2015 12:09:33 +0000 (12:09 +0000)]
Merge "Change DCHECK into CHECK to diagnose sporadic crash."
am:
2dbab9548b
* commit '
2dbab9548b538cdb647e5819f7f93d43ae67116a':
Change DCHECK into CHECK to diagnose sporadic crash.
Nicolas Geoffray [Thu, 17 Dec 2015 12:02:19 +0000 (12:02 +0000)]
Merge "Change DCHECK into CHECK to diagnose sporadic crash."
Nicolas Geoffray [Thu, 17 Dec 2015 11:56:01 +0000 (11:56 +0000)]
Change DCHECK into CHECK to diagnose sporadic crash.
bug:
26221227
bug:
25942183
Change-Id: I1325af40098dd336b6c85df8d4fcb7fe26aeac97
Nicolas Geoffray [Thu, 17 Dec 2015 11:40:51 +0000 (11:40 +0000)]
Merge "Add some dumping when SIGQUIT for the JIT."
am:
bdd12e0e04
* commit '
bdd12e0e047245163ddfd7df66c9430ec85624a4':
Add some dumping when SIGQUIT for the JIT.
Nicolas Geoffray [Thu, 17 Dec 2015 11:34:37 +0000 (11:34 +0000)]
Merge "Add some dumping when SIGQUIT for the JIT."
Hiroshi Yamauchi [Thu, 17 Dec 2015 08:16:55 +0000 (08:16 +0000)]
Merge "Fix (non-intrinsic) UnsafeCASObject for the read barrier config."
am:
fb9f4ad455
* commit '
fb9f4ad455eced3a07bef1d4772ab1fe34ec133b':
Fix (non-intrinsic) UnsafeCASObject for the read barrier config.
Hiroshi Yamauchi [Thu, 17 Dec 2015 08:08:12 +0000 (08:08 +0000)]
Merge "Fix (non-intrinsic) UnsafeCASObject for the read barrier config."
Alex Light [Thu, 17 Dec 2015 07:46:59 +0000 (07:46 +0000)]
Merge "Ensure that ClassTable has correct alignment in image."
am:
d16bb3f0dc
* commit '
d16bb3f0dc17d77db7022150d0710fcbb8b6fd9d':
Ensure that ClassTable has correct alignment in image.
Alex Light [Thu, 17 Dec 2015 00:10:38 +0000 (00:10 +0000)]
Merge "Ensure that ClassTable has correct alignment in image."
Alex Light [Wed, 16 Dec 2015 23:52:51 +0000 (15:52 -0800)]
Ensure that ClassTable has correct alignment in image.
Change-Id: I645b44fae1ec129364449af552c745bf32486b1a
Alex Light [Tue, 15 Dec 2015 23:02:47 +0000 (15:02 -0800)]
Revert "Revert "Combine direct_methods_ and virtual_methods_ fields of mirror::Class""
This reverts commit
ae358c1d5cef227b44d6f4971b79e1ab91aa26eb.
Bug:
24618811
Change-Id: I8becf9bae3258450b90cfef5e79589db7c535a4d
Hiroshi Yamauchi [Fri, 11 Dec 2015 23:51:04 +0000 (15:51 -0800)]
Fix (non-intrinsic) UnsafeCASObject for the read barrier config.
Make sure the field contains a to-space reference before attempting the
CAS with a special read barrier to avoid an incorrect CAS failure.
This is only about the non-intrinsic UnsafeCASObject.
This seems to fix some jsr166 test failures.
Also, remove the unused template parameter kMaybeDuringStartup.
Bug:
25883050
Bug:
12687968
Change-Id: Ia6f0d882fa3d90c42f14968672d547babcdf6309
Aart Bik [Wed, 16 Dec 2015 19:26:24 +0000 (19:26 +0000)]
Merge "Revert "X86: Use locked add rather than mfence"" am:
1c70f18dce
am:
0c5b98362d
* commit '
0c5b98362da92d6cfcdffdd6e289ad116be5401b':
Revert "X86: Use locked add rather than mfence"
Aart Bik [Wed, 16 Dec 2015 19:21:38 +0000 (19:21 +0000)]
Merge "Revert "X86: Use locked add rather than mfence""
am:
1c70f18dce
* commit '
1c70f18dce7705ff70147ddebf65a97f66df8d5c':
Revert "X86: Use locked add rather than mfence"
Dimitry Ivanov [Wed, 16 Dec 2015 19:14:07 +0000 (19:14 +0000)]
Merge "Remove references to dlmalloc specific functions" am:
1f312652e1
am:
ed3ae851f0
* commit '
ed3ae851f06f8ff6c2c0e86011e3df83267a7f09':
Remove references to dlmalloc specific functions
Aart Bik [Wed, 16 Dec 2015 19:13:57 +0000 (19:13 +0000)]
Merge "X86: Use locked add rather than mfence" am:
c3ca1e6543
am:
1279e0f901
* commit '
1279e0f9013bc0e395b424e13d7f42c2180570a5':
X86: Use locked add rather than mfence
Aart Bik [Wed, 16 Dec 2015 19:11:38 +0000 (19:11 +0000)]
Merge "Revert "X86: Use locked add rather than mfence""
Dimitry Ivanov [Wed, 16 Dec 2015 19:09:26 +0000 (19:09 +0000)]
Merge "Remove references to dlmalloc specific functions"
am:
1f312652e1
* commit '
1f312652e138e05328b9c4c738d3ecbab2d09ae9':
Remove references to dlmalloc specific functions
Aart Bik [Wed, 16 Dec 2015 19:06:17 +0000 (19:06 +0000)]
Revert "X86: Use locked add rather than mfence"
This reverts commit
7b3e4f99b25c31048a33a08688557b133ad345ab.
Reason: build error on sdk (linux) in git_mirror-aosp-master-with-vendor , please fix first
art/compiler/optimizing/code_generator_x86_64.cc:4032:7: error: use of
undeclared identifier 'codegen_'
codegen_->MemoryFence();
Change-Id: I91f8542cfd944b7425d1981c35872dcdcb901e18
Dimitry Ivanov [Wed, 16 Dec 2015 19:00:55 +0000 (19:00 +0000)]
Merge "Remove references to dlmalloc specific functions"
Aart Bik [Wed, 16 Dec 2015 18:56:49 +0000 (18:56 +0000)]
Merge "X86: Use locked add rather than mfence"
am:
c3ca1e6543
* commit '
c3ca1e6543ef5e717183c059e68ac34597be7022':
X86: Use locked add rather than mfence
Aart Bik [Wed, 16 Dec 2015 18:47:07 +0000 (18:47 +0000)]
Merge "X86: Use locked add rather than mfence"
Andreas Gampe [Wed, 16 Dec 2015 17:29:30 +0000 (17:29 +0000)]
Merge "Make the 008-exceptions test print everything to stdout" am:
9ddcbf69cf
am:
56add6dda1
* commit '
56add6dda1ff45f960f8c59cab0c86a1a3a711f4':
Make the 008-exceptions test print everything to stdout
Roland Levillain [Wed, 16 Dec 2015 17:29:21 +0000 (17:29 +0000)]
Merge "Remove spurious references to kEmitCompilerReadBarrier in MIPS." am:
27f114df49
am:
c971fa3bf6
* commit '
c971fa3bf68424e3edef077df611a9fc4c95a05e':
Remove spurious references to kEmitCompilerReadBarrier in MIPS.
Andreas Gampe [Wed, 16 Dec 2015 17:25:15 +0000 (17:25 +0000)]
Merge "Make the 008-exceptions test print everything to stdout"
am:
9ddcbf69cf
* commit '
9ddcbf69cfa807790e324f7f54e1931bc66d0f5c':
Make the 008-exceptions test print everything to stdout
Roland Levillain [Wed, 16 Dec 2015 17:25:04 +0000 (17:25 +0000)]
Merge "Remove spurious references to kEmitCompilerReadBarrier in MIPS."
am:
27f114df49
* commit '
27f114df49c5e99bb7712310f153eae089ae15a2':
Remove spurious references to kEmitCompilerReadBarrier in MIPS.
Andreas Gampe [Wed, 16 Dec 2015 17:08:53 +0000 (17:08 +0000)]
Merge "Make the 008-exceptions test print everything to stdout"
Roland Levillain [Wed, 16 Dec 2015 17:08:26 +0000 (17:08 +0000)]
Merge "Remove spurious references to kEmitCompilerReadBarrier in MIPS."
Roland Levillain [Wed, 16 Dec 2015 17:06:47 +0000 (17:06 +0000)]
Remove spurious references to kEmitCompilerReadBarrier in MIPS.
We do not support read barriers on MIPS code generators yet.
Also, wrap some long lines in the MIPS64 code generator.
Change-Id: Ia2755590afa60eb9c8fb547e059146ab6518372b
Roland Levillain [Wed, 16 Dec 2015 15:58:46 +0000 (07:58 -0800)]
Merge "MIPS32: Fuse long and FP compare & condition in Optimizing." am:
cbf8af898e
am:
c28f034d4c
* commit '
c28f034d4cd2ca05d4c94b6ffb233b3e6305bcda':
MIPS32: Fuse long and FP compare & condition in Optimizing.
Roland Levillain [Wed, 16 Dec 2015 15:55:01 +0000 (15:55 +0000)]
Merge "MIPS32: Fuse long and FP compare & condition in Optimizing."
am:
cbf8af898e
* commit '
cbf8af898e758cef27687c20c8cf9ac75280026d':
MIPS32: Fuse long and FP compare & condition in Optimizing.
Roland Levillain [Wed, 16 Dec 2015 15:45:29 +0000 (15:45 +0000)]
Merge "MIPS32: Fuse long and FP compare & condition in Optimizing."
Roland Levillain [Wed, 16 Dec 2015 15:35:53 +0000 (15:35 +0000)]
Merge "Adjust tests blacklisted for heap poisoning and read barriers." am:
1329b15f47
am:
93868031e9
* commit '
93868031e9735320f569bf9c313cc265d4396b67':
Adjust tests blacklisted for heap poisoning and read barriers.
Roland Levillain [Wed, 16 Dec 2015 15:32:20 +0000 (07:32 -0800)]
Merge "Disable LinkedTransferQueueTest tests failing on the CC." am:
42d3ab3b2b
am:
57e8115208
* commit '
57e8115208f344140851fc09ba00bd23ea3fa3ed':
Disable LinkedTransferQueueTest tests failing on the CC.
Roland Levillain [Wed, 16 Dec 2015 15:32:10 +0000 (07:32 -0800)]
Merge "Revert "Revert "Introduce support for hardware simulators, starting with ARM64""" am:
4741516396
am:
1660132f68
* commit '
1660132f6885de43ee469c38aefc8214b48d89bd':
Revert "Revert "Introduce support for hardware simulators, starting with ARM64""
Roland Levillain [Wed, 16 Dec 2015 15:32:09 +0000 (15:32 +0000)]
Merge "Adjust tests blacklisted for heap poisoning and read barriers."
am:
1329b15f47
* commit '
1329b15f47751b764ba3162674b2bb997c2ddb90':
Adjust tests blacklisted for heap poisoning and read barriers.
Roland Levillain [Wed, 16 Dec 2015 15:28:36 +0000 (07:28 -0800)]
Merge "Disable LinkedTransferQueueTest tests failing on the CC."
am:
42d3ab3b2b
* commit '
42d3ab3b2bfce4f0e0b6e377dd3997ff0b5cc8da':
Disable LinkedTransferQueueTest tests failing on the CC.
Roland Levillain [Wed, 16 Dec 2015 15:28:27 +0000 (07:28 -0800)]
Merge "Revert "Revert "Introduce support for hardware simulators, starting with ARM64"""
am:
4741516396
* commit '
4741516396e9dbfb3afc2c1d8241a7e4e26a6302':
Revert "Revert "Introduce support for hardware simulators, starting with ARM64""
Roland Levillain [Wed, 16 Dec 2015 15:25:49 +0000 (15:25 +0000)]
Merge "Adjust tests blacklisted for heap poisoning and read barriers."
Roland Levillain [Wed, 16 Dec 2015 15:23:06 +0000 (15:23 +0000)]
Merge "Disable LinkedTransferQueueTest tests failing on the CC."
Roland Levillain [Wed, 16 Dec 2015 15:21:25 +0000 (15:21 +0000)]
Merge "Revert "Revert "Introduce support for hardware simulators, starting with ARM64"""
Roland Levillain [Wed, 16 Dec 2015 15:15:17 +0000 (15:15 +0000)]
Disable LinkedTransferQueueTest tests failing on the CC.
The following libcore tests randomly fail on the
concurrent collector (CC) configuration:
- jsr166.LinkedTransferQueueTest#testTransfer2
- jsr166.LinkedTransferQueueTest#testWaitingConsumer
It seems that it is due to
SR166TestCase.waitForThreadToEnterWaitState timing out.
Disable those tests while we investigate.
Bug:
25883050
Change-Id: I4f310c677869d9e2701738e9734a1f53b5939f18
Kevin Brodsky [Mon, 14 Dec 2015 10:15:04 +0000 (10:15 +0000)]
Make the 008-exceptions test print everything to stdout
Printing to different streams (stderr and stdout) may cause the
messages to be interleaved, making the test fail. Without this patch,
this kind of outcome has been observed:
--- expected.txt 2015-12-09 08:13:50.
583294910 +0000
+++ output.txt 2015-12-09 08:55:35.
635185771 +0000
@@ -1,15 +1,15 @@
Got an NPE: second throw
java.lang.NullPointerException: second throw
- at Main.catchAndRethrow(Main.java:77)
+Static Init
+BadError: This is bad by convention: BadInit
+java.lang.NoClassDefFoundError: BadInit at Main.catchAndRethrow(Main.java:77)
at Main.exceptions_007(Main.java:59)
at Main.main(Main.java:67)
Caused by: java.lang.NullPointerException: first throw
at Main.throwNullPointerException(Main.java:84)
at Main.catchAndRethrow(Main.java:74)
... 2 more
-Static Init
-BadError: This is bad by convention: BadInit
-java.lang.NoClassDefFoundError: BadInit
+
BadError: This is bad by convention: BadInit
Static BadInitNoStringInit
BadErrorNoStringInit: This is bad by convention
Change-Id: Iaabf5ed593d100abf157adf46c1761338227d2cf
Roland Levillain [Wed, 16 Dec 2015 14:21:33 +0000 (14:21 +0000)]
Adjust tests blacklisted for heap poisoning and read barriers.
Bug:
12687968
Change-Id: I7b504661c04d35d10f66a3893a33db8c9db128a1
Nicolas Geoffray [Wed, 16 Dec 2015 12:44:28 +0000 (04:44 -0800)]
Merge "Add test case for bad arm code generation." am:
7f3b38cc23
am:
ed962f1897
* commit '
ed962f1897bf1293c2138ebbb88b73e6ee2d1636':
Add test case for bad arm code generation.
Nicolas Geoffray [Wed, 16 Dec 2015 12:44:19 +0000 (04:44 -0800)]
Merge "Revert "ART: Reduce the instructions generated by packed switch."" am:
d7d3538383
am:
76541772a0
* commit '
76541772a05716e7868a60e7ce0563da771d482e':
Revert "ART: Reduce the instructions generated by packed switch."
Nicolas Geoffray [Wed, 16 Dec 2015 12:40:32 +0000 (04:40 -0800)]
Merge "Add test case for bad arm code generation."
am:
7f3b38cc23
* commit '
7f3b38cc23b638ab84ac01a94e90f0456da3b688':
Add test case for bad arm code generation.
Nicolas Geoffray [Wed, 16 Dec 2015 12:40:22 +0000 (04:40 -0800)]
Merge "Revert "ART: Reduce the instructions generated by packed switch.""
am:
d7d3538383
* commit '
d7d35383838c369a4a1ff5aa21e952f941718c48':
Revert "ART: Reduce the instructions generated by packed switch."
Nicolas Geoffray [Wed, 16 Dec 2015 12:31:26 +0000 (12:31 +0000)]
Merge "Add test case for bad arm code generation."
Nicolas Geoffray [Wed, 16 Dec 2015 12:31:14 +0000 (12:31 +0000)]
Merge "Revert "ART: Reduce the instructions generated by packed switch.""
Nicolas Geoffray [Wed, 16 Dec 2015 12:16:43 +0000 (12:16 +0000)]
Add test case for bad arm code generation.
Bug:
26121945
Change-Id: Ibaedeca24d4208a0bc6b650e549cb68619fd8f64
Nicolas Geoffray [Wed, 16 Dec 2015 12:06:39 +0000 (12:06 +0000)]
Revert "ART: Reduce the instructions generated by packed switch."
This reverts commit
59f054d98f519a3efa992b1c688eb97bdd8bbf55.
bug:
26121945
Change-Id: I8a5ad7ef1f1de8d44787c27528fa3f7f5c2e9cd3
Vladimir Marko [Wed, 16 Dec 2015 11:03:29 +0000 (11:03 +0000)]
Merge "ART: Compile run-tests with Java 7." am:
6b75bc08e8
am:
5783c2ec79
* commit '
5783c2ec79548c161fe886fbcc12fa7889d79be0':
ART: Compile run-tests with Java 7.
Vladimir Marko [Wed, 16 Dec 2015 11:00:00 +0000 (11:00 +0000)]
Merge "ART: Compile run-tests with Java 7."
am:
6b75bc08e8
* commit '
6b75bc08e8e2e5516a23350418bacef2cf982bd9':
ART: Compile run-tests with Java 7.
Vladimir Marko [Wed, 16 Dec 2015 10:50:52 +0000 (10:50 +0000)]
Merge "ART: Compile run-tests with Java 7."
Vladimir Marko [Tue, 15 Dec 2015 16:36:24 +0000 (16:36 +0000)]
ART: Compile run-tests with Java 7.
This fixes run-tests with EXPERIMENTAL_USE_JAVA8=true.
Change-Id: I269664fc65a1d6c244c3f6191e332eb2751b5c0e
Nicolas Geoffray [Wed, 16 Dec 2015 09:46:22 +0000 (09:46 +0000)]
Merge "Revert "ART: Set RTI of Arm64IntermediateAddress"" am:
96f721dd41
am:
c9f66d5d31
* commit '
c9f66d5d31c9d9bb3750b89fd5d7919e4c771b52':
Revert "ART: Set RTI of Arm64IntermediateAddress"
Nicolas Geoffray [Wed, 16 Dec 2015 09:42:47 +0000 (09:42 +0000)]
Merge "Revert "ART: Set RTI of Arm64IntermediateAddress""
am:
96f721dd41
* commit '
96f721dd41f81c967b187d81b6f3e1bcc2a9243c':
Revert "ART: Set RTI of Arm64IntermediateAddress"
Nicolas Geoffray [Wed, 16 Dec 2015 09:34:39 +0000 (09:34 +0000)]
Merge "Revert "ART: Set RTI of Arm64IntermediateAddress""
Nicolas Geoffray [Wed, 16 Dec 2015 09:34:21 +0000 (09:34 +0000)]
Revert "ART: Set RTI of Arm64IntermediateAddress"
This reverts commit
e36ae9435da21542891ceeebb3328f5066c8301e.
Change-Id: If675b02db04bee78cc95da4ed58e545da5085da1
Nicolas Geoffray [Wed, 16 Dec 2015 08:48:39 +0000 (08:48 +0000)]
Merge "Revert "ART: Refactor SsaBuilder for more precise typing info"" am:
b059c8a044
am:
13cd5cad6e
* commit '
13cd5cad6e51f52d7e2ef38c9415d6d03fd994e3':
Revert "ART: Refactor SsaBuilder for more precise typing info"
Nicolas Geoffray [Wed, 16 Dec 2015 08:45:07 +0000 (08:45 +0000)]
Merge "Revert "ART: Refactor SsaBuilder for more precise typing info""
am:
b059c8a044
* commit '
b059c8a044ed3ede1a0eea4b1e92008ced90c013':
Revert "ART: Refactor SsaBuilder for more precise typing info"
Nicolas Geoffray [Wed, 16 Dec 2015 08:35:46 +0000 (08:35 +0000)]
Merge "Revert "ART: Refactor SsaBuilder for more precise typing info""
Alex Light [Wed, 16 Dec 2015 01:53:10 +0000 (01:53 +0000)]
Merge "Revert "Combine direct_methods_ and virtual_methods_ fields of mirror::Class"" am:
bc90a0538e
am:
6e4753f0bc -s ours
* commit '
6e4753f0bc55655e2e178cb16d6a232ebd055543':
Revert "Combine direct_methods_ and virtual_methods_ fields of mirror::Class"
Alex Light [Wed, 16 Dec 2015 01:30:30 +0000 (17:30 -0800)]
Revert "ART: Refactor SsaBuilder for more precise typing info"
This reverts commit
d9510dfc32349eeb4f2145c801f7ba1d5bccfb12.
Bug:
26208284
Bug:
24252151
Bug:
24252100
Bug:
22538329
Bug:
25786318
Change-Id: I5f491becdf076ff51d437d490405ec4e1586c010
Aart Bik [Wed, 16 Dec 2015 01:32:59 +0000 (01:32 +0000)]
Merge "Various induction/range analysis improvements." am:
0bbc1727c4
am:
ec85f7d2a1
* commit '
ec85f7d2a189b176422e82aa03e16c76db48e7be':
Various induction/range analysis improvements.
Alex Light [Wed, 16 Dec 2015 01:30:30 +0000 (01:30 +0000)]
Merge "Revert "Combine direct_methods_ and virtual_methods_ fields of mirror::Class""
am:
bc90a0538e
* commit '
bc90a0538e56f98b8e138cb622e6b9d834244ad9':
Revert "Combine direct_methods_ and virtual_methods_ fields of mirror::Class"
Alexey Frunze [Fri, 4 Dec 2015 00:46:38 +0000 (16:46 -0800)]
MIPS32: Fuse long and FP compare & condition in Optimizing.
This also does a minor clean-up in the assembler and
its test.
Bug:
25559148
Change-Id: I9bad3c500b592a09013b56745f70752eb284a842
Alex Light [Tue, 15 Dec 2015 22:17:21 +0000 (22:17 +0000)]
Merge "Revert "Combine direct_methods_ and virtual_methods_ fields of mirror::Class""
Alex Light [Tue, 15 Dec 2015 22:16:25 +0000 (22:16 +0000)]
Merge "Revert "Combine direct_methods_ and virtual_methods_ fields of mirror::Class""
Alex Light [Tue, 15 Dec 2015 22:15:34 +0000 (22:15 +0000)]
Revert "Combine direct_methods_ and virtual_methods_ fields of mirror::Class"
This reverts commit
9539150b85142c18e9e8c2264b5b6100942667c3.
Change-Id: I596876cd643ec0ad524a56621efb6b89e8886230
Alex Light [Tue, 15 Dec 2015 22:15:26 +0000 (22:15 +0000)]
Revert "Combine direct_methods_ and virtual_methods_ fields of mirror::Class"
This reverts commit
6286a97bea0f584342803a215550038852b24776.
Change-Id: I5b00f6d1350e9c587acd4b185367dc815ea707de