OSDN Git Service
Andreas Gampe [Tue, 9 Sep 2014 09:30:32 +0000 (09:30 +0000)]
am
42bc2f1f: Merge "ART: Better error reporting on broken oat file"
* commit '
42bc2f1fac342a01d38bc452da1e70f8099f7c2f':
ART: Better error reporting on broken oat file
Sebastien Hertz [Tue, 9 Sep 2014 09:30:31 +0000 (09:30 +0000)]
am
cf254a2f: Merge "Fix monitor visit for class initializer"
* commit '
cf254a2fcf69bdd032e4f2726fc1bd751544b0b6':
Fix monitor visit for class initializer
Andreas Gampe [Tue, 9 Sep 2014 09:29:21 +0000 (09:29 +0000)]
am
51c4684c: am
1b2140c9: ART: Better error reporting on broken oat file
* commit '
51c4684c39346d9b0d5ad3f13adf7f9f715b22f2':
ART: Better error reporting on broken oat file
Andreas Gampe [Tue, 9 Sep 2014 09:18:24 +0000 (09:18 +0000)]
am
1b2140c9: ART: Better error reporting on broken oat file
* commit '
1b2140c9bf46388e4f59ecf3d62d99cd78fed12c':
ART: Better error reporting on broken oat file
Andreas Gampe [Tue, 9 Sep 2014 08:22:59 +0000 (08:22 +0000)]
Merge "ART: Better error reporting on broken oat file"
Andreas Gampe [Tue, 9 Sep 2014 06:39:45 +0000 (23:39 -0700)]
ART: Better error reporting on broken oat file
Do not blow up when in GetHashBucket if GetHashBucketNum is zero.
Instead back-step to ElfFileOpen, which prints which symbol was
missing from which file.
Bug:
17422404
(cherry picked from commit
1b2140c9bf46388e4f59ecf3d62d99cd78fed12c)
Change-Id: I3b890dd1c31c08b1ccc0f7f668afcceee95f8d00
Sebastien Hertz [Tue, 9 Sep 2014 07:59:13 +0000 (07:59 +0000)]
Merge "Fix monitor visit for class initializer"
Sebastien Hertz [Mon, 8 Sep 2014 08:15:19 +0000 (10:15 +0200)]
Fix monitor visit for class initializer
We do not hold class object's lock when invoking class initializer. Therefore
it is wrong to visit it when looking for monitors owned by a thread.
Bug:
17377924
(cherry picked from commit
6d06f1b34322d91226c9dcd61e53c2b6731f8bb6)
Change-Id: I9a18c421297608dc3109624111f9fea021a16d24
Andreas Gampe [Tue, 9 Sep 2014 06:39:45 +0000 (23:39 -0700)]
ART: Better error reporting on broken oat file
Do not blow up when in GetHashBucket if GetHashBucketNum is zero.
Instead back-step to ElfFileOpen, which prints which symbol was
missing from which file.
Bug:
17422404
Change-Id: I3b890dd1c31c08b1ccc0f7f668afcceee95f8d00
Brian Carlstrom [Tue, 9 Sep 2014 06:21:10 +0000 (06:21 +0000)]
am
cefd7aa0: am
6b8f8688: Merge "Workaround Darwin ContainedWithinExistingMap issue" into lmp-dev
* commit '
cefd7aa002165731ae189f641bcd6c4ffc1b5c6c':
Workaround Darwin ContainedWithinExistingMap issue
Sebastien Hertz [Tue, 9 Sep 2014 06:16:41 +0000 (06:16 +0000)]
am
652984e4: am
77c318d5: Merge "Fix monitor visit for class initializer" into lmp-dev
* commit '
652984e4b32d06344fae8cad52524d4de7ac5c79':
Fix monitor visit for class initializer
Andreas Gampe [Tue, 9 Sep 2014 06:16:40 +0000 (06:16 +0000)]
am
dc5e4e38: am
5300d478: Merge "ART: Fix unchecked register index validity" into lmp-dev
* commit '
dc5e4e388fed80ba81d522d9ade8944a2cbacbe3':
ART: Fix unchecked register index validity
Brian Carlstrom [Tue, 9 Sep 2014 06:16:39 +0000 (06:16 +0000)]
am
f056b356: (-s ours) am
8a4064e2: Fix darwin run-test problems
* commit '
f056b3569bc61d60399c77814ad38711409d02a3':
Fix darwin run-test problems
Brian Carlstrom [Tue, 9 Sep 2014 06:09:57 +0000 (06:09 +0000)]
am
6b8f8688: Merge "Workaround Darwin ContainedWithinExistingMap issue" into lmp-dev
* commit '
6b8f868862de9c8a191462ab2a2c979aea4857d3':
Workaround Darwin ContainedWithinExistingMap issue
Brian Carlstrom [Tue, 9 Sep 2014 06:02:19 +0000 (06:02 +0000)]
Merge "Workaround Darwin ContainedWithinExistingMap issue" into lmp-dev
Brian Carlstrom [Tue, 9 Sep 2014 05:41:35 +0000 (22:41 -0700)]
Workaround Darwin ContainedWithinExistingMap issue
Bug:
16861075
Change-Id: I577a0c7ede919e610c356e7c40dd60d87914dd3a
Andreas Gampe [Tue, 9 Sep 2014 05:31:46 +0000 (05:31 +0000)]
am
38510082: Merge "ART: Fix unchecked register index validity"
* commit '
38510082135a7fb438afb515fa3174596e644e9b':
ART: Fix unchecked register index validity
Brian Carlstrom [Tue, 9 Sep 2014 05:31:45 +0000 (05:31 +0000)]
am
9102fff4: Merge "Fix darwin run-test problems"
* commit '
9102fff43f52be08032b07e1e922dcdd3660f6b3':
Fix darwin run-test problems
Sebastien Hertz [Tue, 9 Sep 2014 05:18:02 +0000 (05:18 +0000)]
am
77c318d5: Merge "Fix monitor visit for class initializer" into lmp-dev
* commit '
77c318d5c22c5db02bd09f80c97bb117ce6f5e4c':
Fix monitor visit for class initializer
Andreas Gampe [Tue, 9 Sep 2014 05:18:01 +0000 (05:18 +0000)]
am
5300d478: Merge "ART: Fix unchecked register index validity" into lmp-dev
* commit '
5300d478fb60f3aa9277f29aef9a901d26f7469a':
ART: Fix unchecked register index validity
Mathieu Chartier [Tue, 9 Sep 2014 05:13:48 +0000 (05:13 +0000)]
am
5b064767: am
1e25d938: Merge "Add fast path for FindClass using the type dex file." into lmp-dev
* commit '
5b064767b74c5cd2e8315ae26b82ca1a6e0ce65f':
Add fast path for FindClass using the type dex file.
Sebastien Hertz [Tue, 9 Sep 2014 05:12:55 +0000 (05:12 +0000)]
Merge "Fix monitor visit for class initializer" into lmp-dev
Andreas Gampe [Tue, 9 Sep 2014 05:11:18 +0000 (22:11 -0700)]
resolved conflicts for merge of
22fb61c8 to lmp-dev-plus-aosp
Change-Id: Ib4de757227ede47d7bcb07c729057c0afb637ef7
Andreas Gampe [Tue, 9 Sep 2014 05:09:47 +0000 (05:09 +0000)]
Merge "ART: Fix unchecked register index validity"
Andreas Gampe [Sun, 7 Sep 2014 20:06:12 +0000 (13:06 -0700)]
ART: Fix unchecked register index validity
The static check of index validity is against the type given by
the instruction, e.g., boolean for SPUT_BOOLEAN, but the target_type
is the resolved field type and can differ. An additional check is
necessary to avoid a read out of bounds.
Bug:
17411109
(cherry picked from commit
74ae47a0590feceea31a2388f98c83e3ec0df0ec)
Change-Id: Ie4ed8bbda79f3f6403a24e727450a943447aa71d
Andreas Gampe [Tue, 9 Sep 2014 05:07:38 +0000 (05:07 +0000)]
Merge "ART: Fix unchecked register index validity" into lmp-dev
Brian Carlstrom [Tue, 9 Sep 2014 04:57:26 +0000 (04:57 +0000)]
am
8a4064e2: Fix darwin run-test problems
* commit '
8a4064e2c0987637b11afcc656478d3113d81618':
Fix darwin run-test problems
Brian Carlstrom [Tue, 9 Sep 2014 04:55:46 +0000 (04:55 +0000)]
Merge "Fix darwin run-test problems"
Brian Carlstrom [Tue, 9 Sep 2014 04:37:39 +0000 (21:37 -0700)]
Fix darwin run-test problems
Bug:
17428908
(cherry picked from commit
8a4064e2c0987637b11afcc656478d3113d81618)
Change-Id: Ica403bef3e7d93bf6e9197c44b77e39683e04d55
Brian Carlstrom [Tue, 9 Sep 2014 04:37:39 +0000 (21:37 -0700)]
Fix darwin run-test problems
Bug:
17428908
Change-Id: Id74a0383fdae6753558e27cd447c1ca349819c91
Mathieu Chartier [Tue, 9 Sep 2014 01:40:40 +0000 (01:40 +0000)]
am
9204ed51: Merge "Add fast path for FindClass using the type dex file."
* commit '
9204ed5102ea7cd57bd3ff7bb44f3ea26e28ae2a':
Add fast path for FindClass using the type dex file.
Mathieu Chartier [Tue, 9 Sep 2014 01:40:39 +0000 (01:40 +0000)]
am
c13b42a9: Merge "Ignore heap trim requests if we are the zygote"
* commit '
c13b42a9266d3aa5c9dda75c48f7ce3fcafc116c':
Ignore heap trim requests if we are the zygote
Mathieu Chartier [Tue, 9 Sep 2014 01:40:37 +0000 (01:40 +0000)]
am
0d42a175: Merge "Revert "Fix heap trimmer daemon sleeping.""
* commit '
0d42a1759414ab6887bd5e05ea87cab296118352':
Revert "Fix heap trimmer daemon sleeping."
Mathieu Chartier [Tue, 9 Sep 2014 01:26:14 +0000 (01:26 +0000)]
Merge "Add fast path for FindClass using the type dex file."
Mathieu Chartier [Tue, 9 Sep 2014 01:24:58 +0000 (01:24 +0000)]
am
1e25d938: Merge "Add fast path for FindClass using the type dex file." into lmp-dev
* commit '
1e25d9386c7e94761f1eda38e2d699192a915e35':
Add fast path for FindClass using the type dex file.
Mathieu Chartier [Tue, 9 Sep 2014 01:22:38 +0000 (01:22 +0000)]
Merge "Ignore heap trim requests if we are the zygote"
Mathieu Chartier [Tue, 9 Sep 2014 01:22:01 +0000 (01:22 +0000)]
Merge "Revert "Fix heap trimmer daemon sleeping.""
Mathieu Chartier [Fri, 5 Sep 2014 01:33:17 +0000 (18:33 -0700)]
Add fast path for FindClass using the type dex file.
If we are using the PathClassLoader with a BootClassLoader
parent, we can handle the common case in the FindClass function
without needing to go back to java code.
Around 10% speedup measured of maps launch, could be noise due to
large variation of app launch times. Eliminates defineClassNative
from being anywhere near the top of sampling profiles.
Bug:
17397179
Bug:
16828525
(cherry picked from commit
8a39e7fe02e9a81853dc7a75cb50d9ece07a9b37)
Change-Id: I1f31de76c1b1a53e32173b1e61a59b0e2f267c98
Mathieu Chartier [Tue, 9 Sep 2014 01:14:22 +0000 (01:14 +0000)]
Merge "Add fast path for FindClass using the type dex file." into lmp-dev
Andreas Gampe [Tue, 9 Sep 2014 00:50:34 +0000 (00:50 +0000)]
am
dd66899f: Merge "ART: Change ART for new native bridge sequence" into lmp-dev
* commit '
dd66899f8d5ca4385937770694d2f2d9fb61ce8e':
ART: Change ART for new native bridge sequence
Mathieu Chartier [Fri, 5 Sep 2014 01:33:17 +0000 (18:33 -0700)]
Add fast path for FindClass using the type dex file.
If we are using the PathClassLoader with a BootClassLoader
parent, we can handle the common case in the FindClass function
without needing to go back to java code.
Around 10% speedup measured of maps launch, could be noise due to
large variation of app launch times. Eliminates defineClassNative
from being anywhere near the top of sampling profiles.
Bug:
17397179
Bug:
16828525
Change-Id: Ide0db2b5f6cf5b96fc46e89178e0799de667cb88
Andreas Gampe [Tue, 9 Sep 2014 00:41:35 +0000 (00:41 +0000)]
Merge "ART: Change ART for new native bridge sequence" into lmp-dev
Mathieu Chartier [Mon, 8 Sep 2014 23:23:23 +0000 (23:23 +0000)]
am
a6cfa907: am
c0e1fa73: Merge "Add test for hashCode and System.identityHashCode." into lmp-dev
* commit '
a6cfa90726905229cab244c3f84106e9efa565a5':
Add test for hashCode and System.identityHashCode.
Jeff Hao [Mon, 8 Sep 2014 23:23:06 +0000 (23:23 +0000)]
am
b4b25cf0: am
b087849f: Disable tracing if enabled by default for new tracing test.
* commit '
b4b25cf0578cd33c804ef696d2046de86ae68a05':
Disable tracing if enabled by default for new tracing test.
Mathieu Chartier [Mon, 8 Sep 2014 23:21:09 +0000 (23:21 +0000)]
am
6aca61ab: Merge "Add test for hashCode and System.identityHashCode."
* commit '
6aca61ab6aff59c2d150fbafbdc48f0490c93d58':
Add test for hashCode and System.identityHashCode.
Mathieu Chartier [Mon, 8 Sep 2014 20:35:11 +0000 (13:35 -0700)]
Ignore heap trim requests if we are the zygote
Done to prevent app launching lag due to sleep in heap trimmer
daemon.
Bug:
17310019
(cherry picked from commit
f81bfa3e21c8a4e031505470ea954c93949cb30b)
Change-Id: I3942d465781218aa04f7edc899ea87aa091f3cf7
Mathieu Chartier [Mon, 8 Sep 2014 20:08:41 +0000 (20:08 +0000)]
Revert "Fix heap trimmer daemon sleeping."
This reverts commit
698b44634396e8111e96e1116586fde89a838347.
(cherry picked from commit
4d3981c72a546b87c8f5d391ff8b5135b8ca99a7)
Change-Id: I7245bc08ebb95c12e7cc71b97edf9ca11ffbdf61
Mathieu Chartier [Mon, 8 Sep 2014 23:09:26 +0000 (23:09 +0000)]
am
c0e1fa73: Merge "Add test for hashCode and System.identityHashCode." into lmp-dev
* commit '
c0e1fa7382b2e8e64da07181aff316dbcc84c395':
Add test for hashCode and System.identityHashCode.
Mathieu Chartier [Mon, 8 Sep 2014 23:09:08 +0000 (23:09 +0000)]
Merge "Add test for hashCode and System.identityHashCode."
Mathieu Chartier [Mon, 8 Sep 2014 23:01:52 +0000 (23:01 +0000)]
Merge "Add test for hashCode and System.identityHashCode." into lmp-dev
Jeff Hao [Mon, 8 Sep 2014 22:57:49 +0000 (22:57 +0000)]
am
b087849f: Disable tracing if enabled by default for new tracing test.
* commit '
b087849f5bbbf25bf5b03cf6172d2a50c08119e9':
Disable tracing if enabled by default for new tracing test.
Jeff Hao [Mon, 8 Sep 2014 22:48:32 +0000 (22:48 +0000)]
am
c1226fe5: am
afb7de60: Merge "Change when sampling thread is reset during shutdown to prevent races." into lmp-dev
* commit '
c1226fe5bf9b6eaab23bc5a4bbd2d245f80062db':
Change when sampling thread is reset during shutdown to prevent races.
Jeff Hao [Mon, 8 Sep 2014 22:32:39 +0000 (15:32 -0700)]
Disable tracing if enabled by default for new tracing test.
Bug:
17412385
Change-Id: If963a9ba2214c72efbef673a840bbeb6fdbb1795
Mathieu Chartier [Mon, 8 Sep 2014 22:30:59 +0000 (22:30 +0000)]
am
16ff467e: am
f81bfa3e: Ignore heap trim requests if we are the zygote
* commit '
16ff467eb5138d1caca26344b49ac9a644667f28':
Ignore heap trim requests if we are the zygote
Mathieu Chartier [Mon, 8 Sep 2014 22:30:58 +0000 (22:30 +0000)]
am
7064b18b: am
4d3981c7: Revert "Fix heap trimmer daemon sleeping."
* commit '
7064b18bac0849b7bb0a272866bc63216f75cc47':
Revert "Fix heap trimmer daemon sleeping."
Jeff Hao [Mon, 8 Sep 2014 22:28:28 +0000 (22:28 +0000)]
am
afb7de60: Merge "Change when sampling thread is reset during shutdown to prevent races." into lmp-dev
* commit '
afb7de600066cc5daba0112eacbfdb43f1fb9f16':
Change when sampling thread is reset during shutdown to prevent races.
Jeff Hao [Mon, 8 Sep 2014 22:22:08 +0000 (22:22 +0000)]
Merge "Change when sampling thread is reset during shutdown to prevent races." into lmp-dev
Jeff Hao [Mon, 8 Sep 2014 16:38:18 +0000 (09:38 -0700)]
Change when sampling thread is reset during shutdown to prevent races.
Also adds some extra argument checking and testing for tracing.
Bug:
17412385
Change-Id: I876378d5bd17d75ab346584713b04dc0656d2120
Mathieu Chartier [Mon, 8 Sep 2014 22:16:35 +0000 (22:16 +0000)]
am
f81bfa3e: Ignore heap trim requests if we are the zygote
* commit '
f81bfa3e21c8a4e031505470ea954c93949cb30b':
Ignore heap trim requests if we are the zygote
Mathieu Chartier [Mon, 8 Sep 2014 22:16:32 +0000 (22:16 +0000)]
am
4d3981c7: Revert "Fix heap trimmer daemon sleeping."
* commit '
4d3981c72a546b87c8f5d391ff8b5135b8ca99a7':
Revert "Fix heap trimmer daemon sleeping."
Mathieu Chartier [Mon, 8 Sep 2014 21:48:25 +0000 (14:48 -0700)]
Add test for hashCode and System.identityHashCode.
(cherry picked from commit
bda2836af470c45e30c567b14d6747a7450c4741)
Change-Id: Ieba8f8eb09441ec145a176df00c293695eae0f47
Mathieu Chartier [Mon, 8 Sep 2014 21:48:25 +0000 (14:48 -0700)]
Add test for hashCode and System.identityHashCode.
Change-Id: I325e95c23bda05bc9babff428111bb8d21f7f2d4
Mathieu Chartier [Mon, 8 Sep 2014 21:22:16 +0000 (21:22 +0000)]
am
6148d534: Merge "Delete double finalization hack."
* commit '
6148d5340d5f2f4cffaa465229a1722b5a775c28':
Delete double finalization hack.
Mathieu Chartier [Mon, 8 Sep 2014 20:35:11 +0000 (13:35 -0700)]
Ignore heap trim requests if we are the zygote
Done to prevent app launching lag due to sleep in heap trimmer
daemon.
Bug:
17310019
Change-Id: Ia593e7eced1c1583771985ec9e7b60ee0c0e7912
Mathieu Chartier [Mon, 8 Sep 2014 21:00:47 +0000 (21:00 +0000)]
Merge "Delete double finalization hack."
Mathieu Chartier [Mon, 8 Sep 2014 20:08:41 +0000 (20:08 +0000)]
Revert "Fix heap trimmer daemon sleeping."
This reverts commit
698b44634396e8111e96e1116586fde89a838347.
Change-Id: Ifa8c2d554b82289cc31803ad6027735d2c3c9be8
Brian Carlstrom [Mon, 8 Sep 2014 20:11:28 +0000 (20:11 +0000)]
am
9b2b927f: Merge "Add CallNonvirtual test"
* commit '
9b2b927f573264c2f0d66b24ceeb361857a41ab3':
Add CallNonvirtual test
Andreas Gampe [Sun, 7 Sep 2014 20:06:12 +0000 (13:06 -0700)]
ART: Fix unchecked register index validity
The static check of index validity is against the type given by
the instruction, e.g., boolean for SPUT_BOOLEAN, but the target_type
is the resolved field type and can differ. An additional check is
necessary to avoid a read out of bounds.
Bug:
17411109
Change-Id: Ie4ed8bbda79f3f6403a24e727450a943447aa71d
Brian Carlstrom [Mon, 8 Sep 2014 19:03:44 +0000 (19:03 +0000)]
Merge "Add CallNonvirtual test"
Andreas Gampe [Wed, 3 Sep 2014 04:22:18 +0000 (21:22 -0700)]
ART: Change ART for new native bridge sequence
Initialize or unload after a fork.
(cherry picked from commit
6be67eeedbe60afce42300ae3e7f0e7180a96efa)
Change-Id: I5a20de1cb68dd1802937b369b14c50c9c1031c67
Brian Carlstrom [Mon, 8 Sep 2014 06:52:02 +0000 (23:52 -0700)]
Add CallNonvirtual test
Change-Id: If0cbfc587cb8fe5d47fda1149629954080dd0f6f
Nicolas Geoffray [Mon, 8 Sep 2014 16:22:47 +0000 (16:22 +0000)]
am
16554258: Merge "Add (simple) side effects flags and equality methods on nodes."
* commit '
165542588f5b8851d681a901580a277196d752d4':
Add (simple) side effects flags and equality methods on nodes.
Nicolas Geoffray [Mon, 8 Sep 2014 16:09:18 +0000 (16:09 +0000)]
Merge "Add (simple) side effects flags and equality methods on nodes."
Nicolas Geoffray [Wed, 3 Sep 2014 13:51:22 +0000 (14:51 +0100)]
Add (simple) side effects flags and equality methods on nodes.
This is in preparation of doing GVN and LICM.
Change-Id: I43050ff846755f9387a62b893d548ecdb54e7e95
Nicolas Geoffray [Mon, 8 Sep 2014 14:55:31 +0000 (14:55 +0000)]
am
9d740016: Merge "Clean-up and make the art script usable on target."
* commit '
9d740016b6ce35e9b596391eafe64be5ceaec76b':
Clean-up and make the art script usable on target.
Nicolas Geoffray [Mon, 8 Sep 2014 14:41:40 +0000 (14:41 +0000)]
Merge "Clean-up and make the art script usable on target."
Nicolas Geoffray [Tue, 2 Sep 2014 14:24:25 +0000 (15:24 +0100)]
Clean-up and make the art script usable on target.
Also add a phony target to build what's needed to use it.
Change-Id: I0bca6b0cbe921653de05fec0ae0cbbff63df580e
Nicolas Geoffray [Mon, 8 Sep 2014 11:36:08 +0000 (11:36 +0000)]
am
0a1d91a6: Merge "Runtime support for the new stack maps for the opt compiler."
* commit '
0a1d91a69919fe4c8c5f227f9b35d76d3c05bd46':
Runtime support for the new stack maps for the opt compiler.
Nicolas Geoffray [Mon, 8 Sep 2014 11:16:48 +0000 (11:16 +0000)]
Merge "Runtime support for the new stack maps for the opt compiler."
Nicolas Geoffray [Tue, 2 Sep 2014 14:17:15 +0000 (15:17 +0100)]
Runtime support for the new stack maps for the opt compiler.
Now most of the methods supported by the compiler can be optimized,
instead of using the baseline.
Change-Id: I80ab36a34913fa4e7dd576c7bf55af63594dc1fa
Sebastien Hertz [Mon, 8 Sep 2014 08:15:19 +0000 (10:15 +0200)]
Fix monitor visit for class initializer
We do not hold class object's lock when invoking class initializer. Therefore
it is wrong to visit it when looking for monitors owned by a thread.
Bug:
17377924
Change-Id: I7fddcdb9a554301e040c571971eec9be6cba5eda
buzbee [Mon, 8 Sep 2014 04:40:07 +0000 (04:40 +0000)]
am
e2c23739: Merge "Quick compiler: Fix handling of unused returns"
* commit '
e2c23739c6395a83b30ece38f8a2e9e1bf7cf3ce':
Quick compiler: Fix handling of unused returns
buzbee [Mon, 8 Sep 2014 04:22:20 +0000 (04:22 +0000)]
Merge "Quick compiler: Fix handling of unused returns"
buzbee [Sun, 7 Sep 2014 18:37:51 +0000 (11:37 -0700)]
Quick compiler: Fix handling of unused returns
As part of the inlining process, the quick compiler will attempt
to eliminate MOVE_RESULT instructions and deliver the result of
the inlined function directly to the eventual use.
The type of the returned value is determined by the subsequent
use (which had already been typed via the size and type
inference pass). However, if a method result is never used the code
just defaulted to assigning dummy core sink register[s]. This
caused a DCHECK failure on some 64-bit systems for methods returning
an unused reference (although the generated code was correct).
This CL selects sink registers for the unused return case based
on the type of the inlined method, and adds another DCHECK to
verify that the result of the size & type inference pass matches
with the inlined method's type.
Internal b/
17328561
Change-Id: I9803ad604fe1bdcf9ff9a1d310cf022a7b6deae2
Bill Buzbee [Sun, 7 Sep 2014 19:55:10 +0000 (19:55 +0000)]
am
9b868cbf: Merge "ART: Make the dominator bitvectors expandable"
* commit '
9b868cbfa6d74387a80ce52a426f9a5bc3ddbbaf':
ART: Make the dominator bitvectors expandable
Bill Buzbee [Sun, 7 Sep 2014 19:38:44 +0000 (19:38 +0000)]
Merge "ART: Make the dominator bitvectors expandable"
Bill Buzbee [Sun, 7 Sep 2014 19:35:31 +0000 (19:35 +0000)]
am
3f546cad: Merge "Fix Thumb2Stm, ldm definition of EncodingMap for arm"
* commit '
3f546cadc83e6de69cf6597858033085d5fcf33e':
Fix Thumb2Stm, ldm definition of EncodingMap for arm
Bill Buzbee [Sun, 7 Sep 2014 19:23:21 +0000 (19:23 +0000)]
Merge "Fix Thumb2Stm, ldm definition of EncodingMap for arm"
Junmo Park [Mon, 1 Sep 2014 07:41:16 +0000 (16:41 +0900)]
Fix Thumb2Stm, ldm definition of EncodingMap for arm
Thumb2Stm instruction can save r0-r12,r14.
But the definition of EncodingMap only set r0-r12.
So it is fixed likes Thumb2Stmia.
Add new assembler formats kFmtLdmRegList and kFmtStmRegList.
Change-Id: Id03118d602f9d49d9d916f3dd9f3198f24ab9c37
Andreas Gampe [Sat, 6 Sep 2014 05:22:38 +0000 (05:22 +0000)]
am
2225c353: Merge "ART: Refactor elf_writer_quick, add symbolizer"
* commit '
2225c3532093e43a15b7485721f12a10b7120be5':
ART: Refactor elf_writer_quick, add symbolizer
Andreas Gampe [Sat, 6 Sep 2014 05:03:34 +0000 (05:03 +0000)]
Merge "ART: Refactor elf_writer_quick, add symbolizer"
Andreas Gampe [Fri, 5 Sep 2014 04:47:42 +0000 (21:47 -0700)]
ART: Refactor elf_writer_quick, add symbolizer
Refactors some classes in elf_writer_quick.h to elf_builder.h to
be more friendly for re-use. Use this in oatdump to add a symtab
to an oat file.
Bug:
17187621,
17322125
Change-Id: I2333291334fd98bd09cc5717fb83cb18efe3a029
Brian Carlstrom [Fri, 5 Sep 2014 23:31:14 +0000 (23:31 +0000)]
am
07700440: Merge "Fix numerous issues with DdmVmInternal allocation tracking"
* commit '
07700440081b36b0e422bbe741f72cbab2cda4c7':
Fix numerous issues with DdmVmInternal allocation tracking
Jean Christophe Beyler [Fri, 5 Sep 2014 23:06:42 +0000 (16:06 -0700)]
ART: Make the dominator bitvectors expandable
The dominator based bitvectors are not expandable. However, if we wish
to add BasicBlocks and recalculate, it is required to make them expandable.
Change-Id: I250684783c233eca31bb40a5bc971c97fcf7c42d
Signed-off-by: Jean Christophe Beyler <jean.christophe.beyler@intel.com>
Brian Carlstrom [Fri, 5 Sep 2014 23:05:06 +0000 (23:05 +0000)]
Merge "Fix numerous issues with DdmVmInternal allocation tracking"
Brian Carlstrom [Fri, 5 Sep 2014 22:58:45 +0000 (22:58 +0000)]
Merge "resolved conflicts for merge of
ac4d0dae to lmp-dev-plus-aosp" into lmp-dev-plus-aosp
Mathieu Chartier [Fri, 5 Sep 2014 21:40:03 +0000 (14:40 -0700)]
Delete double finalization hack.
No longer necessary.
Change-Id: Ie5eb9e9ce4b8473d3b3e65bd108f93223b9a80dd
Brian Carlstrom [Fri, 5 Sep 2014 20:01:41 +0000 (13:01 -0700)]
Fix numerous issues with DdmVmInternal allocation tracking
Issues addressed:
- Using without JDWP attached caused native crash.
- When buffer is full (64k entries), number of entries reported was 0.
- Disabling tracking after disabling tracking caused native crash.
- Asking for allocations after disabled caused native crash.
- Lock ordering issues between mutator lock and alloc tracker lock.
Adding 098-ddmc test to cover these cases.
Bug:
17392248
(cherry picked from commit
a5815065ac0877add9c0db3605d27b4d6c426e61)
Change-Id: Ib0bc18dfcdafcc050ab9dceed3d167dd878d1d7a
Brian Carlstrom [Fri, 5 Sep 2014 20:01:41 +0000 (13:01 -0700)]
resolved conflicts for merge of
ac4d0dae to lmp-dev-plus-aosp
Change-Id: Icaa559f50347059de7ebf61eb3587789b6fc6738
Brian Carlstrom [Fri, 5 Sep 2014 20:01:41 +0000 (13:01 -0700)]
resolved conflicts for merge of
ac4d0dae to lmp-dev-plus-aosp
Change-Id: I23aba4b3f69aec0440210ad1aa5232abdef90e42