OSDN Git Service
Mathieu Chartier [Tue, 2 Jun 2015 18:06:06 +0000 (18:06 +0000)]
am
2791d5e6: Add clear cache for JIT
* commit '
2791d5e66f6c802147e2f9275b94b5ca995c396f':
Add clear cache for JIT
Mathieu Chartier [Tue, 2 Jun 2015 17:50:19 +0000 (17:50 +0000)]
am
202ffb0e: am
61d89485: Merge "Update IMT for stale miranda methods"
* commit '
202ffb0e163068d5b056f02d3d321f586dc6493f':
Update IMT for stale miranda methods
Mathieu Chartier [Tue, 2 Jun 2015 17:49:11 +0000 (17:49 +0000)]
am
519fd543: Update IMT for stale miranda methods
* commit '
519fd543625da68ef93f0cd5539c949e5e74e04e':
Update IMT for stale miranda methods
Mathieu Chartier [Tue, 2 Jun 2015 17:36:14 +0000 (17:36 +0000)]
am
61d89485: Merge "Update IMT for stale miranda methods"
* commit '
61d894850cfcbae91ff472a24b5ae9e33394f24c':
Update IMT for stale miranda methods
Mathieu Chartier [Tue, 2 Jun 2015 02:12:36 +0000 (19:12 -0700)]
Add clear cache for JIT
(cherry picked from commit
5783a74163878095475596fabc0b9cb04bec467b)
Bug:
21572270
Change-Id: I711a9ee2d9688a8e4b59380c401f10f42c6c068e
Mathieu Chartier [Tue, 2 Jun 2015 17:27:09 +0000 (17:27 +0000)]
Merge "Update IMT for stale miranda methods"
Mathieu Chartier [Tue, 2 Jun 2015 16:56:04 +0000 (09:56 -0700)]
Update IMT for stale miranda methods
Fixes occasional crash in dex2oat.
(cherry picked from commit
519fd543625da68ef93f0cd5539c949e5e74e04e)
Bug:
19264997
Change-Id: Icb1a323d8c44fa40309486e17aec56d2c2588e67
Mathieu Chartier [Tue, 2 Jun 2015 17:21:41 +0000 (17:21 +0000)]
am
ace571fb: (-s ours) Merge "Move mirror::ArtMethod to native" into mnc-dev
* commit '
ace571fb8891d1dcb6b628724949e3a620be45b5':
Move mirror::ArtMethod to native
Mathieu Chartier [Tue, 2 Jun 2015 16:56:04 +0000 (09:56 -0700)]
Update IMT for stale miranda methods
Fixes occasional crash in dex2oat.
Bug:
19264997
Change-Id: Icb1a323d8c44fa40309486e17aec56d2c2588e67
Roland Levillain [Tue, 2 Jun 2015 16:56:35 +0000 (16:56 +0000)]
am
188bac08: am
3a4a6725: Merge "Fix run-test 458-long-to-fpu."
* commit '
188bac08d6ed803daa3860ce25409cabb83b0a2b':
Fix run-test 458-long-to-fpu.
Roland Levillain [Tue, 2 Jun 2015 16:45:24 +0000 (16:45 +0000)]
am
3a4a6725: Merge "Fix run-test 458-long-to-fpu."
* commit '
3a4a67253d1ee65a46d6f04dbebc72a5372e0e57':
Fix run-test 458-long-to-fpu.
Andreas Gampe [Tue, 2 Jun 2015 16:45:12 +0000 (16:45 +0000)]
am
270ea64a: am
dde457e3: Merge "[MIPS64] Fix art_quick_invoke_stub argument offsets."
* commit '
270ea64a470336127dc1af10308698531e0e544f':
[MIPS64] Fix art_quick_invoke_stub argument offsets.
Mathieu Chartier [Tue, 2 Jun 2015 16:44:43 +0000 (16:44 +0000)]
Merge "Move mirror::ArtMethod to native" into mnc-dev
Roland Levillain [Tue, 2 Jun 2015 16:35:47 +0000 (16:35 +0000)]
Merge "Fix run-test 458-long-to-fpu."
Andreas Gampe [Tue, 2 Jun 2015 16:33:22 +0000 (16:33 +0000)]
am
dde457e3: Merge "[MIPS64] Fix art_quick_invoke_stub argument offsets."
* commit '
dde457e33fc2553584649a5d6b05e1a2937470d9':
[MIPS64] Fix art_quick_invoke_stub argument offsets.
Roland Levillain [Tue, 2 Jun 2015 16:05:20 +0000 (17:05 +0100)]
Fix run-test 458-long-to-fpu.
- Make $noinline$DoubleConvert actually exercise
long-to-double conversions (instead of long-to-float
conversions).
- Change the inlining-defeating strategy: introduce an
always-throwing branch in $noinline$FloatConvert and
$noinline$DoubleConvert instead of using recursion, as the
inliner now inlines recursive calls (down to a certain
depth).
Change-Id: Ib83a89039968e597cf74d26b5779d410f3caf743
Mathieu Chartier [Wed, 22 Apr 2015 20:56:20 +0000 (13:56 -0700)]
Move mirror::ArtMethod to native
Optimizing + quick tests are passing, devices boot.
TODO: Test and fix bugs in mips64.
Saves 16 bytes per most ArtMethod, 7.5MB reduction in system PSS.
Some of the savings are from removal of virtual methods and direct
methods object arrays.
Bug:
19264997
(cherry picked from commit
e401d146407d61eeb99f8d6176b2ac13c4df1e33)
Change-Id: I622469a0cfa0e7082a2119f3d6a9491eb61e3f3d
Fix some ArtMethod related bugs
Added root visiting for runtime methods, not currently required
since the GcRoots in these methods are null.
Added missing GetInterfaceMethodIfProxy in GetMethodLine, fixes
--trace run-tests 005, 044.
Fixed optimizing compiler bug where we used a normal stack location
instead of double on ARM64, this fixes the debuggable tests.
TODO: Fix JDWP tests.
Bug:
19264997
Change-Id: I7c55f69c61d1b45351fd0dc7185ffe5efad82bd3
ART: Fix casts for 64-bit pointers on 32-bit compiler.
Bug:
19264997
Change-Id: Ief45cdd4bae5a43fc8bfdfa7cf744e2c57529457
Fix JDWP tests after ArtMethod change
Fixes Throwable::GetStackDepth for exception event detection after
internal stack trace representation change.
Adds missing ArtMethod::GetInterfaceMethodIfProxy call in case of
proxy method.
Bug:
19264997
Change-Id: I363e293796848c3ec491c963813f62d868da44d2
Fix accidental IMT and root marking regression
Was always using the conflict trampoline. Also included fix for
regression in GC time caused by extra roots. Most of the regression
was IMT.
Fixed bug in DumpGcPerformanceInfo where we would get SIGABRT due to
detached thread.
EvaluateAndApplyChanges:
From ~2500 -> ~1980
GC time: 8.2s -> 7.2s due to 1s less of MarkConcurrentRoots
Bug:
19264997
Change-Id: I4333e80a8268c2ed1284f87f25b9f113d4f2c7e0
Fix bogus image test assert
Previously we were comparing the size of the non moving space to
size of the image file.
Now we properly compare the size of the image space against the size
of the image file.
Bug:
19264997
Change-Id: I7359f1f73ae3df60c5147245935a24431c04808a
[MIPS64] Fix art_quick_invoke_stub argument offsets.
ArtMethod reference's size got bigger, so we need to move other args
and leave enough space for ArtMethod* and 'this' pointer.
This fixes mips64 boot.
Bug:
19264997
Change-Id: I47198d5f39a4caab30b3b77479d5eedaad5006ab
Andreas Gampe [Tue, 2 Jun 2015 16:20:09 +0000 (16:20 +0000)]
Merge "[MIPS64] Fix art_quick_invoke_stub argument offsets."
Calin Juravle [Tue, 2 Jun 2015 16:14:50 +0000 (16:14 +0000)]
am
4bc0fa0b: am
122addc3: Merge "Revert "Revert "Revert "Bring ReferenceTypePropagation to HInvoke return types""""
* commit '
4bc0fa0bae3ea283fd1e5667b615d49711aca2b2':
Revert "Revert "Revert "Bring ReferenceTypePropagation to HInvoke return types"""
Nicolas Geoffray [Tue, 2 Jun 2015 16:13:01 +0000 (16:13 +0000)]
Merge "resolved conflicts for merge of
bd7eef17 to mnc-dev-plus-aosp" into mnc-dev-plus-aosp
Calin Juravle [Tue, 2 Jun 2015 16:03:02 +0000 (16:03 +0000)]
am
122addc3: Merge "Revert "Revert "Revert "Bring ReferenceTypePropagation to HInvoke return types""""
* commit '
122addc3962207badd364b00a75a58639e76b10c':
Revert "Revert "Revert "Bring ReferenceTypePropagation to HInvoke return types"""
Calin Juravle [Tue, 2 Jun 2015 15:55:35 +0000 (15:55 +0000)]
Merge "Revert "Revert "Revert "Bring ReferenceTypePropagation to HInvoke return types""""
Calin Juravle [Tue, 2 Jun 2015 15:55:24 +0000 (15:55 +0000)]
Revert "Revert "Revert "Bring ReferenceTypePropagation to HInvoke return types"""
This reverts commit
82cc909ff81cc25f7fe97ddac3a1a1f6dc9f5792.
Change-Id: If29dbe0dfd65998047c7ac4ef06c4789355b6bda
Nicolas Geoffray [Tue, 2 Jun 2015 15:46:41 +0000 (16:46 +0100)]
resolved conflicts for merge of
bd7eef17 to mnc-dev-plus-aosp
Change-Id: I49c561cf7fd1a71f8416178d733d7fe375081e1d
Nikola Veljkovic [Tue, 2 Jun 2015 15:27:53 +0000 (17:27 +0200)]
[MIPS64] Fix art_quick_invoke_stub argument offsets.
ArtMethod reference's size got bigger, so we need to move other args
and leave enough space for ArtMethod* and 'this' pointer.
This fixes mips64 boot.
Bug:
19264997
Change-Id: I47198d5f39a4caab30b3b77479d5eedaad5006ab
Calin Juravle [Tue, 2 Jun 2015 15:38:05 +0000 (15:38 +0000)]
am
f61a7a36: am
637be5ce: Merge "Revert "Revert "Bring ReferenceTypePropagation to HInvoke return types"""
* commit '
f61a7a3617d0eafdb26ffcfdb2b43faaab84886d':
Revert "Revert "Bring ReferenceTypePropagation to HInvoke return types""
Calin Juravle [Tue, 2 Jun 2015 15:25:37 +0000 (15:25 +0000)]
am
637be5ce: Merge "Revert "Revert "Bring ReferenceTypePropagation to HInvoke return types"""
* commit '
637be5cefe1462b8d0bd5e065bd64a10f01647ac':
Revert "Revert "Bring ReferenceTypePropagation to HInvoke return types""
Calin Juravle [Tue, 2 Jun 2015 15:14:02 +0000 (15:14 +0000)]
Merge "Revert "Revert "Bring ReferenceTypePropagation to HInvoke return types"""
Calin Juravle [Tue, 2 Jun 2015 15:13:34 +0000 (15:13 +0000)]
Revert "Revert "Bring ReferenceTypePropagation to HInvoke return types""
This reverts commit
8ccf8a0ce31083faa0d9c502f1f0f12a825f6c5d.
Change-Id: I729c147989e0e98d0739d7596b5bb41a72971624
David Brazdil [Tue, 2 Jun 2015 13:53:48 +0000 (13:53 +0000)]
am
48acdbf2: am
c6f24e69: Merge "ART: Fast copy stack mask"
* commit '
48acdbf2509ebf1c74fdbfdba9bbc24f391bc689':
ART: Fast copy stack mask
Calin Juravle [Tue, 2 Jun 2015 13:47:10 +0000 (13:47 +0000)]
am
0438313e: am
1682e1aa: Merge "Revert "Bring ReferenceTypePropagation to HInvoke return types""
* commit '
0438313e9b7996b1e05f32c302568f130bd5d70d':
Revert "Bring ReferenceTypePropagation to HInvoke return types"
David Brazdil [Tue, 2 Jun 2015 13:46:44 +0000 (13:46 +0000)]
am
c6f24e69: Merge "ART: Fast copy stack mask"
* commit '
c6f24e6954bee6fafdb446091c3961d199b74aac':
ART: Fast copy stack mask
David Brazdil [Tue, 2 Jun 2015 13:38:32 +0000 (13:38 +0000)]
Merge "ART: Fast copy stack mask"
David Brazdil [Tue, 2 Jun 2015 13:29:52 +0000 (14:29 +0100)]
ART: Fast copy stack mask
StackMap::SetStackMask will currently copy a BitVector into a Memory-
Region bit by bit. This patch adds a new function for copying the data
with memcpy.
This is resubmission of CL I28d45a590b35a4a854cca2f57db864cf8a081487
but with a fix for a broken test which it revealed.
Change-Id: Ib65aa614d3ab7b5c99c6719fdc8e436466a4213d
Calin Juravle [Tue, 2 Jun 2015 13:35:36 +0000 (13:35 +0000)]
am
1682e1aa: Merge "Revert "Bring ReferenceTypePropagation to HInvoke return types""
* commit '
1682e1aa3463c2e6a8e5f4a9d3f4d13a0e31e3da':
Revert "Bring ReferenceTypePropagation to HInvoke return types"
Calin Juravle [Tue, 2 Jun 2015 13:23:42 +0000 (13:23 +0000)]
Merge "Revert "Bring ReferenceTypePropagation to HInvoke return types""
Calin Juravle [Tue, 2 Jun 2015 13:23:08 +0000 (13:23 +0000)]
Revert "Bring ReferenceTypePropagation to HInvoke return types"
This reverts commit
77e48c64e7c1c0084217b8df1b47ac6367e61cc7.
Change-Id: Ic6967b2ea7588862ac190e1c0555af615027b5b6
David Brazdil [Tue, 2 Jun 2015 13:01:19 +0000 (13:01 +0000)]
am
a8f21820: am
0e1e0df6: Merge "Revert "ART: Fast copy stack mask""
* commit '
a8f21820268ef60967f942a9e9d75a6a9d940f54':
Revert "ART: Fast copy stack mask"
David Brazdil [Tue, 2 Jun 2015 12:51:41 +0000 (12:51 +0000)]
am
0e1e0df6: Merge "Revert "ART: Fast copy stack mask""
* commit '
0e1e0df6e5e6b4bea79790b4747e3904a386d031':
Revert "ART: Fast copy stack mask"
David Brazdil [Tue, 2 Jun 2015 12:42:55 +0000 (12:42 +0000)]
Merge "Revert "ART: Fast copy stack mask""
David Brazdil [Tue, 2 Jun 2015 12:42:40 +0000 (12:42 +0000)]
Revert "ART: Fast copy stack mask"
DCHECK failure, need to investigate
This reverts commit
6b10c9b2c0e62193ab9df4d63aedea1d0798e742.
Change-Id: Ie1d1cc6fb71367bc5ac5d6a260af8de316a758dd
David Brazdil [Tue, 2 Jun 2015 11:56:06 +0000 (11:56 +0000)]
am
21c328c3: am
436d0b5e: Merge "ART: Fast copy stack mask"
* commit '
21c328c399bf37aa602e8606c4a7115d7875c65f':
ART: Fast copy stack mask
Calin Juravle [Tue, 2 Jun 2015 11:56:04 +0000 (11:56 +0000)]
am
e583c2fb: am
6b27fefc: Merge "Bring ReferenceTypePropagation to HInvoke return types"
* commit '
e583c2fb81b741a90f52a5fab3da4e374c60b396':
Bring ReferenceTypePropagation to HInvoke return types
David Brazdil [Tue, 2 Jun 2015 11:44:56 +0000 (11:44 +0000)]
am
436d0b5e: Merge "ART: Fast copy stack mask"
* commit '
436d0b5eb0089f2cd635e26b432cd66157218732':
ART: Fast copy stack mask
Calin Juravle [Tue, 2 Jun 2015 11:44:55 +0000 (11:44 +0000)]
am
6b27fefc: Merge "Bring ReferenceTypePropagation to HInvoke return types"
* commit '
6b27fefc9ec9835b9fd8f19a490c7ea4344e0b83':
Bring ReferenceTypePropagation to HInvoke return types
David Brazdil [Tue, 2 Jun 2015 11:43:11 +0000 (11:43 +0000)]
Merge "ART: Fast copy stack mask"
Calin Juravle [Tue, 2 Jun 2015 11:36:20 +0000 (11:36 +0000)]
Merge "Bring ReferenceTypePropagation to HInvoke return types"
David Brazdil [Fri, 29 May 2015 15:33:09 +0000 (16:33 +0100)]
ART: Fast copy stack mask
StackMap::SetStackMask will currently copy a BitVector into a Memory-
Region bit by bit. This patch adds a new function for copying the data
with memcpy.
Change-Id: I28d45a590b35a4a854cca2f57db864cf8a081487
Nicolas Geoffray [Tue, 2 Jun 2015 11:10:03 +0000 (11:10 +0000)]
am
2f209a0f: am
933984cd: Merge "Fix a crash due to a combination of dce/inlining."
* commit '
2f209a0f57cc10968ae96d1133c1a70750b16953':
Fix a crash due to a combination of dce/inlining.
Roland Levillain [Tue, 2 Jun 2015 11:10:02 +0000 (11:10 +0000)]
am
de61b043: am
5e4e4f2d: Merge "Use down_cast instead of reinterpret_cast in Optimizing codegens."
* commit '
de61b043d1e0b604deeee36b9d5b792aea760c6c':
Use down_cast instead of reinterpret_cast in Optimizing codegens.
Nicolas Geoffray [Tue, 2 Jun 2015 11:02:44 +0000 (11:02 +0000)]
am
933984cd: Merge "Fix a crash due to a combination of dce/inlining."
* commit '
933984cdc0ce648a2f23e302643c13a71ee34e91':
Fix a crash due to a combination of dce/inlining.
Roland Levillain [Tue, 2 Jun 2015 11:02:43 +0000 (11:02 +0000)]
am
5e4e4f2d: Merge "Use down_cast instead of reinterpret_cast in Optimizing codegens."
* commit '
5e4e4f2decd9d54720ce50a1817247f38e068165':
Use down_cast instead of reinterpret_cast in Optimizing codegens.
Nicolas Geoffray [Tue, 2 Jun 2015 10:57:10 +0000 (10:57 +0000)]
Merge "Fix a crash due to a combination of dce/inlining."
Roland Levillain [Tue, 2 Jun 2015 10:52:35 +0000 (10:52 +0000)]
Merge "Use down_cast instead of reinterpret_cast in Optimizing codegens."
Guillaume "Vermeille" Sanchez [Fri, 29 May 2015 09:52:55 +0000 (10:52 +0100)]
Bring ReferenceTypePropagation to HInvoke return types
Change-Id: Ie8f6b0ea5bd841c9555f3b1b6d4b7dce92a117f1
Nicolas Geoffray [Tue, 2 Jun 2015 10:25:09 +0000 (11:25 +0100)]
Fix another source of undeterministic inlining.
Needing an environment and throwing might depend in which
caller first tries to inline. HLoadClass has such logic. Therefore,
do not cache the non-inlineable flag for those cases.
Does not apply to aosp, as this code has been removed.
bug:
20037935
Change-Id: I5e3d36ffb832fb3c3f3c604c79cdbf4f37c749e1
Nicolas Geoffray [Tue, 2 Jun 2015 09:38:12 +0000 (10:38 +0100)]
Fix a crash due to a combination of dce/inlining.
Dead code elimiation was removing HCurrentMethod if
it ended up not being used, but inlining requires access
to it. Therefore we should keep the node in the graph.
Change-Id: I2f44f71b4ff3f2c3f9569d8420c1b37f00e694d2
Mathieu Chartier [Tue, 2 Jun 2015 03:27:44 +0000 (03:27 +0000)]
am
ad8f9299: am
f86808b5: Merge "Add clear cache for JIT"
* commit '
ad8f9299ae1afba804933754256a757d6d532ab7':
Add clear cache for JIT
Mathieu Chartier [Tue, 2 Jun 2015 03:15:06 +0000 (03:15 +0000)]
am
f86808b5: Merge "Add clear cache for JIT"
* commit '
f86808b55b550962c627b50511b98f4de8cd0e60':
Add clear cache for JIT
Mathieu Chartier [Tue, 2 Jun 2015 03:07:20 +0000 (03:07 +0000)]
Merge "Add clear cache for JIT"
Mathieu Chartier [Tue, 2 Jun 2015 02:12:36 +0000 (19:12 -0700)]
Add clear cache for JIT
Bug:
21572270
Change-Id: I711a9ee2d9688a8e4b59380c401f10f42c6c068e
Mathieu Chartier [Tue, 2 Jun 2015 00:17:19 +0000 (00:17 +0000)]
am
947ed8bb: am
8fa1d6a1: Merge "Fix bogus image test assert"
* commit '
947ed8bbd316a1ae15f2fef733421987f6832505':
Fix bogus image test assert
Mathieu Chartier [Tue, 2 Jun 2015 00:06:36 +0000 (00:06 +0000)]
am
8fa1d6a1: Merge "Fix bogus image test assert"
* commit '
8fa1d6a1371cc452e32808b4e97e81da2310ef60':
Fix bogus image test assert
Mathieu Chartier [Mon, 1 Jun 2015 23:49:20 +0000 (23:49 +0000)]
Merge "Fix bogus image test assert"
Mathieu Chartier [Mon, 1 Jun 2015 23:33:53 +0000 (16:33 -0700)]
Fix bogus image test assert
Previously we were comparing the size of the non moving space to
size of the image file.
Now we properly compare the size of the image space against the size
of the image file.
Bug:
19264997
Change-Id: I7359f1f73ae3df60c5147245935a24431c04808a
Mathieu Chartier [Mon, 1 Jun 2015 23:16:02 +0000 (23:16 +0000)]
am
62f5b91b: am
816de3a3: Merge "Copy miranda methods before suspend point"
* commit '
62f5b91b8b46a937623843bb238e273167704b6f':
Copy miranda methods before suspend point
Mathieu Chartier [Mon, 1 Jun 2015 23:01:15 +0000 (23:01 +0000)]
am
816de3a3: Merge "Copy miranda methods before suspend point"
* commit '
816de3a319c80b966e34928c38f1f904657711fb':
Copy miranda methods before suspend point
Mathieu Chartier [Mon, 1 Jun 2015 22:51:31 +0000 (22:51 +0000)]
Merge "Copy miranda methods before suspend point"
Mathieu Chartier [Mon, 1 Jun 2015 21:30:06 +0000 (14:30 -0700)]
Copy miranda methods before suspend point
This fixes a bug where moving GC could happen at vtable CopyOf and
result miranda methods having stale pointers since they are not part
of the class roots at this point.
Also some minor cleanup.
Bug:
21564728
Change-Id: Ife520db6973782e40edcb2074c17274b799af738
Mathieu Chartier [Mon, 1 Jun 2015 20:39:00 +0000 (20:39 +0000)]
am
eef2f837: am
4181a96a: Merge "Fix accidental IMT and root marking regression"
* commit '
eef2f83727b4a7e4b4194d295f4d2cc1227515a0':
Fix accidental IMT and root marking regression
Mathieu Chartier [Mon, 1 Jun 2015 20:29:08 +0000 (20:29 +0000)]
am
4181a96a: Merge "Fix accidental IMT and root marking regression"
* commit '
4181a96a151c6444232c4951a2f837c8e2e15d35':
Fix accidental IMT and root marking regression
Mathieu Chartier [Mon, 1 Jun 2015 20:15:19 +0000 (20:15 +0000)]
Merge "Fix accidental IMT and root marking regression"
Nicolas Geoffray [Mon, 1 Jun 2015 18:50:53 +0000 (18:50 +0000)]
am
71f0a8a1: Merge "Fix another source of undeterministic inlining." into mnc-dev
* commit '
71f0a8a123fa27bdc857a98afebbaf0ed09dac15':
Fix another source of undeterministic inlining.
Andreas Gampe [Mon, 1 Jun 2015 18:47:09 +0000 (11:47 -0700)]
resolved conflicts for merge of
952b1642 to mnc-dev-plus-aosp
Change-Id: I6d8b7a0d55cca998e1241acc855e606b7f769609
Andreas Gampe [Mon, 1 Jun 2015 18:43:17 +0000 (18:43 +0000)]
am
87f47244: Merge changes I3eee8df3,I78cc01fb into mnc-dev
* commit '
87f47244c2eb2c0af1adb153e03ad2cfceb16aa1':
Fix test 115-native-bridge for Mips.
ART: Add support for special handlers in sigchainlib
Andreas Gampe [Mon, 1 Jun 2015 18:41:09 +0000 (11:41 -0700)]
resolved conflicts for merge of
47ca5fa9 to mnc-dev-plus-aosp
Change-Id: Ia46207ce3a07f2d050871141d0f6b0eb6857e19e
Nicolas Geoffray [Mon, 1 Jun 2015 18:07:06 +0000 (18:07 +0000)]
Merge "resolved conflicts for merge of
2293e267 to mnc-dev-plus-aosp" into mnc-dev-plus-aosp
Nicolas Geoffray [Mon, 1 Jun 2015 18:04:18 +0000 (18:04 +0000)]
am
6e91e67c: am
5986c72f: Merge "Fix lint error."
* commit '
6e91e67ce68cb0d313c662bf30e74ca2e34b5fcf':
Fix lint error.
Nicolas Geoffray [Mon, 1 Jun 2015 18:00:58 +0000 (19:00 +0100)]
resolved conflicts for merge of
2293e267 to mnc-dev-plus-aosp
Change-Id: Ibf43ca550063c76b7212cc8250ec9603b09f6550
Mathieu Chartier [Mon, 1 Jun 2015 17:47:36 +0000 (10:47 -0700)]
Fix accidental IMT and root marking regression
Was always using the conflict trampoline. Also included fix for
regression in GC time caused by extra roots. Most of the regression
was IMT.
Fixed bug in DumpGcPerformanceInfo where we would get SIGABRT due to
detached thread.
EvaluateAndApplyChanges:
From ~2500 -> ~1980
GC time: 8.2s -> 7.2s due to 1s less of MarkConcurrentRoots
Bug:
19264997
Change-Id: I4333e80a8268c2ed1284f87f25b9f113d4f2c7e0
Nicolas Geoffray [Mon, 1 Jun 2015 17:51:22 +0000 (17:51 +0000)]
am
5986c72f: Merge "Fix lint error."
* commit '
5986c72f85ff5af78cf5be10d53534947f8097a4':
Fix lint error.
Nicolas Geoffray [Mon, 1 Jun 2015 17:38:02 +0000 (17:38 +0000)]
Merge "Fix lint error."
Nicolas Geoffray [Mon, 1 Jun 2015 17:37:24 +0000 (18:37 +0100)]
Fix lint error.
Change-Id: Ibba7622a0c66eba653147f2e861606fffc7f685e
Andreas Gampe [Mon, 1 Jun 2015 17:31:34 +0000 (17:31 +0000)]
am
a094d223: am
bf96caf9: Merge "ART: Fix wrong hard-failure handling in verifier"
* commit '
a094d223f43aa79195a5ce0dfd934fbc0725e2f2':
ART: Fix wrong hard-failure handling in verifier
Nicolas Geoffray [Mon, 1 Jun 2015 17:31:32 +0000 (17:31 +0000)]
am
d53c3973: am
f78197de: Merge "Fix gtest by adding fake lifetime positions."
* commit '
d53c3973555aff86fd3b395a2444c0d71b14ff59':
Fix gtest by adding fake lifetime positions.
Roland Levillain [Mon, 1 Jun 2015 17:24:13 +0000 (18:24 +0100)]
Use down_cast instead of reinterpret_cast in Optimizing codegens.
Change-Id: Ifa23023ffaca631a4f6b5745dd7492c39521a26f
Andreas Gampe [Mon, 1 Jun 2015 17:23:25 +0000 (17:23 +0000)]
am
bf96caf9: Merge "ART: Fix wrong hard-failure handling in verifier"
* commit '
bf96caf9afb3a07a524c6346ced9256995fc9d05':
ART: Fix wrong hard-failure handling in verifier
Nicolas Geoffray [Mon, 1 Jun 2015 17:23:24 +0000 (17:23 +0000)]
am
f78197de: Merge "Fix gtest by adding fake lifetime positions."
* commit '
f78197def7342ea64ee70660c8ea4428e33b3bd3':
Fix gtest by adding fake lifetime positions.
Andreas Gampe [Mon, 1 Jun 2015 17:20:00 +0000 (17:20 +0000)]
Merge "ART: Fix wrong hard-failure handling in verifier"
Nicolas Geoffray [Mon, 1 Jun 2015 17:13:34 +0000 (17:13 +0000)]
Merge "Fix another source of undeterministic inlining." into mnc-dev
Nicolas Geoffray [Mon, 1 Jun 2015 17:13:17 +0000 (17:13 +0000)]
Merge "Fix gtest by adding fake lifetime positions."
Nicolas Geoffray [Mon, 1 Jun 2015 17:12:38 +0000 (18:12 +0100)]
Fix gtest by adding fake lifetime positions.
Change-Id: I7cd89143103ac3e372406dff5d3837c9d91bb00d
Nicolas Geoffray [Mon, 1 Jun 2015 17:04:36 +0000 (17:04 +0000)]
am
aef10e45: am
45fc7d43: Merge "Enable jsr166 tests"
* commit '
aef10e45d979bca79536ec96ff204c1094727813':
Enable jsr166 tests
Nicolas Geoffray [Mon, 1 Jun 2015 17:04:34 +0000 (17:04 +0000)]
am
484bdb04: am
79895983: Merge "Tweak one hint and one split in the linear scan."
* commit '
484bdb047e32303ba0e2056906eac414cd5f0522':
Tweak one hint and one split in the linear scan.
Jeff Hao [Mon, 1 Jun 2015 16:58:07 +0000 (09:58 -0700)]
resolved conflicts for merge of
73a93774 to mnc-dev-plus-aosp
Change-Id: I67697bbcab762006fc9c7eed17d06c7e02b0a4a2
Andreas Gampe [Tue, 26 May 2015 20:35:39 +0000 (13:35 -0700)]
ART: Fix wrong hard-failure handling in verifier
Correctly return null for the method when a hard failure is
encountered. Also improve logging for order failures. Add a
regression test.
Bug:
20224106
(cherry picked from commit
3b74e275838729c5023cd80116f1b3b81306ee19)
Change-Id: I6e08202617147378b204af169308b67fc69f92c6
Nicolas Geoffray [Mon, 1 Jun 2015 16:50:48 +0000 (16:50 +0000)]
am
45fc7d43: Merge "Enable jsr166 tests"
* commit '
45fc7d43e614491a3c436838588b19e4b94e4ccd':
Enable jsr166 tests
Nicolas Geoffray [Mon, 1 Jun 2015 16:50:46 +0000 (16:50 +0000)]
am
79895983: Merge "Tweak one hint and one split in the linear scan."
* commit '
798959832ad4592965e4a201e0968b9c4e16bf10':
Tweak one hint and one split in the linear scan.
Nicolas Geoffray [Mon, 1 Jun 2015 16:48:53 +0000 (16:48 +0000)]
Merge "Enable jsr166 tests"
Nicolas Geoffray [Mon, 1 Jun 2015 16:42:04 +0000 (16:42 +0000)]
Merge "Tweak one hint and one split in the linear scan."
OSDN Git Service
