OSDN Git Service
Roland Levillain [Wed, 29 Apr 2015 10:42:02 +0000 (10:42 +0000)]
am
0a3e6543: am
fadf977d: Merge "Add InsertInstructionAfter in HBasicBlock."
* commit '
0a3e65439311f24c534a7b5640cc4918a5293c45':
Add InsertInstructionAfter in HBasicBlock.
Roland Levillain [Wed, 29 Apr 2015 10:42:00 +0000 (10:42 +0000)]
am
519873f3: am
d474b1d0: Merge "Revert "Revert "[optimizing] Improve x86 shifts"""
* commit '
519873f3306fbf0c4a33f0b666e4fefcd66f6aa1':
Revert "Revert "[optimizing] Improve x86 shifts""
Roland Levillain [Wed, 29 Apr 2015 10:29:08 +0000 (10:29 +0000)]
am
fadf977d: Merge "Add InsertInstructionAfter in HBasicBlock."
* commit '
fadf977d85bfbf3f9d5d4730afb660cbed34f989':
Add InsertInstructionAfter in HBasicBlock.
Roland Levillain [Wed, 29 Apr 2015 10:29:05 +0000 (10:29 +0000)]
am
d474b1d0: Merge "Revert "Revert "[optimizing] Improve x86 shifts"""
* commit '
d474b1d0fd69fdeb481adda8c0814512956f2d51':
Revert "Revert "[optimizing] Improve x86 shifts""
Roland Levillain [Wed, 29 Apr 2015 10:23:07 +0000 (10:23 +0000)]
Merge "Add InsertInstructionAfter in HBasicBlock."
Roland Levillain [Wed, 29 Apr 2015 10:18:40 +0000 (10:18 +0000)]
Merge "Revert "Revert "[optimizing] Improve x86 shifts"""
Vladimir Marko [Wed, 29 Apr 2015 09:31:27 +0000 (09:31 +0000)]
am
a81a746c: Merge "Quick: Fix crash on fall-through out of method code." into mnc-dev
* commit '
a81a746cad998e4cbfb7b18193879d8d1e1f8772':
Quick: Fix crash on fall-through out of method code.
Roland Levillain [Wed, 29 Apr 2015 09:22:37 +0000 (10:22 +0100)]
Revert "Revert "[optimizing] Improve x86 shifts""
This reverts commit
f9aac1e9f442c2486cd54f045d43e15791601205.
Don't use Location::Any() for the first input if the output is
Location::SameAsFirstInput().
Change-Id: I400834052b114abf0d616da1b4b6506f7bba10ab
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:53:38 +0000 (06:53 +0000)]
am
19ad5824: ART: Move dex2oat watchdog output to LogLine
* commit '
19ad58245b5fac4bdf02045ac47472935b0717cd':
ART: Move dex2oat watchdog output to LogLine
Andreas Gampe [Wed, 29 Apr 2015 06:51:59 +0000 (06:51 +0000)]
am
c878efbc: am
57f6bee4: Merge "ART: Move dex2oat watchdog output to LogLine"
* commit '
c878efbc3ed1e602d41737f7a3208f995d288a93':
ART: Move dex2oat watchdog output to LogLine
Andreas Gampe [Wed, 29 Apr 2015 06:40:14 +0000 (06:40 +0000)]
am
57f6bee4: Merge "ART: Move dex2oat watchdog output to LogLine"
* commit '
57f6bee40489842c0461140935f900ed88281592':
ART: Move dex2oat watchdog output to LogLine
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 06:30:40 +0000 (06:30 +0000)]
Merge "ART: Move dex2oat watchdog output to LogLine"
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
Change-Id: I1fec8dae25f9282f72e762bda934fceb948bbd5f
Andreas Gampe [Wed, 29 Apr 2015 05:33:59 +0000 (05:33 +0000)]
am
c7bc9ad6: am
b0300bad: Merge "ART: Remove multidex limit"
* commit '
c7bc9ad6a932fc912c71102e2bb0190efdd92733':
ART: Remove multidex limit
Andreas Gampe [Wed, 29 Apr 2015 05:19:44 +0000 (05:19 +0000)]
am
b0300bad: Merge "ART: Remove multidex limit"
* commit '
b0300bad88e6295217a53ff96db6170a727997a9':
ART: Remove multidex limit
Andreas Gampe [Wed, 29 Apr 2015 05:10:04 +0000 (05:10 +0000)]
Merge "ART: Remove multidex limit"
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
(cherry picked from commit
32c26b8f9b995250479c185172f4ffd881a59996)
Change-Id: Ic51c96b84042f769a7d33ec53fe587b68cd69df4
Andreas Gampe [Wed, 29 Apr 2015 04:50:46 +0000 (04:50 +0000)]
am
b349274a: Merge "ART: Remove multidex limit" into mnc-dev
* commit '
b349274af4e568d8f6932d92fcc1768eaaa99c56':
ART: Remove multidex limit
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 04:12:57 +0000 (04:12 +0000)]
am
3d5e5f90: am
4a3fff8f: (-s ours) am
471b7cb6: HACK: Disable native stack trace dumping for tetra. DO NOT MERGE
* commit '
3d5e5f903f6068a889fe6532f9b51fcf28185c72':
HACK: Disable native stack trace dumping for tetra. DO NOT MERGE
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 [Wed, 29 Apr 2015 02:11:03 +0000 (02:11 +0000)]
am
626ecd09: Fix possible null deference in Throwable::Dump
* commit '
626ecd092f22c9ecab3c86f9235e74e975862609':
Fix possible null deference in Throwable::Dump
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 21:33:54 +0000 (21:33 +0000)]
am
bc8ec546: am
13d38aab: Merge "Fix possible null deference in Throwable::Dump"
* commit '
bc8ec5462f9fb14b4e9c78b4d3c1590f41b32a54':
Fix possible null deference in Throwable::Dump
Mathieu Chartier [Tue, 28 Apr 2015 21:17:15 +0000 (21:17 +0000)]
am
13d38aab: Merge "Fix possible null deference in Throwable::Dump"
* commit '
13d38aabf01f8391946730b7c2e8d077b1ec7d13':
Fix possible null deference in Throwable::Dump
Jeff Hao [Tue, 28 Apr 2015 21:10:39 +0000 (21:10 +0000)]
am
889c0983: am
b8df6601: Merge "Change ddmc run-test to make new objects instead of strings."
* commit '
889c0983fe4c9d95b3ee41757a5bffbbd3b0586a':
Change ddmc run-test to make new objects instead of strings.
Vladimir Marko [Tue, 28 Apr 2015 21:10:29 +0000 (21:10 +0000)]
am
511eb743: am
edede5c6: Merge "Quick: Fix crash on fall-through out of method code."
* commit '
511eb743e362ca0cb97221074109dbc93d76f27d':
Quick: Fix crash on fall-through out of method code.
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
Mathieu Chartier [Tue, 28 Apr 2015 21:06:33 +0000 (21:06 +0000)]
Merge "Fix possible null deference in Throwable::Dump"
Mathieu Chartier [Tue, 28 Apr 2015 20:53:02 +0000 (13:53 -0700)]
Fix possible null deference in Throwable::Dump
Bug:
20640601
Change-Id: Ibd6081ed9ea16f320e505e06e690b8eddb1228ef
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
Jeff Hao [Tue, 28 Apr 2015 19:25:26 +0000 (19:25 +0000)]
am
b8df6601: Merge "Change ddmc run-test to make new objects instead of strings."
* commit '
b8df6601f2119fd90150761388057dbe893bb6ae':
Change ddmc run-test to make new objects instead of strings.
Jeff Hao [Tue, 28 Apr 2015 19:15:05 +0000 (19:15 +0000)]
Merge "Change ddmc run-test to make new objects instead of strings."
Jeff Hao [Tue, 28 Apr 2015 19:11:22 +0000 (12:11 -0700)]
Change ddmc run-test to make new objects instead of strings.
Before, the test was creating new strings until overflowing allocations,
which was half string objects and half character arrays. Now, it
allocates all strings with the character data, which is larger than
before, causing the test to run out of memory. Allocating only objects
prevents the test from running out of memory.
Change-Id: Icf3f0fd2ae847e76a9b8d5dfb762be92de16aaa3
Vladimir Marko [Tue, 28 Apr 2015 18:50:39 +0000 (18:50 +0000)]
am
edede5c6: Merge "Quick: Fix crash on fall-through out of method code."
* commit '
edede5c67daa2a6890067da0934e0ba6e14661b9':
Quick: Fix crash on fall-through out of method code.
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 18:35:17 +0000 (18:35 +0000)]
Merge "Quick: Fix crash on fall-through out of method code."
Dan Albert [Tue, 28 Apr 2015 18:33:22 +0000 (18:33 +0000)]
am
805f4061: am
458d91b0: Merge "Prevent undefined behavior in RosAlloc."
* commit '
805f4061d43b2617df7a235fa2e79e583925b111':
Prevent undefined behavior in RosAlloc.
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
Change-Id: I627f4137f61901897bfb9a5252741c6ded3a1adb
Dan Albert [Tue, 28 Apr 2015 18:23:35 +0000 (18:23 +0000)]
am
458d91b0: Merge "Prevent undefined behavior in RosAlloc."
* commit '
458d91b0f72293c9dd347feecf535db0682ccd71':
Prevent undefined behavior in RosAlloc.
Mathieu Chartier [Tue, 28 Apr 2015 18:17:09 +0000 (18:17 +0000)]
am
7aa231a1: am
2b9b0de4: Merge "Fix some compaction bugs in string allocation"
* commit '
7aa231a188a62a6f6053ae9ae0f632366499fa97':
Fix some compaction bugs in string allocation
Dan Albert [Tue, 28 Apr 2015 18:11:38 +0000 (18:11 +0000)]
Merge "Prevent undefined behavior in RosAlloc."
Dan Albert [Thu, 16 Apr 2015 18:50:30 +0000 (11:50 -0700)]
Prevent undefined behavior in RosAlloc.
In cases where remain == 0, the 32-bit value would be left shifted
32-bits, which is undefined behavior.
Change-Id: I6277279341b168536f928ce87375c395a1aa865c
Mathieu Chartier [Tue, 28 Apr 2015 18:03:18 +0000 (18:03 +0000)]
am
2b9b0de4: Merge "Fix some compaction bugs in string allocation"
* commit '
2b9b0de424146c8b654b3fa05b14c48d3b2b0b13':
Fix some compaction bugs in string allocation
Mathieu Chartier [Tue, 28 Apr 2015 17:47:45 +0000 (17:47 +0000)]
Merge "Fix some compaction bugs in string allocation"
Vladimir Marko [Tue, 28 Apr 2015 17:28:24 +0000 (17:28 +0000)]
am
6996ce22: Merge "Quick: Avoid unnecessary GVN work in release builds." into mnc-dev
* commit '
6996ce22986ddf19b89c7582973d55b329b1436e':
Quick: Avoid unnecessary GVN work in release builds.
Vladimir Marko [Tue, 28 Apr 2015 17:28:22 +0000 (17:28 +0000)]
am
3863b43d: Merge "Quick: Rely on inferred types in GVN/LVN/DCE." into mnc-dev
* commit '
3863b43dc55786a655157c446af8f5ceea61b61a':
Quick: Rely on inferred types in GVN/LVN/DCE.
Mathieu Chartier [Tue, 28 Apr 2015 17:01:28 +0000 (10:01 -0700)]
Fix some compaction bugs in string allocation
Change-Id: I2b8499c60de7690e1012d71bccba4ecd589da9af
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 15:57:18 +0000 (15:57 +0000)]
am
c71d9218: Fix constructor access check through reflection
* commit '
c71d9218b640224af9ab73c088263a454ddd3b34':
Fix constructor access check through reflection
Sudheer Shanka [Tue, 28 Apr 2015 14:58:59 +0000 (14:58 +0000)]
Merge branch 'mnc-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/art into mnc-dev-plus-aosp
Sebastien Hertz [Tue, 28 Apr 2015 14:54:18 +0000 (14:54 +0000)]
am
52c234b2: am
1c5808c0: Merge "Fix constructor access check through reflection"
* commit '
52c234b2f8b9422c2318710aa0f7421f05c06869':
Fix constructor access check through reflection
Andreas Gampe [Tue, 28 Apr 2015 14:54:12 +0000 (14:54 +0000)]
am
0dd76cd3: ART: Fix constructor access checking
* commit '
0dd76cd3f09f495a1b9a0e4f8712c09ff885c6fd':
ART: Fix constructor access checking
Sebastien Hertz [Tue, 28 Apr 2015 14:42:23 +0000 (14:42 +0000)]
am
1c5808c0: Merge "Fix constructor access check through reflection"
* commit '
1c5808c0fa83155565f5319808a2949e0a3f5789':
Fix constructor access check through reflection
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
Sebastien Hertz [Tue, 28 Apr 2015 14:33:00 +0000 (14:33 +0000)]
Merge "Fix constructor access check through reflection"
Vladimir Marko [Tue, 28 Apr 2015 14:01:50 +0000 (14:01 +0000)]
am
93ef27d3: am
d4667dea: Merge "ART: Add FOUR_ARG_DOWNCALL macro for MIPS64 entry points."
* commit '
93ef27d3baa206805108ec7afbac9bcd50352bca':
ART: Add FOUR_ARG_DOWNCALL macro for MIPS64 entry points.
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
Vladimir Marko [Tue, 28 Apr 2015 13:51:27 +0000 (13:51 +0000)]
am
d4667dea: Merge "ART: Add FOUR_ARG_DOWNCALL macro for MIPS64 entry points."
* commit '
d4667dea87e68ee3ee64581af138f59300a5c510':
ART: Add FOUR_ARG_DOWNCALL macro for MIPS64 entry points.
Vladimir Marko [Tue, 28 Apr 2015 13:31:38 +0000 (13:31 +0000)]
Merge "ART: Add FOUR_ARG_DOWNCALL macro for MIPS64 entry points."
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
Change-Id: I9a34f05cdbb8825ad88b42223743690228e3f03e
Vladimir Marko [Tue, 28 Apr 2015 13:14:58 +0000 (14:14 +0100)]
ART: Add FOUR_ARG_DOWNCALL macro for MIPS64 entry points.
Missing from
https://android-review.googlesource.com/79174
Change-Id: If182b73824edfd4639f645612b2f7b67c1f31bef
Vladimir Marko [Tue, 28 Apr 2015 12:30:29 +0000 (12:30 +0000)]
am
95fc030d: am
95935f28: Merge "ART: Fix MIPS entrypoint downcall macros."
* commit '
95fc030d897fe67786f81a987e6d0b8e06e9b3b7':
ART: Fix MIPS entrypoint downcall macros.
Vladimir Marko [Tue, 28 Apr 2015 12:19:38 +0000 (12:19 +0000)]
am
95935f28: Merge "ART: Fix MIPS entrypoint downcall macros."
* commit '
95935f28a7206c32592f6744cfc4c63e4d87ecdf':
ART: Fix MIPS entrypoint downcall macros.
Vladimir Marko [Tue, 28 Apr 2015 12:10:30 +0000 (12:10 +0000)]
Merge "ART: Fix MIPS entrypoint downcall macros."
Vladimir Marko [Tue, 28 Apr 2015 11:37:09 +0000 (12:37 +0100)]
ART: Fix MIPS entrypoint downcall macros.
Broken by not updating the MIPS assembly after rebase of
https://android-review.googlesource.com/79174
Change-Id: I6258c254c0652e92357d306640c461d9523da227
Vladimir Marko [Tue, 28 Apr 2015 10:51:22 +0000 (10:51 +0000)]
am
66e8a1e0: am
3adfc4bb: Merge "Quick: Avoid unnecessary GVN work in release builds."
* commit '
66e8a1e04ffec769af17dabc3e8383cd7277b2b3':
Quick: Avoid unnecessary GVN work in release builds.
Roland Levillain [Tue, 28 Apr 2015 10:51:20 +0000 (10:51 +0000)]
am
862cd5e1: am
80613ffd: Merge "Have HInvoke instructions know their number of actual arguments."
* commit '
862cd5e1a80884d812c283c952ca8c11f4df9ec4':
Have HInvoke instructions know their number of actual arguments.
Nicolas Geoffray [Tue, 28 Apr 2015 10:51:18 +0000 (10:51 +0000)]
am
55669590: am
a94fb1f9: Merge "Revert "Revert "[optimizing] Replace FP divide by power of 2"""
* commit '
556695901ce517b70564513d4212170fb74fb8a1':
Revert "Revert "[optimizing] Replace FP divide by power of 2""
Vladimir Marko [Tue, 28 Apr 2015 10:44:37 +0000 (10:44 +0000)]
am
3adfc4bb: Merge "Quick: Avoid unnecessary GVN work in release builds."
* commit '
3adfc4bbe6c42d574bd2069d8e38a13d5ad98ccf':
Quick: Avoid unnecessary GVN work in release builds.
Roland Levillain [Tue, 28 Apr 2015 10:39:17 +0000 (10:39 +0000)]
am
80613ffd: Merge "Have HInvoke instructions know their number of actual arguments."
* commit '
80613ffd5699e6207d6b1264d600a0fc168074ce':
Have HInvoke instructions know their number of actual arguments.
Nicolas Geoffray [Tue, 28 Apr 2015 10:39:14 +0000 (10:39 +0000)]
am
a94fb1f9: Merge "Revert "Revert "[optimizing] Replace FP divide by power of 2"""
* commit '
a94fb1f99ee3390bca9531b2512f8fc65f13ceee':
Revert "Revert "[optimizing] Replace FP divide by power of 2""
Vladimir Marko [Tue, 28 Apr 2015 10:36:38 +0000 (10:36 +0000)]
Merge "Quick: Avoid unnecessary GVN work in release builds."
Roland Levillain [Tue, 28 Apr 2015 10:31:38 +0000 (10:31 +0000)]
Merge "Have HInvoke instructions know their number of actual arguments."
Nicolas Geoffray [Tue, 28 Apr 2015 10:29:17 +0000 (10:29 +0000)]
Merge "Revert "Revert "[optimizing] Replace FP divide by power of 2"""
David Brazdil [Tue, 28 Apr 2015 10:10:49 +0000 (11:10 +0100)]
resolved conflicts for merge of
2b1c622d to mnc-dev-plus-aosp
Change-Id: I26f4aefa7d7384bbc64c7a3c9e312692071a0e62
Roland Levillain [Tue, 28 Apr 2015 10:00:54 +0000 (11:00 +0100)]
Have HInvoke instructions know their number of actual arguments.
Add an art::HInvoke::GetNumberOfArguments routine so that
art::HInvoke and its subclasses can return the number of
actual arguments of the called method. Use it in code
generators and intrinsics handlers.
Consequently, no longer remove a clinit check as last input
of a static invoke if it is still present during baseline
code generation, but ensure that static invokes have no such
check as last input in optimized compilations.
Change-Id: Iaf9e07d1057a3b15b83d9638538c02b70211e476
Jeff Hao [Tue, 28 Apr 2015 04:22:28 +0000 (04:22 +0000)]
am
a4509a5f: am
64db0171: Merge "Fix java_lang_Class newInstance for strings; also quick entrypoints."
* commit '
a4509a5fefd18e1fb61961dfc83057ca6e938e51':
Fix java_lang_Class newInstance for strings; also quick entrypoints.
Jeff Hao [Tue, 28 Apr 2015 04:15:04 +0000 (04:15 +0000)]
am
64db0171: Merge "Fix java_lang_Class newInstance for strings; also quick entrypoints."
* commit '
64db01714f91bf255a79c0a88813641c240c9857':
Fix java_lang_Class newInstance for strings; also quick entrypoints.
Jeff Hao [Tue, 28 Apr 2015 03:57:53 +0000 (03:57 +0000)]
Merge "Fix java_lang_Class newInstance for strings; also quick entrypoints."
Jeff Hao [Tue, 28 Apr 2015 03:54:07 +0000 (20:54 -0700)]
Fix java_lang_Class newInstance for strings; also quick entrypoints.
Change-Id: I35fd23c5a9051e1ffda0ecc2cbafb5d318c7b5e6
Andreas Gampe [Tue, 28 Apr 2015 03:05:15 +0000 (03:05 +0000)]
am
3d2eb5c4: am
f0a3d3da: Merge "ART: Fix constructor access checking"
* commit '
3d2eb5c4e039168e306c03a54d52427712f16843':
ART: Fix constructor access checking
Andreas Gampe [Tue, 28 Apr 2015 02:53:22 +0000 (02:53 +0000)]
am
f0a3d3da: Merge "ART: Fix constructor access checking"
* commit '
f0a3d3dad248ad0dcb7cfc6addcc66d8bd117e48':
ART: Fix constructor access checking
Andreas Gampe [Tue, 28 Apr 2015 02:42:25 +0000 (02:42 +0000)]
Merge "ART: Fix constructor access checking"
Andreas Gampe [Tue, 28 Apr 2015 00:26:37 +0000 (17:26 -0700)]
ART: Fix constructor access checking
Constructor access must be checked.
(cherry picked from commit
0dd76cd3f09f495a1b9a0e4f8712c09ff885c6fd)
Bug:
20639158
Change-Id: I3c586e9572a748d208bea43aa2349c3ef52a2ee5
Jeff Hao [Tue, 28 Apr 2015 02:26:37 +0000 (02:26 +0000)]
am
a4799fc4: am
9d1e1903: Merge "Replace String CharArray with internal uint16_t array."
* commit '
a4799fc466776ea5b4e9663b1e63af4d224a6865':
Replace String CharArray with internal uint16_t array.
Jeff Hao [Tue, 28 Apr 2015 02:15:12 +0000 (02:15 +0000)]
am
9d1e1903: Merge "Replace String CharArray with internal uint16_t array."
* commit '
9d1e19035a59ff8bf05a09ad880ede99806ba73f':
Replace String CharArray with internal uint16_t array.
Jeff Hao [Tue, 28 Apr 2015 02:04:09 +0000 (02:04 +0000)]
Merge "Replace String CharArray with internal uint16_t array."
Jeff Hao [Wed, 15 Jan 2014 21:49:50 +0000 (13:49 -0800)]
Replace String CharArray with internal uint16_t array.
Summary of high level changes:
- Adds compiler inliner support to identify string init methods
- Adds compiler support (quick & optimizing) with new invoke code path
that calls method off the thread pointer
- Adds thread entrypoints for all string init methods
- Adds map to verifier to log when receiver of string init has been
copied to other registers. used by compiler and interpreter
Change-Id: I797b992a8feb566f9ad73060011ab6f51eb7ce01
Hiroshi Yamauchi [Tue, 28 Apr 2015 01:30:47 +0000 (01:30 +0000)]
am
3b531e5d: am
3fd79afb: Merge "Switch the default read barrier type to a Baker one."
* commit '
3b531e5d04a312790b7f268c402238ad816f0d2e':
Switch the default read barrier type to a Baker one.
Hiroshi Yamauchi [Tue, 28 Apr 2015 01:18:46 +0000 (01:18 +0000)]
am
3fd79afb: Merge "Switch the default read barrier type to a Baker one."
* commit '
3fd79afbb7490f52817f737ecceb694f6618dcf9':
Switch the default read barrier type to a Baker one.
Hiroshi Yamauchi [Tue, 28 Apr 2015 01:07:17 +0000 (01:07 +0000)]
Merge "Switch the default read barrier type to a Baker one."
Hiroshi Yamauchi [Tue, 28 Apr 2015 00:58:51 +0000 (17:58 -0700)]
Switch the default read barrier type to a Baker one.
For automated testing.
Bug:
12687968
Change-Id: I831d6e45e4729f0dd3cf178d02af511a32cc9777
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
Nicolas Geoffray [Mon, 27 Apr 2015 08:53:46 +0000 (08:53 +0000)]
Revert "Revert "[optimizing] Replace FP divide by power of 2""
This reverts commit
067cae2c86627d2edcf01b918ee601774bc76aeb.
Change-Id: Iaaa8772500ea7d3dce6ae0829dc0dc3bbc9c14ca