OSDN Git Service
Nicolas Geoffray [Fri, 17 Jul 2015 12:45:42 +0000 (12:45 +0000)]
am
eb4b5b09: am
75fd056e: Merge "Revert "Revert "Use the quickened metadata to compile -QUICK opcodes."""
* commit '
eb4b5b09d00475cef167a2b314757f755aaa9c9e':
Revert "Revert "Use the quickened metadata to compile -QUICK opcodes.""
Nicolas Geoffray [Fri, 17 Jul 2015 12:14:43 +0000 (12:14 +0000)]
am
75fd056e: Merge "Revert "Revert "Use the quickened metadata to compile -QUICK opcodes."""
* commit '
75fd056e2ac95492bb9a044fc77ef47e413a3ea1':
Revert "Revert "Use the quickened metadata to compile -QUICK opcodes.""
Nicolas Geoffray [Fri, 17 Jul 2015 12:03:05 +0000 (12:03 +0000)]
Merge "Revert "Revert "Use the quickened metadata to compile -QUICK opcodes."""
Nicolas Geoffray [Fri, 17 Jul 2015 11:51:28 +0000 (11:51 +0000)]
Revert "Revert "Use the quickened metadata to compile -QUICK opcodes.""
This reverts commit
8ab9a9010f3929acbb6c671008b8885b762b01e1.
Change-Id: I1e654d5010ea2112982c3055fcb8c8f9c10e9ac8
Nicolas Geoffray [Fri, 17 Jul 2015 11:24:59 +0000 (11:24 +0000)]
am
030f2af2: Reduce space filter threshold to 128.
* commit '
030f2af20dcae2c44bcf1b7b265cf3db4e3c23f8':
Reduce space filter threshold to 128.
Nicolas Geoffray [Fri, 17 Jul 2015 11:23:42 +0000 (11:23 +0000)]
am
06fc780f: am
33e50d85: Merge "Reduce space filter threshold to 128."
* commit '
06fc780faeaef3406aab181ba4301273af7f9579':
Reduce space filter threshold to 128.
Nicolas Geoffray [Fri, 17 Jul 2015 11:11:33 +0000 (11:11 +0000)]
am
33e50d85: Merge "Reduce space filter threshold to 128."
* commit '
33e50d85a3e43072fad4f58369b71da73b8f966c':
Reduce space filter threshold to 128.
Nicolas Geoffray [Fri, 17 Jul 2015 10:11:09 +0000 (11:11 +0100)]
Reduce space filter threshold to 128.
In order to get closer to our code increase limit.
Bug:
21868508
(cherry picked from commit
432bf3d525dd0736c91238d69e29b4db6a2f7b80)
Change-Id: Iab19fe99a8a869b0fb841bac317016e4a3dc00e2
Nicolas Geoffray [Fri, 17 Jul 2015 10:57:42 +0000 (10:57 +0000)]
Merge "Reduce space filter threshold to 128."
Nicolas Geoffray [Fri, 17 Jul 2015 10:29:16 +0000 (10:29 +0000)]
am
4c310c4c: am
32f59e58: Merge "Revert "Use the quickened metadata to compile -QUICK opcodes.""
* commit '
4c310c4c31a4f54dcd6c0b53cf74158d18750be9':
Revert "Use the quickened metadata to compile -QUICK opcodes."
Nicolas Geoffray [Fri, 17 Jul 2015 10:14:52 +0000 (10:14 +0000)]
am
32f59e58: Merge "Revert "Use the quickened metadata to compile -QUICK opcodes.""
* commit '
32f59e585a1f8932f2a4ab3f934a0a83e29b3d19':
Revert "Use the quickened metadata to compile -QUICK opcodes."
Nicolas Geoffray [Fri, 17 Jul 2015 10:11:09 +0000 (11:11 +0100)]
Reduce space filter threshold to 128.
In order to get closer to our code increase limit.
Bug:
21868508
Change-Id: I05f76bfd97f03bda3741eca4e6a678c536ad0702
Nicolas Geoffray [Fri, 17 Jul 2015 10:07:54 +0000 (10:07 +0000)]
am
38216947: am
c3c0a06b: Merge "Use the quickened metadata to compile -QUICK opcodes."
* commit '
3821694760a428ffb7239ab95d3c632e07e74da7':
Use the quickened metadata to compile -QUICK opcodes.
Nicolas Geoffray [Fri, 17 Jul 2015 10:04:31 +0000 (11:04 +0100)]
resolved conflicts for merge of
a2407de1 to mnc-dev-plus-aosp
Change-Id: Iaf366cec9606c8fed79ec00ac2573f2298de199c
Nicolas Geoffray [Fri, 17 Jul 2015 10:02:45 +0000 (10:02 +0000)]
Merge "Revert "Use the quickened metadata to compile -QUICK opcodes.""
Nicolas Geoffray [Fri, 17 Jul 2015 10:02:30 +0000 (10:02 +0000)]
Revert "Use the quickened metadata to compile -QUICK opcodes."
Broke sdk build. Investigating.
This reverts commit
4515a67434c9e3e1627586629a1f2aba1a99aa6a.
Change-Id: I6c1107ab626758570a59dc6bf3e4228c70a57196
Nicolas Geoffray [Fri, 17 Jul 2015 09:55:53 +0000 (09:55 +0000)]
am
c3c0a06b: Merge "Use the quickened metadata to compile -QUICK opcodes."
* commit '
c3c0a06bea879741972add3dfc8099de729856a1':
Use the quickened metadata to compile -QUICK opcodes.
Nicolas Geoffray [Fri, 17 Jul 2015 09:15:56 +0000 (09:15 +0000)]
Merge "Use the quickened metadata to compile -QUICK opcodes."
Nicolas Geoffray [Fri, 17 Jul 2015 08:54:20 +0000 (08:54 +0000)]
Merge "ART: Boolean simplifier fix" into mnc-dev
Aart Bik [Fri, 17 Jul 2015 01:45:54 +0000 (01:45 +0000)]
am
2cf3fc24: am
913a737b: Merge "Test on (in)variant static and instance field arrays."
* commit '
2cf3fc24395e2a166001144bf28f0cf87943fe43':
Test on (in)variant static and instance field arrays.
Aart Bik [Fri, 17 Jul 2015 01:31:12 +0000 (01:31 +0000)]
am
913a737b: Merge "Test on (in)variant static and instance field arrays."
* commit '
913a737ba5774b3fec944190c13fcdf5b2257b6a':
Test on (in)variant static and instance field arrays.
Andreas Gampe [Fri, 17 Jul 2015 01:16:41 +0000 (01:16 +0000)]
am
69f77ac2: am
caa2fe33: Merge "ART: Fix System.arraycopy"
* commit '
69f77ac22c33c128cb76a73fd09f6d627d141dca':
ART: Fix System.arraycopy
Aart Bik [Fri, 17 Jul 2015 01:15:58 +0000 (01:15 +0000)]
Merge "Test on (in)variant static and instance field arrays."
Andreas Gampe [Fri, 17 Jul 2015 01:02:49 +0000 (01:02 +0000)]
am
caa2fe33: Merge "ART: Fix System.arraycopy"
* commit '
caa2fe33a8c4b3a5f7ffd0a6d6adb68337f8655f':
ART: Fix System.arraycopy
Aart Bik [Fri, 17 Jul 2015 00:40:44 +0000 (17:40 -0700)]
Test on (in)variant static and instance field arrays.
Rationale:
Ensure upcoming improved side effects analysis
results in valid optimizations only.
Bug:
22538329
Change-Id: I87e699853e914a0e42adfd1c4e4f9789781b65df
Andreas Gampe [Fri, 17 Jul 2015 00:51:11 +0000 (00:51 +0000)]
Merge "ART: Fix System.arraycopy"
Andreas Gampe [Fri, 17 Jul 2015 00:41:25 +0000 (17:41 -0700)]
ART: Fix System.arraycopy
We cannot use the same code for float+int and long+double. In debug
mode, this will fail.
Change-Id: Icf263626896a7b53e59685c474e77b4c3128ecd5
Nicolas Geoffray [Thu, 16 Jul 2015 18:45:46 +0000 (18:45 +0000)]
am
082046b3: am
6d3d1e3d: Merge "Disable test while investigating."
* commit '
082046b36e2db73f34bbc7f1a34a8cf1ca54e181':
Disable test while investigating.
Nicolas Geoffray [Thu, 16 Jul 2015 18:28:18 +0000 (18:28 +0000)]
am
6d3d1e3d: Merge "Disable test while investigating."
* commit '
6d3d1e3d866a880b4df95ba96ed126c1723e3dd6':
Disable test while investigating.
Nicolas Geoffray [Thu, 16 Jul 2015 18:12:57 +0000 (18:12 +0000)]
Merge "Disable test while investigating."
Nicolas Geoffray [Thu, 16 Jul 2015 18:11:54 +0000 (19:11 +0100)]
Disable test while investigating.
Change-Id: Iea1a5b59582d2d12aba8ca5eb5eab3db3cc9dd59
Nicolas Geoffray [Thu, 16 Jul 2015 13:58:58 +0000 (14:58 +0100)]
Use the quickened metadata to compile -QUICK opcodes.
Change-Id: I28a8d68921698bea81f54c95cc6e4c6d2c03f2b4
Serguei Katkov [Thu, 16 Jul 2015 15:09:35 +0000 (15:09 +0000)]
am
3b7660de: ART: DCE should know that array-length can throw NPE
* commit '
3b7660dea62f2940c8ade2cbc26792d341284dfe':
ART: DCE should know that array-length can throw NPE
Serguei Katkov [Wed, 15 Jul 2015 09:32:09 +0000 (15:32 +0600)]
ART: Boolean simplifier fix
Boolean simplifier should not remove condition instruction
if it has side effects.
(cherry picked from commit
108ceb48edea654c544b483c302212e43d79a472)
Change-Id: I00dd595da1bba0f027f5c8647035e9fd8ba62ee1
Roland Levillain [Thu, 16 Jul 2015 14:21:49 +0000 (14:21 +0000)]
am
6f942363: am
cced6ad1: Merge "Use (D)CHECK_ALIGNED more."
* commit '
6f942363d5cd05e6e47c0d88232155f568eca23c':
Use (D)CHECK_ALIGNED more.
Nicolas Geoffray [Thu, 16 Jul 2015 14:09:11 +0000 (14:09 +0000)]
am
cda6573b: am
530f3185: Merge "Make oatdump see the new vmap table generated by dextodex."
* commit '
cda6573b992f7c4a98422007ad5b628386b6c2bb':
Make oatdump see the new vmap table generated by dextodex.
Roland Levillain [Thu, 16 Jul 2015 14:09:02 +0000 (14:09 +0000)]
am
cced6ad1: Merge "Use (D)CHECK_ALIGNED more."
* commit '
cced6ad152cf8ec13f38f2210c1b8445919232d3':
Use (D)CHECK_ALIGNED more.
Nicolas Geoffray [Thu, 16 Jul 2015 13:56:05 +0000 (13:56 +0000)]
am
530f3185: Merge "Make oatdump see the new vmap table generated by dextodex."
* commit '
530f31858cfe019e48b5f0b2ecea2ad528e6f6c6':
Make oatdump see the new vmap table generated by dextodex.
Roland Levillain [Thu, 16 Jul 2015 13:55:28 +0000 (13:55 +0000)]
Merge "Use (D)CHECK_ALIGNED more."
Nicolas Geoffray [Thu, 16 Jul 2015 13:42:22 +0000 (13:42 +0000)]
Merge "Make oatdump see the new vmap table generated by dextodex."
Nicolas Geoffray [Thu, 16 Jul 2015 13:15:05 +0000 (14:15 +0100)]
Make oatdump see the new vmap table generated by dextodex.
Change-Id: I48f3fb7320e39c864f8fbc478f970b18358408ec
Nicolas Geoffray [Thu, 16 Jul 2015 13:15:58 +0000 (13:15 +0000)]
am
ad709087: am
bca4d299: Merge "ART: Boolean simplifier fix"
* commit '
ad709087f1849472f20bf9c0ed48861fa36be579':
ART: Boolean simplifier fix
Vladimir Marko [Thu, 16 Jul 2015 13:15:56 +0000 (13:15 +0000)]
am
709dbfeb: am
8f861e39: Merge "ART: DCE should know that array-length can throw NPE"
* commit '
709dbfeb8c605d487488b40560edd36c426abb99':
ART: DCE should know that array-length can throw NPE
Nicolas Geoffray [Thu, 16 Jul 2015 13:01:34 +0000 (13:01 +0000)]
am
bca4d299: Merge "ART: Boolean simplifier fix"
* commit '
bca4d29975396b08f1d7357912065660b8007dd7':
ART: Boolean simplifier fix
Vladimir Marko [Thu, 16 Jul 2015 13:01:33 +0000 (13:01 +0000)]
am
8f861e39: Merge "ART: DCE should know that array-length can throw NPE"
* commit '
8f861e399c96abd8f1bc7c8c585d53b0904f371a':
ART: DCE should know that array-length can throw NPE
Serguei Katkov [Tue, 14 Jul 2015 13:04:48 +0000 (19:04 +0600)]
ART: DCE should know that array-length can throw NPE
array-length can throw NPE so it should be taking into account.
Bug:
22521944
Signed-off-by: Serguei Katkov <serguei.i.katkov@intel.com>
(cherry picked from commit
b016c6dd3c30b04104a0a43dc294ce93e5f63874)
Change-Id: I6232430a02f9e6d156ad2aae0eb5a630118c0e79
Nicolas Geoffray [Thu, 16 Jul 2015 12:41:02 +0000 (12:41 +0000)]
Merge "ART: Boolean simplifier fix"
Vladimir Marko [Thu, 16 Jul 2015 12:39:03 +0000 (12:39 +0000)]
Merge "ART: DCE should know that array-length can throw NPE"
Serguei Katkov [Tue, 14 Jul 2015 13:04:48 +0000 (19:04 +0600)]
ART: DCE should know that array-length can throw NPE
array-length can throw NPE so it should be taking into account.
Bug:
22521944
Change-Id: I6f961560ccbbf81f57f1c597828f2ee18e2c3054
Signed-off-by: Serguei Katkov <serguei.i.katkov@intel.com>
Roland Levillain [Thu, 16 Jul 2015 10:26:14 +0000 (10:26 +0000)]
am
5d558a2b: am
fec9d09b: Merge "Fix the documentation of all-run-test-names."
* commit '
5d558a2b524d2e2e750b28dcf4c300a61e6d3d4a':
Fix the documentation of all-run-test-names.
Roland Levillain [Thu, 16 Jul 2015 10:26:13 +0000 (10:26 +0000)]
am
5fe0050e: am
00b5c617: Merge "Use art::MemoryRegion::{Load,Store}Bits more in art::CodeInfo."
* commit '
5fe0050ef89e746d0248c5c9a6143a38cd472de5':
Use art::MemoryRegion::{Load,Store}Bits more in art::CodeInfo.
Roland Levillain [Thu, 16 Jul 2015 10:10:31 +0000 (10:10 +0000)]
am
fec9d09b: Merge "Fix the documentation of all-run-test-names."
* commit '
fec9d09bf7d2d54048b1df8e3c24a210e58dbc84':
Fix the documentation of all-run-test-names.
Roland Levillain [Thu, 16 Jul 2015 10:10:29 +0000 (10:10 +0000)]
am
00b5c617: Merge "Use art::MemoryRegion::{Load,Store}Bits more in art::CodeInfo."
* commit '
00b5c6175210e3372920086818a9d2aa15216eda':
Use art::MemoryRegion::{Load,Store}Bits more in art::CodeInfo.
Serguei Katkov [Wed, 15 Jul 2015 09:32:09 +0000 (15:32 +0600)]
ART: Boolean simplifier fix
Boolean simplifier should not remove condition instruction
if it has side effects.
Change-Id: I108b69ec05a49e5543ee956ad9c691b52179cf6c
Signed-off-by: Serguei Katkov <serguei.i.katkov@intel.com>
Roland Levillain [Thu, 16 Jul 2015 09:52:26 +0000 (10:52 +0100)]
Use (D)CHECK_ALIGNED more.
Change-Id: I9d740f6a88d01e028d4ddc3e4e62b0a73ea050af
Roland Levillain [Thu, 16 Jul 2015 09:02:47 +0000 (09:02 +0000)]
Merge "Fix the documentation of all-run-test-names."
Roland Levillain [Thu, 16 Jul 2015 08:56:28 +0000 (08:56 +0000)]
Merge "Use art::MemoryRegion::{Load,Store}Bits more in art::CodeInfo."
Mathieu Chartier [Thu, 16 Jul 2015 03:23:37 +0000 (03:23 +0000)]
am
8dfcb627: am
a14e2e78: Merge "Move MarkObject to mark_sweep.cc"
* commit '
8dfcb627f32064210480f327333812ece0ca51ad':
Move MarkObject to mark_sweep.cc
Evgenii Stepanov [Thu, 16 Jul 2015 03:23:36 +0000 (03:23 +0000)]
am
2ecfacf5: am
2e7ccf9a: Merge "Enable ASan annotations in ART based on macro setting."
* commit '
2ecfacf547267a2549952c7ebcdc556eafcf6bae':
Enable ASan annotations in ART based on macro setting.
Mathieu Chartier [Thu, 16 Jul 2015 03:09:40 +0000 (03:09 +0000)]
am
a14e2e78: Merge "Move MarkObject to mark_sweep.cc"
* commit '
a14e2e780230b0c2f8e94445a4c8d21f19d447cf':
Move MarkObject to mark_sweep.cc
Evgenii Stepanov [Thu, 16 Jul 2015 03:09:38 +0000 (03:09 +0000)]
am
2e7ccf9a: Merge "Enable ASan annotations in ART based on macro setting."
* commit '
2e7ccf9aeb7212c96e2081b66f85b67856b8825a':
Enable ASan annotations in ART based on macro setting.
Mathieu Chartier [Thu, 16 Jul 2015 03:01:24 +0000 (03:01 +0000)]
Merge "Move MarkObject to mark_sweep.cc"
Mathieu Chartier [Thu, 16 Jul 2015 02:58:45 +0000 (19:58 -0700)]
Move MarkObject to mark_sweep.cc
Maybe fixes mac build.
Change-Id: I7c018922be8e159001498d30682435643bed1dfd
Evgenii Stepanov [Thu, 16 Jul 2015 02:54:54 +0000 (02:54 +0000)]
Merge "Enable ASan annotations in ART based on macro setting."
Evgenii Stepanov [Thu, 16 Jul 2015 00:40:14 +0000 (17:40 -0700)]
Enable ASan annotations in ART based on macro setting.
This is a quick hack to remove ASan annotations from SANITIZE_TARGET
build, because they are breaking everything - it looks like we forget
to clean redzones from a page before releasing it to the system, and
some unrelated code runs into them later.
We will add some way to control this from the build system later,
or just fix the underlying issue and re-enable by default.
Bug:
21785137
Change-Id: If79e2455e246dc39355f2758323b249ac20b6144
Mathieu Chartier [Wed, 15 Jul 2015 23:21:44 +0000 (23:21 +0000)]
am
d8c534a7: am
34ac23dc: Merge "Address some GC comments"
* commit '
d8c534a75b53b371d59a86c8c4c323716e9c9cbe':
Address some GC comments
Mathieu Chartier [Wed, 15 Jul 2015 23:03:41 +0000 (23:03 +0000)]
am
34ac23dc: Merge "Address some GC comments"
* commit '
34ac23dc965bf6ca24dd2e9bb115f66ff1fc191e':
Address some GC comments
Mathieu Chartier [Wed, 15 Jul 2015 22:51:55 +0000 (22:51 +0000)]
Merge "Address some GC comments"
Mathieu Chartier [Wed, 15 Jul 2015 21:24:07 +0000 (14:24 -0700)]
Address some GC comments
Follow-up from:
https://android-review.googlesource.com/#/c/159650/
Change-Id: Id14f29b4ce5b70b63fcb3e74f8503ae60a3ae444
Mathieu Chartier [Wed, 15 Jul 2015 18:19:04 +0000 (18:19 +0000)]
am
a390a9f4: am
e5abf070: Merge "Use SuspendAllInternal for FlipThreadRoots"
* commit '
a390a9f4425048ae5d1b85f0eeb621abca0a35be':
Use SuspendAllInternal for FlipThreadRoots
Mathieu Chartier [Wed, 15 Jul 2015 18:04:00 +0000 (18:04 +0000)]
am
e5abf070: Merge "Use SuspendAllInternal for FlipThreadRoots"
* commit '
e5abf0702555f9f4284a96e923f5c331561974e4':
Use SuspendAllInternal for FlipThreadRoots
Mathieu Chartier [Wed, 15 Jul 2015 17:52:46 +0000 (17:52 +0000)]
Merge "Use SuspendAllInternal for FlipThreadRoots"
Mathieu Chartier [Wed, 15 Jul 2015 17:24:16 +0000 (10:24 -0700)]
Use SuspendAllInternal for FlipThreadRoots
Fix FlipThreadRoots to wait until all the threads are suspended by
using SuspendAllInternal. Since running threads no longer hold the
mutator lock as shared held, doing an exclusive lock will not block
if the threads are not suspended. Also implemented MarkHeapReference
which is used to preserve soft references.
Fixes CC tests.
Change-Id: I4b059238f4249cf297e21ae918becd029fe26527
Vladimir Marko [Wed, 15 Jul 2015 17:36:10 +0000 (17:36 +0000)]
am
8282e05e: am
12cfc600: Merge "Clean up after verifier changes wrt. conflict/undefined reg."
* commit '
8282e05e45e828df3f2d760a7cfbc3c352f5f5da':
Clean up after verifier changes wrt. conflict/undefined reg.
Roland Levillain [Wed, 15 Jul 2015 13:09:20 +0000 (14:09 +0100)]
Fix the documentation of all-run-test-names.
Change-Id: I160f57bb2244a79e5eaf5e87b9f0ac94747adcd1
Vladimir Marko [Wed, 15 Jul 2015 17:19:13 +0000 (17:19 +0000)]
am
12cfc600: Merge "Clean up after verifier changes wrt. conflict/undefined reg."
* commit '
12cfc600d21ebf97373be59f1bd538b68687b5bf':
Clean up after verifier changes wrt. conflict/undefined reg.
Vladimir Marko [Wed, 15 Jul 2015 17:06:39 +0000 (17:06 +0000)]
Merge "Clean up after verifier changes wrt. conflict/undefined reg."
Vladimir Marko [Wed, 15 Jul 2015 09:55:17 +0000 (10:55 +0100)]
Clean up after verifier changes wrt. conflict/undefined reg.
Remove unused path in RegType::Merge() and compare undefined
type as pointers. Reduce the number of edges to merge in
b_22331663.smali to just those that we really want to test.
Bug:
22331663
Change-Id: I16b83c4c97fd40be9dd246ef13ccda6e924eef60
Roland Levillain [Wed, 15 Jul 2015 13:30:26 +0000 (14:30 +0100)]
Use art::MemoryRegion::{Load,Store}Bits more in art::CodeInfo.
Change-Id: Id50fc029e83bf2c16bd991ea82acd3b355c29127
David Brazdil [Wed, 15 Jul 2015 16:26:12 +0000 (16:26 +0000)]
am
be58ecaa: am
5c03f369: Merge "ART: Build SSA form when try/catch is present"
* commit '
be58ecaa146379ca2ff5fd54a3a9dbd626b89741':
ART: Build SSA form when try/catch is present
Nicolas Geoffray [Wed, 15 Jul 2015 16:25:56 +0000 (16:25 +0000)]
am
e152c8a0: am
045da88b: Merge "Revert "Revert "Revert "Revert "Make dex2dex return a CompiledMethod after quickening."""""
* commit '
e152c8a00bf168eac63e768e56def15fecd79f48':
Revert "Revert "Revert "Revert "Make dex2dex return a CompiledMethod after quickening.""""
Vladimir Marko [Wed, 15 Jul 2015 16:25:55 +0000 (16:25 +0000)]
am
0513cf81: am
172c8f71: Merge "Avoid unexpected conversions to ArrayRef."
* commit '
0513cf810d9d9644b5e68abadf504100ce549421':
Avoid unexpected conversions to ArrayRef.
David Brazdil [Wed, 15 Jul 2015 15:36:31 +0000 (15:36 +0000)]
am
5c03f369: Merge "ART: Build SSA form when try/catch is present"
* commit '
5c03f3698f5e2e0d762e2e15ec00310b6cdab4fe':
ART: Build SSA form when try/catch is present
David Brazdil [Wed, 15 Jul 2015 15:22:01 +0000 (15:22 +0000)]
Merge "ART: Build SSA form when try/catch is present"
David Brazdil [Mon, 6 Jul 2015 10:48:53 +0000 (11:48 +0100)]
ART: Build SSA form when try/catch is present
This patch implements support for try/catch in the SsaBuilder.
Values of locals are propagated from throwing sites inside try
blocks to their respective catch blocks and phis ("catch phis")
are created when necessary.
Change-Id: I0736565c2c4ff3f9f0924b6e3a785a50023f875a
Nicolas Geoffray [Wed, 15 Jul 2015 10:17:40 +0000 (10:17 +0000)]
am
045da88b: Merge "Revert "Revert "Revert "Revert "Make dex2dex return a CompiledMethod after quickening."""""
* commit '
045da88bd0230ddf48aaf037b3d6c16fbb97ba65':
Revert "Revert "Revert "Revert "Make dex2dex return a CompiledMethod after quickening.""""
Vladimir Marko [Wed, 15 Jul 2015 10:17:38 +0000 (10:17 +0000)]
am
172c8f71: Merge "Avoid unexpected conversions to ArrayRef."
* commit '
172c8f71a866931728c389a46ae9e69bc4c04a13':
Avoid unexpected conversions to ArrayRef.
Nicolas Geoffray [Wed, 15 Jul 2015 09:47:00 +0000 (09:47 +0000)]
Merge "Revert "Revert "Revert "Revert "Make dex2dex return a CompiledMethod after quickening."""""
Nicolas Geoffray [Tue, 14 Jul 2015 10:37:54 +0000 (11:37 +0100)]
Revert "Revert "Revert "Revert "Make dex2dex return a CompiledMethod after quickening.""""
This reverts commit
ed6195a514e3253576af27ea9ba13038509d29ac.
Change-Id: Icb58854301e8982147cdebe3edf2e0d9e0a63a56
Vladimir Marko [Wed, 15 Jul 2015 08:59:43 +0000 (08:59 +0000)]
Merge "Avoid unexpected conversions to ArrayRef."
Andreas Gampe [Wed, 15 Jul 2015 06:16:30 +0000 (06:16 +0000)]
am
ac8c5b21: am
76ca8206: Merge "ART: Fix mac build"
* commit '
ac8c5b21ba938c61c40f963f05d9d71dba9e56df':
ART: Fix mac build
Andreas Gampe [Wed, 15 Jul 2015 06:02:41 +0000 (06:02 +0000)]
am
76ca8206: Merge "ART: Fix mac build"
* commit '
76ca82063ac62488fefb0b12d40026f4ebb2e198':
ART: Fix mac build
Andreas Gampe [Wed, 15 Jul 2015 05:53:03 +0000 (05:53 +0000)]
Merge "ART: Fix mac build"
Mathieu Chartier [Wed, 15 Jul 2015 01:29:48 +0000 (01:29 +0000)]
am
126643e7: am
19315c12: Merge "Clean up GC callbacks to be virtual methods"
* commit '
126643e7f2d7f104067abf0d3e120e163775a60b':
Clean up GC callbacks to be virtual methods
Mathieu Chartier [Wed, 15 Jul 2015 01:13:26 +0000 (01:13 +0000)]
am
19315c12: Merge "Clean up GC callbacks to be virtual methods"
* commit '
19315c121047edcedf2828fea50f3208d799eca2':
Clean up GC callbacks to be virtual methods
Andreas Gampe [Wed, 15 Jul 2015 00:57:43 +0000 (17:57 -0700)]
ART: Fix mac build
Fix Clang assembler bugs introduced in commit
3031c8da0c5009183f770b005c245f9bf2a4d01b.
Change-Id: I460c7c1b8f4380244925d248b90c88239540527a
Mathieu Chartier [Wed, 15 Jul 2015 01:02:08 +0000 (01:02 +0000)]
Merge "Clean up GC callbacks to be virtual methods"
Mathieu Chartier [Wed, 15 Jul 2015 00:45:32 +0000 (00:45 +0000)]
am
65f5d929: am
70451aea: Merge "Change phony targets to set dalvik.vm.usejit properly"
* commit '
65f5d929bc457b96ba3b6077d5846d23548c162f':
Change phony targets to set dalvik.vm.usejit properly
Mathieu Chartier [Wed, 15 Jul 2015 00:32:47 +0000 (00:32 +0000)]
am
70451aea: Merge "Change phony targets to set dalvik.vm.usejit properly"
* commit '
70451aea314de4743d2d15a48d33201a897c190d':
Change phony targets to set dalvik.vm.usejit properly
Mathieu Chartier [Wed, 15 Jul 2015 00:20:15 +0000 (00:20 +0000)]
Merge "Change phony targets to set dalvik.vm.usejit properly"