OSDN Git Service
Dimitry Ivanov [Sat, 19 Dec 2015 00:49:07 +0000 (00:49 +0000)]
Merge "Use shared namespaces for bundled apps"
Colin Cross [Sat, 19 Dec 2015 00:23:05 +0000 (16:23 -0800)]
Merge "Re-enable optimization for clang arm64 art builds" am:
2cd15c35df
am:
015924124a
* commit '
015924124af455d38aa2a381312d95c8e4b95ce2':
Re-enable optimization for clang arm64 art builds
Colin Cross [Sat, 19 Dec 2015 00:21:00 +0000 (00:21 +0000)]
Merge "Re-enable optimization for clang arm64 art builds"
am:
2cd15c35df
* commit '
2cd15c35df125955e02d9c3c5178d90c6bb9a3bc':
Re-enable optimization for clang arm64 art builds
Colin Cross [Sat, 19 Dec 2015 00:14:02 +0000 (00:14 +0000)]
Merge "Re-enable optimization for clang arm64 art builds"
Colin Cross [Fri, 18 Dec 2015 23:13:51 +0000 (15:13 -0800)]
Re-enable optimization for clang arm64 art builds
The clang bug is fixed, remove -O1 from clang arm64 art builds.
Bug:
23256622
Change-Id: I3f2f6d1e84c5484fd499a94593f1dd53a4a66fbe
Mingyao Yang [Fri, 18 Dec 2015 23:10:57 +0000 (23:10 +0000)]
Merge "For LSE, further optimize stores for singleton references." am:
f8b69bc89a
am:
a471a50b81
* commit '
a471a50b813a1c6dd0c96d174a2cb6947168cd9c':
For LSE, further optimize stores for singleton references.
Alex Light [Fri, 18 Dec 2015 23:10:49 +0000 (23:10 +0000)]
Merge "Make use of new method iterators." am:
045d37ae20
am:
c4affaa361
* commit '
c4affaa361cd73681ad9c493b5b41fae94fb5be0':
Make use of new method iterators.
Roland Levillain [Fri, 18 Dec 2015 23:10:42 +0000 (23:10 +0000)]
Merge "MIPS64: Fuse long and FP compare & condition in Optimizing." am:
280a65b1ea
am:
113e7c3ed6
* commit '
113e7c3ed6c5138d182b87558fce77121dd37ec3':
MIPS64: Fuse long and FP compare & condition in Optimizing.
Roland Levillain [Fri, 18 Dec 2015 23:10:34 +0000 (23:10 +0000)]
Merge "Disable jsr166.LinkedTransferQueueTest#testTransfer2 again." am:
9d9435ff95
am:
579168768e
* commit '
579168768e85aad19f5ae5101542a9963f6f0e4c':
Disable jsr166.LinkedTransferQueueTest#testTransfer2 again.
Nicolas Geoffray [Fri, 18 Dec 2015 23:10:26 +0000 (23:10 +0000)]
Merge "ART: Fix bug in LSE" am:
d9493c2d61
am:
bd968bd36f
* commit '
bd968bd36f9948d27f63cc1a7abb602ab9264f06':
ART: Fix bug in LSE
Roland Levillain [Fri, 18 Dec 2015 23:10:17 +0000 (23:10 +0000)]
Merge "Disable the UnsafeCASObject intrinsic with read barriers." am:
273941131a
am:
e3e6822add
* commit '
e3e6822adde3b53c84723a78412c4bd9eb812da6':
Disable the UnsafeCASObject intrinsic with read barriers.
Mingyao Yang [Fri, 18 Dec 2015 23:07:36 +0000 (23:07 +0000)]
Merge "For LSE, further optimize stores for singleton references."
am:
f8b69bc89a
* commit '
f8b69bc89aa1c657e5b6232be08535e27d078b9e':
For LSE, further optimize stores for singleton references.
Alex Light [Fri, 18 Dec 2015 23:07:28 +0000 (23:07 +0000)]
Merge "Make use of new method iterators."
am:
045d37ae20
* commit '
045d37ae20ae9481f6c967ab5db4240991ff151f':
Make use of new method iterators.
Roland Levillain [Fri, 18 Dec 2015 23:07:20 +0000 (23:07 +0000)]
Merge "MIPS64: Fuse long and FP compare & condition in Optimizing."
am:
280a65b1ea
* commit '
280a65b1ea1f18ab8204a4089630a206dd2d0375':
MIPS64: Fuse long and FP compare & condition in Optimizing.
Roland Levillain [Fri, 18 Dec 2015 23:07:12 +0000 (23:07 +0000)]
Merge "Disable jsr166.LinkedTransferQueueTest#testTransfer2 again."
am:
9d9435ff95
* commit '
9d9435ff95f31c5467912a6a3eb60070cc6f4199':
Disable jsr166.LinkedTransferQueueTest#testTransfer2 again.
Nicolas Geoffray [Fri, 18 Dec 2015 23:07:03 +0000 (23:07 +0000)]
Merge "ART: Fix bug in LSE"
am:
d9493c2d61
* commit '
d9493c2d611601b1f076e5f92a2fe8a9e4ccf78d':
ART: Fix bug in LSE
Roland Levillain [Fri, 18 Dec 2015 23:06:54 +0000 (23:06 +0000)]
Merge "Disable the UnsafeCASObject intrinsic with read barriers."
am:
273941131a
* commit '
273941131aed5248a8c75b2d3f2952a88c7ab02d':
Disable the UnsafeCASObject intrinsic with read barriers.
Mingyao Yang [Fri, 18 Dec 2015 23:02:10 +0000 (23:02 +0000)]
Merge "For LSE, further optimize stores for singleton references."
Aart Bik [Fri, 18 Dec 2015 18:40:28 +0000 (18:40 +0000)]
Merge "Revert "Revert "X86: Use locked add rather than mfence""" am:
570a920d0a
am:
65b5183b0a
* commit '
65b5183b0ae0042ab917eb8afd4f236669c3935d':
Revert "Revert "X86: Use locked add rather than mfence""
Mingyao Yang [Tue, 1 Dec 2015 20:24:36 +0000 (12:24 -0800)]
For LSE, further optimize stores for singleton references.
Loop side effects shouldn't affect singletons whose fields are never stored into
inside a loop.
Change-Id: If3715d7b7e621bb077ef9481072a56f7fec87f2b
Alex Light [Fri, 18 Dec 2015 17:57:40 +0000 (17:57 +0000)]
Merge "Make use of new method iterators."
Roland Levillain [Fri, 18 Dec 2015 17:54:01 +0000 (17:54 +0000)]
Merge "MIPS64: Fuse long and FP compare & condition in Optimizing."
Roland Levillain [Fri, 18 Dec 2015 17:21:25 +0000 (17:21 +0000)]
Merge "Disable jsr166.LinkedTransferQueueTest#testTransfer2 again."
Roland Levillain [Fri, 18 Dec 2015 16:55:35 +0000 (16:55 +0000)]
Disable jsr166.LinkedTransferQueueTest#testTransfer2 again.
This test is failing (again) on the concurrent collector
configuration. Disable it while we investigate.
Bug:
25883050
Change-Id: I54e59a43b730c286e370b5ae01bc5713fe816b61
Nicolas Geoffray [Fri, 18 Dec 2015 14:57:19 +0000 (14:57 +0000)]
Merge "ART: Fix bug in LSE"
David Brazdil [Mon, 14 Dec 2015 16:58:08 +0000 (16:58 +0000)]
ART: Fix bug in LSE
LSE will not remove a load if the type of the heap value does not
match the type of the load. This was a workaround for b/
22538329 but
backfires for integers. For example, 'IntConstant 0' has type int
but can be retrieved from a boolean field. The corresponding store is
removed but not the load, loading uninitialized memory. This fixes the
issue until the workaround is not needed any more.
Change-Id: I2a47783e8d5f93104854e5216b69b6c220832c76
Roland Levillain [Fri, 18 Dec 2015 12:56:47 +0000 (12:56 +0000)]
Merge "Disable the UnsafeCASObject intrinsic with read barriers."
Narayan Kamath [Fri, 18 Dec 2015 11:08:27 +0000 (11:08 +0000)]
Separate OpenjdkJvm.cc into its own shared library.
Change-Id: Ibb0e64b81cb033764a865be1f05be5f3334feaa5
Roland Levillain [Fri, 18 Dec 2015 11:43:38 +0000 (11:43 +0000)]
Disable the UnsafeCASObject intrinsic with read barriers.
The current implementations of the UnsafeCASObject
intrinsics are missing a read barrier. Temporarily disable
them when read barriers are enabled.
Also re-enable the jsr166.LinkedTransferQueueTest tests that
were failing on the concurrent collector configuration, as
the UnsafeCASObject JNI implementation now correctly
implements the read barrier which was missing.
Bug:
25883050
Bug:
26205973
Change-Id: Iaf5d515532949662d0ac6702c9452a00aa0a23e6
Andreas Gampe [Fri, 18 Dec 2015 01:49:38 +0000 (01:49 +0000)]
Merge "ART: Refactor CommonRuntimeTest::SetUp" am:
fae1db92d8
am:
db2980ae9e
* commit '
db2980ae9eca19a577df27b1f05912ed482fb88c':
ART: Refactor CommonRuntimeTest::SetUp
Andreas Gampe [Fri, 18 Dec 2015 01:49:16 +0000 (01:49 +0000)]
Merge "ART: Recognize cortex-a53.a57 for ARM features" am:
5640499750
am:
bb88f60af2
* commit '
bb88f60af2260cca9f5433a02b30bc0f6edea076':
ART: Recognize cortex-a53.a57 for ARM features
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.
Aart Bik [Thu, 17 Dec 2015 23:35:00 +0000 (23:35 +0000)]
Merge "Revert "Revert "X86: Use locked add rather than mfence"""
am:
570a920d0a
* commit '
570a920d0a4a01e159a1be46609ff3db4aedc221':
Revert "Revert "X86: Use locked add rather than mfence""
Aart Bik [Thu, 17 Dec 2015 23:28:06 +0000 (23:28 +0000)]
Merge "Revert "Revert "X86: Use locked add rather than mfence"""
Alex Light [Thu, 17 Dec 2015 21:55:59 +0000 (13:55 -0800)]
Make use of new method iterators.
Change-Id: I1f82f17951339b2054a1dac87bde79f9e803fc4a
Alexey Frunze [Wed, 9 Dec 2015 00:08:02 +0000 (16:08 -0800)]
MIPS64: Fuse long and FP compare & condition in Optimizing.
Bug:
25559148
Change-Id: I2d14ac75460a76848c71c08cffff6d7a18f5f580
Dimitry Ivanov [Tue, 15 Dec 2015 22:08:18 +0000 (14:08 -0800)]
Use shared namespaces for bundled apps
Shared namespaces clone the list of loaded native
libraries from the caller namespace. This allows
classloaders for bundled apps to share already loaded
libraries with default namespace.
Bug: http://b/
26165097
Bug: http://b/
22548808
Change-Id: Ia90b603a0ca97194618b82fb191d6790a4b1f281
Andreas Gampe [Thu, 17 Dec 2015 19:02:47 +0000 (19:02 +0000)]
Merge "ART: Refactor CommonRuntimeTest::SetUp"
am:
fae1db92d8
* commit '
fae1db92d8433d0f75258c190bcf2c940731f036':
ART: Refactor CommonRuntimeTest::SetUp
Andreas Gampe [Thu, 17 Dec 2015 18:55:58 +0000 (18:55 +0000)]
Merge "ART: Refactor CommonRuntimeTest::SetUp"
Andreas Gampe [Thu, 17 Dec 2015 00:54:35 +0000 (16:54 -0800)]
ART: Refactor CommonRuntimeTest::SetUp
Factor out finishing up the runtime. This code will execute the
interpreter to initialize important classes etc., which is not
necessary for testing RuntimeMethod sizes and trampoline entrypoints,
in fact it may violate pointer-size invariants.
Also add InstructionSet parsing tests to the ParsedOptions test.
Change-Id: I75cd00c6d358e1bc962c8f1845244f6400c1cd6c
Andreas Gampe [Thu, 17 Dec 2015 18:40:12 +0000 (18:40 +0000)]
Merge "ART: Recognize cortex-a53.a57 for ARM features"
am:
5640499750
* commit '
5640499750bbc923e42d8cfd0ea9fdcd1c3d1459':
ART: Recognize cortex-a53.a57 for ARM features
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""
Andreas Gampe [Thu, 17 Dec 2015 18:35:41 +0000 (18:35 +0000)]
Merge "ART: Recognize cortex-a53.a57 for ARM features"
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.
Andreas Gampe [Thu, 17 Dec 2015 01:27:30 +0000 (17:27 -0800)]
ART: Recognize cortex-a53.a57 for ARM features
Add cortex-a53.a57 to the hardware-divide recognized set. Add all
ARMv8 Cortex-A variants to the LPAE list.
Bug:
26221616
Change-Id: I0fd577e84952ce23f8a5577ae5061a841240d602
Mark P Mendell [Wed, 16 Dec 2015 19:15:59 +0000 (19:15 +0000)]
Revert "Revert "X86: Use locked add rather than mfence""
This reverts commit
0da3b9117706760e8722029f407da6d0297cc943.
Fix a compilation failure that slipped in somehow.
Change-Id: Ide8681cdc921febb296ea47aa282cc195f154049
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