OSDN Git Service
David Srbecky [Wed, 23 Dec 2015 12:16:11 +0000 (04:16 -0800)]
Merge "Move debug symbol writing code to elf_writer_debug.cc" am:
d674bf7ba2
am:
cebb1d3b9c
* commit '
cebb1d3b9cf2e7f99377dd41d379597475f54df4':
Move debug symbol writing code to elf_writer_debug.cc
David Srbecky [Wed, 23 Dec 2015 12:14:10 +0000 (04:14 -0800)]
Merge "Move debug symbol writing code to elf_writer_debug.cc"
am:
d674bf7ba2
* commit '
d674bf7ba2a209790cea8ef8d935480ef515c9e1':
Move debug symbol writing code to elf_writer_debug.cc
David Srbecky [Wed, 23 Dec 2015 12:10:14 +0000 (12:10 +0000)]
Merge "Move debug symbol writing code to elf_writer_debug.cc"
David Srbecky [Wed, 23 Dec 2015 12:03:37 +0000 (04:03 -0800)]
Merge "Move JIT debugger interface code to its own file." am:
975dd72796
am:
a9d3a9d87d
* commit '
a9d3a9d87d77c31630efc81010dbea0375efaff9':
Move JIT debugger interface code to its own file.
David Srbecky [Wed, 23 Dec 2015 12:01:50 +0000 (12:01 +0000)]
Merge "Move JIT debugger interface code to its own file."
am:
975dd72796
* commit '
975dd7279694f345bd4fc31b04ff3275f3082961':
Move JIT debugger interface code to its own file.
David Srbecky [Wed, 23 Dec 2015 11:57:36 +0000 (11:57 +0000)]
Merge "Move JIT debugger interface code to its own file."
Vladimir Marko [Wed, 23 Dec 2015 10:10:44 +0000 (02:10 -0800)]
Merge "Rewrite HInstruction::Is/As<type>()." am:
e74927c0cd
am:
d56e0503e0
* commit '
d56e0503e07639c105df45ae49a5764b577a17ef':
Rewrite HInstruction::Is/As<type>().
Vladimir Marko [Wed, 23 Dec 2015 10:08:59 +0000 (02:08 -0800)]
Merge "Rewrite HInstruction::Is/As<type>()."
am:
e74927c0cd
* commit '
e74927c0cded59b6687020c6480205d4488a69fc':
Rewrite HInstruction::Is/As<type>().
Vladimir Marko [Wed, 23 Dec 2015 10:06:09 +0000 (10:06 +0000)]
Merge "Rewrite HInstruction::Is/As<type>()."
Vladimir Marko [Mon, 23 Nov 2015 19:49:34 +0000 (19:49 +0000)]
Rewrite HInstruction::Is/As<type>().
Make Is<type>() and As<type>() non-virtual for concrete
instruction types, relying on GetKind(), and mark GetKind()
as PURE to improve optimization opportunities. This reduces
the number of relocations in libart-compiler.so's .rel.dyn
section by ~4K, or ~44%, and in .data.rel.ro by ~18K, or
~65%. The file is 96KiB smaller for Nexus 5, including 8KiB
reduction of the .text section.
Unfortunately, the g++/clang++ __attribute__((pure)) is not
strong enough to avoid duplicated virtual calls and we would
need the C++ [[pure]] attribute proposed in n3744 instead.
To work around this deficiency, we introduce an extra
non-virtual indirection for GetKind(), so that the compiler
can optimize common expressions such as
instruction->IsAdd() || instruction->IsSub()
or
instruction->IsAdd() && instruction->AsAdd()->...
which contain two virtual calls to GetKind() after inlining.
Change-Id: I83787de0671a5cb9f5b0a5f4a536cef239d5b401
Narayan Kamath [Tue, 22 Dec 2015 14:56:59 +0000 (14:56 +0000)]
Override notice file for OpenJdk based modules.
Change-Id: Iff63708c83c2a18b82f0de6aa884e1388ed8b32b
Yohann Roussel [Tue, 22 Dec 2015 15:41:02 +0000 (07:41 -0800)]
Merge "Ensure Jack server is running before any use" am:
b592885f0b
am:
cf96ba33d4
* commit '
cf96ba33d4bbded5c79880863d406d06b88f6963':
Ensure Jack server is running before any use
Yohann Roussel [Wed, 9 Dec 2015 11:02:46 +0000 (12:02 +0100)]
Ensure Jack server is running before any use
Change-Id: Ie978e994945946139e0faf583c5d767a15ab060e
Yohann Roussel [Tue, 22 Dec 2015 14:04:08 +0000 (14:04 +0000)]
Merge "Ensure Jack server is running before any use"
am:
b592885f0b
* commit '
b592885f0b03c6518ccc9df4962c112cc2089131':
Ensure Jack server is running before any use
Yohann Roussel [Tue, 22 Dec 2015 13:59:49 +0000 (13:59 +0000)]
Merge "Ensure Jack server is running before any use"
Hiroshi Yamauchi [Mon, 21 Dec 2015 23:35:01 +0000 (23:35 +0000)]
Merge "Treat thread state kWaitingWeakGcRootRead as kJavaRunnable." am:
1201804d18
am:
ae66db4953
* commit '
ae66db49535fcddc2b1d24fe7c8324317071dfe9':
Treat thread state kWaitingWeakGcRootRead as kJavaRunnable.
Mathieu Chartier [Mon, 21 Dec 2015 23:34:53 +0000 (23:34 +0000)]
Merge "Fix multiple image space handing for SS collector" am:
10e2607281
am:
7b5d3041a2
* commit '
7b5d3041a2b84ed55f8655af31705e1a591ad69b':
Fix multiple image space handing for SS collector
Mathieu Chartier [Mon, 21 Dec 2015 23:33:23 +0000 (23:33 +0000)]
Merge "Fix lock ordering violation" am:
adc183c711
am:
b05ef624fe
* commit '
b05ef624fe26ce48d12ce0fb201087f8d9befecc':
Fix lock ordering violation
Dimitry Ivanov [Mon, 21 Dec 2015 23:33:15 +0000 (23:33 +0000)]
Merge "Use shared namespaces for bundled apps" am:
aa944b9d4d
am:
50b5b82b7f
* commit '
50b5b82b7f246c3cdd7dfcd34a3eec1ea5e95262':
Use shared namespaces for bundled apps
Shinichiro Hamaji [Mon, 21 Dec 2015 23:33:06 +0000 (23:33 +0000)]
Merge "Do not use 0 in recipe" am:
d255fe5c11
am:
ede57d4a5b
* commit '
ede57d4a5ba83a25c9b64061cc9963e17db02127':
Do not use $? in recipe
Hiroshi Yamauchi [Mon, 21 Dec 2015 23:29:53 +0000 (23:29 +0000)]
Merge "Treat thread state kWaitingWeakGcRootRead as kJavaRunnable."
am:
1201804d18
* commit '
1201804d1813d7db0accead9721d67c40b3de564':
Treat thread state kWaitingWeakGcRootRead as kJavaRunnable.
Mathieu Chartier [Mon, 21 Dec 2015 23:29:45 +0000 (23:29 +0000)]
Merge "Fix multiple image space handing for SS collector"
am:
10e2607281
* commit '
10e2607281ae3d6c5fa814b9986bac5f8b47d325':
Fix multiple image space handing for SS collector
Hiroshi Yamauchi [Mon, 21 Dec 2015 23:25:23 +0000 (23:25 +0000)]
Merge "Treat thread state kWaitingWeakGcRootRead as kJavaRunnable."
Mathieu Chartier [Mon, 21 Dec 2015 23:17:17 +0000 (23:17 +0000)]
Merge "Fix multiple image space handing for SS collector"
Mathieu Chartier [Mon, 21 Dec 2015 23:16:34 +0000 (23:16 +0000)]
Merge "Fix lock ordering violation"
am:
adc183c711
* commit '
adc183c711731049800d0798ed35a5bc9a681a61':
Fix lock ordering violation
Dimitry Ivanov [Mon, 21 Dec 2015 23:16:20 +0000 (23:16 +0000)]
Merge "Use shared namespaces for bundled apps"
am:
aa944b9d4d
* commit '
aa944b9d4d447d2746f13327084a19daebf83ee4':
Use shared namespaces for bundled apps
Mathieu Chartier [Mon, 21 Dec 2015 23:11:40 +0000 (23:11 +0000)]
Merge "Fix lock ordering violation"
Dimitry Ivanov [Mon, 21 Dec 2015 23:10:49 +0000 (23:10 +0000)]
Merge "Use shared namespaces for bundled apps"
Shinichiro Hamaji [Mon, 21 Dec 2015 23:07:09 +0000 (23:07 +0000)]
Merge "Do not use 0 in recipe"
am:
d255fe5c11
* commit '
d255fe5c11ff0fa13a2ca9f73c7c43a290dc370e':
Do not use $? in recipe
Shinichiro Hamaji [Mon, 21 Dec 2015 22:45:44 +0000 (22:45 +0000)]
Merge "Do not use $? in recipe"
Hiroshi Yamauchi [Mon, 21 Dec 2015 22:06:23 +0000 (14:06 -0800)]
Treat thread state kWaitingWeakGcRootRead as kJavaRunnable.
Like kSuspended, kWaitingWeakGcRootRead means temporarily waiting for
GC's purpose rather than the thread is waiting on a monitor.
This may fix some jsr166 test failures.
Bug:
25883050
Bug:
12687968
Change-Id: Ib53e18c0fb2ff95aa0491b1531201e583288684e
Mathieu Chartier [Mon, 21 Dec 2015 21:02:14 +0000 (13:02 -0800)]
Fix lock ordering violation
Move ros alloc lock ordering above transaction lock level.
Bug:
26292262
Change-Id: I55f75bd86b413ce193d4df890a39a9c459bc2034
Mathieu Chartier [Wed, 16 Dec 2015 23:56:15 +0000 (15:56 -0800)]
Fix multiple image space handing for SS collector
We need to visit objets that don't have a mod-union table even if
collect_from_space_only_ is false.
Bug:
22858531
Change-Id: I3144ccb84d7f7bcdf0560f6425c5e5292d3a2082
Mathieu Chartier [Mon, 21 Dec 2015 20:15:39 +0000 (12:15 -0800)]
Merge "Rename NullHandle to ScopedNullHandle" am:
76b90e37df
am:
8a5e8d0118
* commit '
8a5e8d0118de17210316100e740d0417239256e9':
Rename NullHandle to ScopedNullHandle
Mathieu Chartier [Mon, 21 Dec 2015 20:13:47 +0000 (12:13 -0800)]
Merge "Rename NullHandle to ScopedNullHandle"
am:
76b90e37df
* commit '
76b90e37dfe6eecc904017be8046dd208d30ab8b':
Rename NullHandle to ScopedNullHandle
Mathieu Chartier [Mon, 21 Dec 2015 20:09:36 +0000 (20:09 +0000)]
Merge "Rename NullHandle to ScopedNullHandle"
Mathieu Chartier [Mon, 21 Dec 2015 17:58:16 +0000 (09:58 -0800)]
Rename NullHandle to ScopedNullHandle
This makes it clearer that is invalid to do things like:
Handle<T> h = ScopedNullHandle<T>();
Bug:
26233305
Change-Id: I6d8f54eae01ec2e901cb7043afa853ea77db79fe
Narayan Kamath [Sun, 20 Dec 2015 20:32:01 +0000 (20:32 +0000)]
Update header for OpenjdkJvm.cc.
Change-Id: I19d25531fe71d0511ee3887a2ffd5697a8a00249
Shinichiro Hamaji [Fri, 18 Dec 2015 06:51:51 +0000 (15:51 +0900)]
Do not use $? in recipe
Kati cannot support this automatic variable as ninja doesn't
have a feature for this.
Change-Id: Ie9130c31916954454eb201129ae6f49554453586
Calin Juravle [Mon, 21 Dec 2015 09:50:04 +0000 (09:50 +0000)]
Merge "Pass down to the runtime the application code paths." am:
115a02b737
am:
d264bab81e
* commit '
d264bab81efdc40500b41620d65a8b3930854719':
Pass down to the runtime the application code paths.
Calin Juravle [Mon, 21 Dec 2015 09:48:17 +0000 (09:48 +0000)]
Merge "Pass down to the runtime the application code paths."
am:
115a02b737
* commit '
115a02b737dd5f4d485b2f6c359e02988df66b83':
Pass down to the runtime the application code paths.
Calin Juravle [Mon, 21 Dec 2015 09:43:09 +0000 (09:43 +0000)]
Merge "Pass down to the runtime the application code paths."
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
(cherry picked from commit
986f650d8b552e8b7dbebef1f50f015e7850edfc)
Colin Cross [Sat, 19 Dec 2015 02:01:35 +0000 (18:01 -0800)]
Merge "art: use -O1 to compile tests with clang for arm64" am:
2f125e3c7a
am:
453f41e995
* commit '
453f41e99570adeeda6fd79eccc9d8b4ce55b722':
art: use -O1 to compile tests with clang for arm64
Colin Cross [Sat, 19 Dec 2015 01:59:46 +0000 (17:59 -0800)]
Merge "art: use -O1 to compile tests with clang for arm64"
am:
2f125e3c7a
* commit '
2f125e3c7ab02cbbbcede533dc53a454a439be13':
art: use -O1 to compile tests with clang for arm64
Colin Cross [Sat, 19 Dec 2015 01:56:42 +0000 (01:56 +0000)]
Merge "art: use -O1 to compile tests with clang for arm64"
Colin Cross [Sat, 19 Dec 2015 01:48:50 +0000 (17:48 -0800)]
art: use -O1 to compile tests with clang for arm64
arm64 clang fails to compile art/runtime/arch/stub_test.cc with:
art/runtime/arch/stub_test.cc:178:9: error: inline assembly requires
more registers than available
"sub sp, sp, #64\n\t"
^
Pass -O1 to all art tests compiled with clang for arm64.
Bug:
26275713
Change-Id: Ib1a1c309aef73a2d33d37d720e5e11b8fe7a248e
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
David Srbecky [Thu, 17 Dec 2015 20:53:07 +0000 (20:53 +0000)]
Move debug symbol writing code to elf_writer_debug.cc
I want to be able to use this code without needing to
reference elf_writer_quick.
Change-Id: I87ccedc540b8f04b53be0fc6344a5947308ffcb6
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
David Srbecky [Thu, 17 Dec 2015 19:57:44 +0000 (19:57 +0000)]
Move JIT debugger interface code to its own file.
Change-Id: Ie788daa8caf60f2f0f93484681a8a9fcce61c23f
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""