OSDN Git Service
David Brazdil [Wed, 29 Apr 2015 16:16:07 +0000 (17:16 +0100)]
ART: Fix loop information after dead code elimination
Compilation failed when only some blocks of a loop were removed during
dead code elimination.
Bug:
20680703
(cherry picked from commit
69a2804c3bb48cf4fd00a66080f613a4fd96c422)
Change-Id: If9988381236e4d8d8c3b508dfce1376b27c20d75
nikolay serdjuk [Mon, 27 Apr 2015 11:52:57 +0000 (17:52 +0600)]
Fix for incorrect encode and parse of PEXTRW instruction
The instruction PEXTRW encoded by sequence 66 0F 3A 15
was incorrectly encoded in compiler table and incorrectly
parsed by disassembler.
Signed-off-by: nikolay serdjuk <nikolay.y.serdjuk@intel.com>
(cherry picked from commit
e0705f51fdc71e9670a29f8c3a47168f50724b35)
Change-Id: I7f051e23789aa3745d6eb854c97f80c475748b74
Vladimir Marko [Wed, 29 Apr 2015 08:27:39 +0000 (08:27 +0000)]
Merge "Quick: Fix crash on fall-through out of method code." into mnc-dev
Andreas Gampe [Wed, 29 Apr 2015 06:16:03 +0000 (23:16 -0700)]
ART: Move dex2oat watchdog output to LogLine
The fprintf isn't visible on device, as it doesn't end up in the
logcat.
Also increase the watchdog timeout to 10 minutes.
Bug:
20658562
(cherry picked from commit
d687e375cf7507b5c36df63cf03c991038b1c218)
Change-Id: I1fec8dae25f9282f72e762bda934fceb948bbd5f
Andreas Gampe [Wed, 29 Apr 2015 04:28:36 +0000 (04:28 +0000)]
Merge "ART: Remove multidex limit" into mnc-dev
Mathieu Chartier [Wed, 29 Apr 2015 03:51:31 +0000 (03:51 +0000)]
am
4a3fff8f: (-s ours) am
471b7cb6: HACK: Disable native stack trace dumping for tetra. DO NOT MERGE
* commit '
4a3fff8fc5021da3ef0b10850ac4ffbdef11c27c':
HACK: Disable native stack trace dumping for tetra. DO NOT MERGE
Mathieu Chartier [Tue, 28 Apr 2015 23:27:58 +0000 (23:27 +0000)]
am
471b7cb6: HACK: Disable native stack trace dumping for tetra. DO NOT MERGE
* commit '
471b7cb6c1b8128bb343b49198f2654f9f5b8f86':
HACK: Disable native stack trace dumping for tetra. DO NOT MERGE
Mathieu Chartier [Tue, 28 Apr 2015 22:07:07 +0000 (15:07 -0700)]
HACK: Disable native stack trace dumping for tetra. DO NOT MERGE
Hopefully stops deadlocks.
Bug:
20640601
Change-Id: I3e19217b6da002d328ffa7d941e14bfe734442c3
Mathieu Chartier [Tue, 28 Apr 2015 20:53:02 +0000 (13:53 -0700)]
Fix possible null deference in Throwable::Dump
Bug:
20640601
(cherry picked from commit
4a24858d432331049c416ae6a5993762bfe5e438)
Change-Id: I42a34510798aeb492f375dbb8edb7efeae0ae339
Andreas Gampe [Tue, 28 Apr 2015 03:01:52 +0000 (20:01 -0700)]
ART: Remove multidex limit
Remove the arbitrary multidex limit. If users want to use many
files, allow them, but print a warning after a considerable amount.
Bug:
20071800
Change-Id: Ic51c96b84042f769a7d33ec53fe587b68cd69df4
Calin Juravle [Tue, 7 Apr 2015 18:43:36 +0000 (19:43 +0100)]
Quick: Fix crash on fall-through out of method code.
Fix Quick crash when the last insn has a fall-through out of
the method's code. Allow creation of an out-of-method block
and at the end of MIRGraph::InlineMethod() check if that
block is reachable. If it is, punt to interpreter. Add tests
for unreachable if-lt and packed-switch as the last insn.
Also fix MIRGraph::ProcessCanSwitch() to treat the offset to
the data as signed. Jumping over the data with a goto and
using it from a switch further down is valid. This was also
crashing (presumably only on 64-bit dex2oat).
Thanks to Stephen Kyle (stephenckyle@googlemail.com) for the
bug report.
Bug:
19988134
(cherry picked from commit
2bee20b5f0d783b43c1bbbe281f69a6f9b9e0a98)
Change-Id: I8cff7105a66aeb79a91689c3adb216f61ab57e40
Vladimir Marko [Tue, 28 Apr 2015 17:07:03 +0000 (17:07 +0000)]
Merge "Quick: Avoid unnecessary GVN work in release builds." into mnc-dev
Vladimir Marko [Sat, 25 Apr 2015 16:00:45 +0000 (17:00 +0100)]
Quick: Avoid unnecessary GVN work in release builds.
In GVN's post-processing phase, compare LVNs only in debug
builds as they should be equal anyway.
Remove the Gate() from GVN cleanup pass and remove the
DCHECK() from MIRGraph::GlobalValueNumberingCleanup()
to make it a no-op if the GVN didn't run.
Bug:
16398693
(cherry picked from commit
f725550c8df90f8ec07395d9be5177a4be591c12)
Change-Id: I518fba4a06c8d6d5ab16a6c122dc680b6d44814b
Vladimir Marko [Tue, 28 Apr 2015 17:00:09 +0000 (17:00 +0000)]
Merge "Quick: Rely on inferred types in GVN/LVN/DCE." into mnc-dev
Sebastien Hertz [Tue, 28 Apr 2015 13:00:41 +0000 (15:00 +0200)]
Fix constructor access check through reflection
We must not throw IllegalAccessException if the constructor has been
made accessible by a previous call to Constructor.setAccessible, even
if the caller cannot access the constructor.
Bug:
20639158
(cherry picked from commit
2d2f2a9c665b02ca5139f71e37ca5e08389e4191)
Change-Id: Ic5cb54256f11aefcfaa99f2ee85c4a32f30e693a
Vladimir Marko [Fri, 24 Apr 2015 18:03:51 +0000 (19:03 +0100)]
Quick: Rely on inferred types in GVN/LVN/DCE.
Fix LVN::GetEndingVregValueNumberImpl() to check whether
the requested wideness matches the SSA register type as
recorded in MIRGraph::reg_location_.
Add DCHECKs that the wideness matches when getting/setting
sreg values, update Phi handling in LVN/DCE to use the type
from MIRGraph::reg_location_ instead of determining it from
the sreg value maps which would now trigger the DCHECKs.
Update tests to initialize MIRGraph::reg_location_.
Reenable DCE.
Bug:
20572509
(cherry picked from commit
a5e69e87c630c08c0de1740427e60d531ce851b9)
Change-Id: Ieb97ac9e3672b977e36fd7f369a975bae7d5271e
Andreas Gampe [Tue, 28 Apr 2015 00:26:37 +0000 (17:26 -0700)]
ART: Fix constructor access checking
Constructor access must be checked.
Bug:
20639158
Change-Id: I3c586e9572a748d208bea43aa2349c3ef52a2ee5
David Brazdil [Mon, 27 Apr 2015 12:28:57 +0000 (13:28 +0100)]
ART: Fix removing a Phi with RemoveInstruction
Boolean simplifier might attempt to remove a Phi from the Instruction
list.
(cherry picked from commit
c7508e93fa3df3a3890f6b62550cbd5e35bdd8df)
Change-Id: Ic8ad31967aa3e47c1fb1c67553d08681b6063a16
Andreas Gampe [Sun, 26 Apr 2015 18:39:35 +0000 (18:39 +0000)]
am
5b5bd419: am
6b501251: am
2c31b5ac: Merge "ART: Fix Trace types, check minimum buf size"
* commit '
5b5bd4199bc77be99f06904c31cde331378b6679':
ART: Fix Trace types, check minimum buf size
Andreas Gampe [Sun, 26 Apr 2015 18:39:33 +0000 (18:39 +0000)]
am
357b71e1: am
bd90c932: am
711d8400: Merge "ART: Fix addpd opcode, add Quick x86 assembler test"
* commit '
357b71e188bb4aa371cc7d834f573cb7a8f30f44':
ART: Fix addpd opcode, add Quick x86 assembler test
Andreas Gampe [Sun, 26 Apr 2015 01:12:54 +0000 (01:12 +0000)]
am
6b501251: am
2c31b5ac: Merge "ART: Fix Trace types, check minimum buf size"
* commit '
6b501251111559585b08f1c6641ffec39a96699d':
ART: Fix Trace types, check minimum buf size
Andreas Gampe [Sun, 26 Apr 2015 01:12:52 +0000 (01:12 +0000)]
am
bd90c932: am
711d8400: Merge "ART: Fix addpd opcode, add Quick x86 assembler test"
* commit '
bd90c932e570b28406932e33f2aa3c113ba2efa3':
ART: Fix addpd opcode, add Quick x86 assembler test
Andreas Gampe [Sun, 26 Apr 2015 01:00:42 +0000 (01:00 +0000)]
am
2c31b5ac: Merge "ART: Fix Trace types, check minimum buf size"
* commit '
2c31b5ac1d45f2f96932c8ff0d299abb2dbde862':
ART: Fix Trace types, check minimum buf size
Andreas Gampe [Sun, 26 Apr 2015 01:00:40 +0000 (01:00 +0000)]
am
711d8400: Merge "ART: Fix addpd opcode, add Quick x86 assembler test"
* commit '
711d84008f5b3cda849611102118316c29a75b16':
ART: Fix addpd opcode, add Quick x86 assembler test
Andreas Gampe [Sun, 26 Apr 2015 00:41:53 +0000 (00:41 +0000)]
Merge "ART: Fix Trace types, check minimum buf size"
Andreas Gampe [Sun, 26 Apr 2015 00:39:03 +0000 (00:39 +0000)]
Merge "ART: Fix addpd opcode, add Quick x86 assembler test"
Andreas Gampe [Sat, 25 Apr 2015 21:44:29 +0000 (14:44 -0700)]
ART: Fix Trace types, check minimum buf size
Also make streaming mode adhere to the given buffer (and fix the
case where the buffer is too small for a packet). This is important
to not lose too much tracing information when the runtime is destroyed
with an unflushed buffer.
Change-Id: I6525fe4326ac5c3d7c9cda41c54a2a911ca889b7
Chao-ying Fu [Wed, 22 Apr 2015 17:51:21 +0000 (10:51 -0700)]
ART: Fix addpd opcode, add Quick x86 assembler test
This patch fixes the addpd opcode that may be used by vectorizations,
and adds an assembler test for the Quick x86 assembler, currently
lightly testing addpd, subpd and mulpd.
Change-Id: I29455a86212829c75fd75737679280f167da7b5b
Signed-off-by: Chao-ying Fu <chao-ying.fu@intel.com>
Andreas Gampe [Sat, 25 Apr 2015 23:39:27 +0000 (23:39 +0000)]
am
29d577f5: am
8b8315bb: am
3f4fa70a: Merge "ART: Test for GVN skipping"
* commit '
29d577f58f9153c2c0a9b381afe4070bc00941b8':
ART: Test for GVN skipping
Andreas Gampe [Sat, 25 Apr 2015 23:16:46 +0000 (23:16 +0000)]
am
8b8315bb: am
3f4fa70a: Merge "ART: Test for GVN skipping"
* commit '
8b8315bb06df616cecb267f662ecdc17023cfe51':
ART: Test for GVN skipping
Mathieu Chartier [Sat, 25 Apr 2015 23:16:22 +0000 (23:16 +0000)]
am
3af3ec12: am
8ef054db: am
0cd91f05: Merge "Move Class.newInstance to native"
* commit '
3af3ec1291641fde3cbc8e4dce0ee87f3830490c':
Move Class.newInstance to native
Andreas Gampe [Sat, 25 Apr 2015 23:04:57 +0000 (23:04 +0000)]
am
3f4fa70a: Merge "ART: Test for GVN skipping"
* commit '
3f4fa70a251443b7e35ee0464120e53daf4ae9c1':
ART: Test for GVN skipping
Andreas Gampe [Sat, 25 Apr 2015 23:01:12 +0000 (23:01 +0000)]
am
8fa312e1: am
14fd800f: am
18772f08: Merge "ART: Fix missing dependency between GVN and other passes"
* commit '
8fa312e135895912f7a883b5dc52c1b39d5148c6':
ART: Fix missing dependency between GVN and other passes
Andreas Gampe [Sat, 25 Apr 2015 22:59:23 +0000 (22:59 +0000)]
Merge "ART: Test for GVN skipping"
Andreas Gampe [Sat, 25 Apr 2015 22:27:38 +0000 (15:27 -0700)]
ART: Test for GVN skipping
Add a deeply nested loop to test 090 that will make the GVN skip.
Change-Id: I7c160293e76fd858c550f792b357eaaccdde77a9
Mathieu Chartier [Sat, 25 Apr 2015 22:54:45 +0000 (22:54 +0000)]
am
8ef054db: am
0cd91f05: Merge "Move Class.newInstance to native"
* commit '
8ef054dbe2d89f226af70f57c9d7fa7c8faaad14':
Move Class.newInstance to native
Mathieu Chartier [Sat, 25 Apr 2015 22:43:52 +0000 (22:43 +0000)]
am
0cd91f05: Merge "Move Class.newInstance to native"
* commit '
0cd91f05f11ccf7d55bf744053b0aae5e0e7aa36':
Move Class.newInstance to native
Andreas Gampe [Sat, 25 Apr 2015 22:38:51 +0000 (22:38 +0000)]
am
14fd800f: am
18772f08: Merge "ART: Fix missing dependency between GVN and other passes"
* commit '
14fd800f5a2501a90e04ffdd520ca5eceb154802':
ART: Fix missing dependency between GVN and other passes
Mathieu Chartier [Sat, 25 Apr 2015 22:36:26 +0000 (22:36 +0000)]
Merge "Move Class.newInstance to native"
Andreas Gampe [Sat, 25 Apr 2015 22:27:13 +0000 (22:27 +0000)]
am
18772f08: Merge "ART: Fix missing dependency between GVN and other passes"
* commit '
18772f087eb0eb14ba816ed088107c43958eb8c3':
ART: Fix missing dependency between GVN and other passes
Andreas Gampe [Sat, 25 Apr 2015 22:18:23 +0000 (22:18 +0000)]
Merge "ART: Fix missing dependency between GVN and other passes"
Andreas Gampe [Sat, 25 Apr 2015 21:47:31 +0000 (14:47 -0700)]
ART: Fix missing dependency between GVN and other passes
The GVN may be turned off completely, or skip running when the
method is too complex. Turn off DCE in that case.
The dependent cleanup pass is not an optimization pass, so can't be
turned off that way. Check whether the GVN skipped in the gate function.
A possible follow-up is proper dependencies between passes.
Change-Id: I5b7951ecd6c74ebbfa5b23726a3d2f3ea1a23a47
Mathieu Chartier [Fri, 24 Apr 2015 23:55:16 +0000 (16:55 -0700)]
Move Class.newInstance to native
Avoids 1 allocation and several JNI transitions.
Before:
Class_classNewInstance: 4462.39 ns; σ=39.42 ns @ 3 trials
After:
Class_classNewInstance: 1073.39 ns; σ=24.14 ns @ 10 trials
Bug:
20269715
Bug:
20566996
Change-Id: Icd52155ce79a978a4d869855bfdfd7735abd8187
Andreas Gampe [Sat, 25 Apr 2015 20:20:09 +0000 (20:20 +0000)]
am
6ad9dfd8: am
3aabf605: am
3d58dea2: Merge "ART: Refactor utils/assembler test"
* commit '
6ad9dfd8ee7acafeb86155872a59103aa2912035':
ART: Refactor utils/assembler test
Andreas Gampe [Sat, 25 Apr 2015 19:58:50 +0000 (19:58 +0000)]
am
3aabf605: am
3d58dea2: Merge "ART: Refactor utils/assembler test"
* commit '
3aabf6052069588c9aa2d79da9496c5326e8ea4c':
ART: Refactor utils/assembler test
Andreas Gampe [Sat, 25 Apr 2015 19:47:41 +0000 (19:47 +0000)]
am
3d58dea2: Merge "ART: Refactor utils/assembler test"
* commit '
3d58dea2a9d82aed045908fd9ea68c41f3d1f63d':
ART: Refactor utils/assembler test
Andreas Gampe [Sat, 25 Apr 2015 19:38:39 +0000 (19:38 +0000)]
Merge "ART: Refactor utils/assembler test"
Vladimir Marko [Sat, 25 Apr 2015 15:03:39 +0000 (15:03 +0000)]
am
41d0ae0c: am
e19a9eef: am
4a35e768: Merge "Disable Quick\'s GVN-based dead code elimination."
* commit '
41d0ae0c46083b289c45d5dd6f76eb2128f51510':
Disable Quick's GVN-based dead code elimination.
Vladimir Marko [Sat, 25 Apr 2015 14:42:37 +0000 (14:42 +0000)]
am
e19a9eef: am
4a35e768: Merge "Disable Quick\'s GVN-based dead code elimination."
* commit '
e19a9eefa66c8af72c582bbfd07087b39a5d84bc':
Disable Quick's GVN-based dead code elimination.
Vladimir Marko [Sat, 25 Apr 2015 14:32:43 +0000 (14:32 +0000)]
am
4a35e768: Merge "Disable Quick\'s GVN-based dead code elimination."
* commit '
4a35e768dcb12ffecfed07e0417610afcb9472eb':
Disable Quick's GVN-based dead code elimination.
Nicolas Geoffray [Sat, 25 Apr 2015 14:23:37 +0000 (14:23 +0000)]
am
df5cef96: am
8198883c: am
948dfff2: Merge "Mark the test as failing while investigating."
* commit '
df5cef96411699c3b2d6e22208df3218e0aec415':
Mark the test as failing while investigating.
Vladimir Marko [Sat, 25 Apr 2015 14:20:53 +0000 (14:20 +0000)]
Merge "Disable Quick's GVN-based dead code elimination."
Roland Levillain [Sat, 25 Apr 2015 11:17:24 +0000 (12:17 +0100)]
Disable Quick's GVN-based dead code elimination.
Quick's GVN/DCE seems to trouble the builds.
Bug:
20572509
Change-Id: I1e315b4eee4443f04c7cb2cef953d8e4eff619ce
Nicolas Geoffray [Sat, 25 Apr 2015 13:59:57 +0000 (13:59 +0000)]
am
8198883c: am
948dfff2: Merge "Mark the test as failing while investigating."
* commit '
8198883c836af7e8fe6bb2ee59a1c0903c1b3d37':
Mark the test as failing while investigating.
Nicolas Geoffray [Sat, 25 Apr 2015 13:49:30 +0000 (13:49 +0000)]
am
948dfff2: Merge "Mark the test as failing while investigating."
* commit '
948dfff2ee9c3411088a89e1a8664652f46fbf35':
Mark the test as failing while investigating.
Nicolas Geoffray [Sat, 25 Apr 2015 13:41:55 +0000 (13:41 +0000)]
Merge "Mark the test as failing while investigating."
Nicolas Geoffray [Sat, 25 Apr 2015 13:39:59 +0000 (14:39 +0100)]
Mark the test as failing while investigating.
Recent linker changes required to increase the scope
of our chroot-like environment on devices. There is however just this
test failing.
Change-Id: I496be04693b6cebefe68a0ac04947ed238b53e0d
Andreas Gampe [Sat, 25 Apr 2015 04:41:45 +0000 (21:41 -0700)]
ART: Refactor utils/assembler test
Split out the part that compares a buffer with the product of a
host assembler. That will allow to reuse this for the Quick
assemblers.
Change-Id: Ie15777cb0a22f7532d8a8ea35403db0f229cd26f
Andreas Gampe [Sat, 25 Apr 2015 04:33:02 +0000 (04:33 +0000)]
am
6acd763c: am
ce8b3fea: am
1e3ab9ad: Merge "ART: Fix DBG_START_LOCAL verification."
* commit '
6acd763c24867cf3c98be39a0f9a19b5942a6b17':
ART: Fix DBG_START_LOCAL verification.
Andreas Gampe [Sat, 25 Apr 2015 04:17:44 +0000 (04:17 +0000)]
am
5cf71a08: am
4c9dd79c: am
940c65d6: Merge "[optimizing] Rename HasArrayAccesses and check it"
* commit '
5cf71a082e6638b61d6743bbe285f24d5c5ea6fc':
[optimizing] Rename HasArrayAccesses and check it
Andreas Gampe [Sat, 25 Apr 2015 04:12:46 +0000 (04:12 +0000)]
am
ce8b3fea: am
1e3ab9ad: Merge "ART: Fix DBG_START_LOCAL verification."
* commit '
ce8b3feaf57c692e11cc48d3fa4837521990bf72':
ART: Fix DBG_START_LOCAL verification.
Andreas Gampe [Sat, 25 Apr 2015 04:07:40 +0000 (04:07 +0000)]
am
51f271c8: am
e08556a2: am
808db527: Merge "[optimizing] Handle x86 const length BoundsCheck"
* commit '
51f271c8773bfcb009d5c74f43315431bc09d7a9':
[optimizing] Handle x86 const length BoundsCheck
Andreas Gampe [Sat, 25 Apr 2015 04:07:38 +0000 (04:07 +0000)]
am
a183e1ae: am
6bcc8378: am
c435e014: Merge "ART: Duplicate-classes cleanup"
* commit '
a183e1aed9ba7abcf79e741841c414d9abe7c5ec':
ART: Duplicate-classes cleanup
Andreas Gampe [Sat, 25 Apr 2015 04:01:32 +0000 (04:01 +0000)]
am
1e3ab9ad: Merge "ART: Fix DBG_START_LOCAL verification."
* commit '
1e3ab9ad421d471ca8eadac03084ce19fd06d4eb':
ART: Fix DBG_START_LOCAL verification.
Andreas Gampe [Sat, 25 Apr 2015 03:56:59 +0000 (03:56 +0000)]
am
4c9dd79c: am
940c65d6: Merge "[optimizing] Rename HasArrayAccesses and check it"
* commit '
4c9dd79c58353ca6612eb352bea2656c0c5bc1d7':
[optimizing] Rename HasArrayAccesses and check it
Andreas Gampe [Sat, 25 Apr 2015 03:51:07 +0000 (03:51 +0000)]
Merge "ART: Fix DBG_START_LOCAL verification."
Andreas Gampe [Sat, 25 Apr 2015 03:44:54 +0000 (03:44 +0000)]
am
e08556a2: am
808db527: Merge "[optimizing] Handle x86 const length BoundsCheck"
* commit '
e08556a2c9416f2f6cfdac4497c10aa98c09673a':
[optimizing] Handle x86 const length BoundsCheck
Andreas Gampe [Sat, 25 Apr 2015 03:44:53 +0000 (03:44 +0000)]
am
6bcc8378: am
c435e014: Merge "ART: Duplicate-classes cleanup"
* commit '
6bcc83784f3ed50644f8c0ff270b7bb71eed7814':
ART: Duplicate-classes cleanup
Andreas Gampe [Sat, 25 Apr 2015 03:44:50 +0000 (03:44 +0000)]
am
940c65d6: Merge "[optimizing] Rename HasArrayAccesses and check it"
* commit '
940c65d6757130d2e9f864d4c2220838f0312bea':
[optimizing] Rename HasArrayAccesses and check it
Logan Chien [Sun, 19 Apr 2015 15:27:52 +0000 (23:27 +0800)]
ART: Fix DBG_START_LOCAL verification.
The third ULEB128 of DBG_START_LOCAL and DBG_START_LOCAL_EXTENDED
entries should be interpreted as type_idx instead.
see also. dalvik/dx/src/com/android/dx/dex/file/DebugInfoEncoder.java
Change-Id: Ic0d52ed20cc2614acb9fa54b61095d1bd64f73fe
Andreas Gampe [Sat, 25 Apr 2015 03:38:14 +0000 (03:38 +0000)]
Merge "[optimizing] Rename HasArrayAccesses and check it"
Andreas Gampe [Sat, 25 Apr 2015 03:34:43 +0000 (03:34 +0000)]
am
808db527: Merge "[optimizing] Handle x86 const length BoundsCheck"
* commit '
808db5276827c909818d5595a5600e64b97f66e0':
[optimizing] Handle x86 const length BoundsCheck
Andreas Gampe [Sat, 25 Apr 2015 03:34:41 +0000 (03:34 +0000)]
am
c435e014: Merge "ART: Duplicate-classes cleanup"
* commit '
c435e014f7c0c93b0459a0d04e3f7e893d6ce9c6':
ART: Duplicate-classes cleanup
Andreas Gampe [Sat, 25 Apr 2015 03:25:43 +0000 (03:25 +0000)]
Merge "[optimizing] Handle x86 const length BoundsCheck"
Andreas Gampe [Sat, 25 Apr 2015 03:23:30 +0000 (03:23 +0000)]
Merge "ART: Duplicate-classes cleanup"
Andreas Gampe [Sat, 25 Apr 2015 03:22:06 +0000 (20:22 -0700)]
ART: Duplicate-classes cleanup
Disable old test. Improve collision warning message. Add a comment
about the algorithm.
Change-Id: Ibd29d79565732162150aebd7fe08d0895ccf3d79
Andreas Gampe [Sat, 25 Apr 2015 02:17:05 +0000 (02:17 +0000)]
am
75afc86d: am
0965ce8f: am
6e655afb: Merge "ART: Check for duplicate classes when loading oat files"
* commit '
75afc86df2785a02ef56c2d024fb2ea8d91f470e':
ART: Check for duplicate classes when loading oat files
Andreas Gampe [Sat, 25 Apr 2015 02:07:34 +0000 (02:07 +0000)]
am
74f5ce77: am
3856df46: am
b5aad4c5: Merge "ART: Add GENERATE_CFI to the ZygoteHooks debug flags"
* commit '
74f5ce7781c42a60efbd657a70562dfb572e0961':
ART: Add GENERATE_CFI to the ZygoteHooks debug flags
Andreas Gampe [Sat, 25 Apr 2015 01:53:43 +0000 (01:53 +0000)]
am
0965ce8f: am
6e655afb: Merge "ART: Check for duplicate classes when loading oat files"
* commit '
0965ce8fa35b487bbf36bbfb7bed795e9547f647':
ART: Check for duplicate classes when loading oat files
Andreas Gampe [Sat, 25 Apr 2015 01:42:27 +0000 (01:42 +0000)]
am
6e655afb: Merge "ART: Check for duplicate classes when loading oat files"
* commit '
6e655afb37a528cfd90aa702b1600e1eb5d10a58':
ART: Check for duplicate classes when loading oat files
Andreas Gampe [Sat, 25 Apr 2015 01:35:00 +0000 (01:35 +0000)]
Merge "ART: Check for duplicate classes when loading oat files"
Andreas Gampe [Sat, 25 Apr 2015 01:10:53 +0000 (01:10 +0000)]
am
3856df46: am
b5aad4c5: Merge "ART: Add GENERATE_CFI to the ZygoteHooks debug flags"
* commit '
3856df46f8ceb741b39dd40392b9485b47c35a54':
ART: Add GENERATE_CFI to the ZygoteHooks debug flags
Andreas Gampe [Sat, 25 Apr 2015 00:59:30 +0000 (00:59 +0000)]
am
b5aad4c5: Merge "ART: Add GENERATE_CFI to the ZygoteHooks debug flags"
* commit '
b5aad4c54e0bf1aff6a0c49cb682defaafb81e1e':
ART: Add GENERATE_CFI to the ZygoteHooks debug flags
Andreas Gampe [Sat, 25 Apr 2015 00:48:45 +0000 (00:48 +0000)]
Merge "ART: Add GENERATE_CFI to the ZygoteHooks debug flags"
Andreas Gampe [Sat, 25 Apr 2015 00:10:35 +0000 (00:10 +0000)]
am
4e1b01fc: am
21225131: am
33984b4d: Merge "ART: Do not log non-swap usage"
* commit '
4e1b01fc5c7555e21f150196e90b11dfd5ece883':
ART: Do not log non-swap usage
Mark Mendell [Wed, 22 Apr 2015 20:18:52 +0000 (16:18 -0400)]
[optimizing] Handle x86 const length BoundsCheck
Allow a constant length for BoundsCheck.
Change-Id: I2c7adc6e733cf8ce6997aba76aa763d0835bd2d6
Signed-off-by: Mark Mendell <mark.p.mendell@intel.com>
Andreas Gampe [Fri, 24 Apr 2015 23:49:15 +0000 (23:49 +0000)]
am
21225131: am
33984b4d: Merge "ART: Do not log non-swap usage"
* commit '
2122513125735bbe9ca4e971bbdd888fb4bcbb4e':
ART: Do not log non-swap usage
Mathieu Chartier [Fri, 24 Apr 2015 23:36:22 +0000 (23:36 +0000)]
am
4aaeabde: am
63921cfe: am
16b5d29f: Merge "Guard against name == null in ShortDump"
* commit '
4aaeabde6d173aea0b202ebfea5c2d8fc7f1f67e':
Guard against name == null in ShortDump
Andreas Gampe [Fri, 24 Apr 2015 23:36:03 +0000 (23:36 +0000)]
am
33984b4d: Merge "ART: Do not log non-swap usage"
* commit '
33984b4d6b79b2d65258e69506e5669be704db82':
ART: Do not log non-swap usage
Andreas Gampe [Fri, 24 Apr 2015 23:33:43 +0000 (16:33 -0700)]
ART: Add GENERATE_CFI to the ZygoteHooks debug flags
Add code to understand the implications of the debug.gencfi system
property that forces generation of CFI data.
Change-Id: Ida66f8c1567634d05cfdbba1a982be3684e94369
Andreas Gampe [Fri, 24 Apr 2015 23:30:18 +0000 (23:30 +0000)]
Merge "ART: Do not log non-swap usage"
Mark Mendell [Fri, 24 Apr 2015 21:06:35 +0000 (17:06 -0400)]
[optimizing] Rename HasArrayAccesses and check it
Since the flag is only used to see if there is a HBoundsCheck, rename
HasArrayAccesses() to HasBoundsChecks().
Add a check in graph_checker to see that the flag is set if we see a
HBoundsCheck instruction.
Change-Id: I10fe92897374fb247082152dd75c3611cc40ff30
Signed-off-by: Mark Mendell <mark.p.mendell@intel.com>
Andreas Gampe [Fri, 24 Apr 2015 23:22:18 +0000 (16:22 -0700)]
ART: Do not log non-swap usage
Reduce logcat noise.
Bug:
20501758
Change-Id: I5cbc28614d4be9e7fd120b7ccb97ca489e341f54
Roland Levillain [Fri, 24 Apr 2015 23:21:22 +0000 (23:21 +0000)]
am
9643beab: am
233f1575: am
93cf23f9: Merge "Fix DCHECKs about clinit checks in Optimizing\'s code generators."
* commit '
9643beab72f2509ad924fd976cb214cb8de193a3':
Fix DCHECKs about clinit checks in Optimizing's code generators.
Mathieu Chartier [Fri, 24 Apr 2015 23:19:52 +0000 (23:19 +0000)]
am
63921cfe: am
16b5d29f: Merge "Guard against name == null in ShortDump"
* commit '
63921cfe407e093a527c94f5e01b03e89669f18a':
Guard against name == null in ShortDump
Mathieu Chartier [Fri, 24 Apr 2015 23:08:43 +0000 (23:08 +0000)]
am
16b5d29f: Merge "Guard against name == null in ShortDump"
* commit '
16b5d29f1755e50ab92a3bee0b85b26460e69cf8':
Guard against name == null in ShortDump
Mathieu Chartier [Fri, 24 Apr 2015 23:02:39 +0000 (23:02 +0000)]
Merge "Guard against name == null in ShortDump"
Roland Levillain [Fri, 24 Apr 2015 22:58:55 +0000 (22:58 +0000)]
am
233f1575: am
93cf23f9: Merge "Fix DCHECKs about clinit checks in Optimizing\'s code generators."
* commit '
233f1575843c6f94d96be90ba145a2623bff6d8f':
Fix DCHECKs about clinit checks in Optimizing's code generators.
Roland Levillain [Fri, 24 Apr 2015 22:47:16 +0000 (22:47 +0000)]
am
93cf23f9: Merge "Fix DCHECKs about clinit checks in Optimizing\'s code generators."
* commit '
93cf23f9966cdbe88650b822ad8471284a21bacb':
Fix DCHECKs about clinit checks in Optimizing's code generators.
Roland Levillain [Fri, 24 Apr 2015 22:35:49 +0000 (22:35 +0000)]
Merge "Fix DCHECKs about clinit checks in Optimizing's code generators."