OSDN Git Service
Andreas Gampe [Thu, 27 Aug 2015 04:02:33 +0000 (04:02 +0000)]
am
3ce5b90c: (-s ours) am
e3bab35d: am
b203b332: Merge "ART: Fix UninitializedReference handling"
* commit '
3ce5b90ce7faa28dab64f745d4fb7a6bd2203919':
Richard Uhler [Thu, 27 Aug 2015 04:02:29 +0000 (04:02 +0000)]
am
50727cec: (-s ours) am
75c82d00: am
364fa537: Merge "Fix bug in OatFileAssistant::GetBestOatFile."
* commit '
50727cec42a7717afa19a5fd996f1efe37df15b2':
Andreas Gampe [Thu, 27 Aug 2015 04:02:27 +0000 (04:02 +0000)]
am
5baa96fa: (-s ours) am
7f474a0d: am
411b96d6: Merge "ART: Remove some of the Mac craziness"
* commit '
5baa96fa4216f1a38e692f4d7524896d7c13042c':
Mathieu Chartier [Thu, 27 Aug 2015 04:02:24 +0000 (04:02 +0000)]
am
e4c66555: (-s ours) am
86aee341: am
9ed82069: Merge "Don\'t check code pointer for proxies in ArtMethod::GetQuickFrameInfo"
* commit '
e4c6655532113ca12464f530ef1a410364adcb8d':
Aart Bik [Thu, 27 Aug 2015 04:02:22 +0000 (04:02 +0000)]
Igor Murashkin [Thu, 27 Aug 2015 04:02:19 +0000 (04:02 +0000)]
am
66a59ccd: (-s ours) am
3495f1ea: am
af0365ac: Merge "runtime: Add lambda box/unbox object equality"
* commit '
66a59ccdf951ec1f2ea18753f44b56d3e279824d':
Aart Bik [Thu, 27 Aug 2015 04:02:18 +0000 (04:02 +0000)]
am
c9609eaa: (-s ours) am
f2d108e1: am
e07300b7: Merge "Improved side effect analysis (field/array write/read)."
* commit '
c9609eaae66bbf53e7f941448b44c969806d8c3f':
Andreas Gampe [Thu, 27 Aug 2015 04:02:16 +0000 (04:02 +0000)]
am
acd4c10d: (-s ours) am
936c7ed9: am
16a150b8: Merge "ART: Fix arm32 quick_invoke_stub CFI"
* commit '
acd4c10d85767a6d70ac1b44530e03b7103dfc38':
Roland Levillain [Thu, 27 Aug 2015 04:02:14 +0000 (04:02 +0000)]
am
18946002: (-s ours) am
f9f0b860: am
6db13772: Merge "Improve documentation of memory layouts in stack_map.h."
* commit '
189460021aa72b46b1c9a05870201ecac04a7d8f':
Mathieu Chartier [Thu, 27 Aug 2015 04:02:12 +0000 (04:02 +0000)]
am
cece8875: (-s ours) am
cf6fee10: am
b2295afd: Merge "Get non proxy method for StackDumpVisitor"
* commit '
cece8875bc8769543fd38de31d8f6a613d3a2a39':
Mathieu Chartier [Thu, 27 Aug 2015 04:02:09 +0000 (04:02 +0000)]
am
8afd6845: (-s ours) am
3b34cc63: am
11237947: Merge "Change intern table to not use WaitHoldingLocks"
* commit '
8afd6845ed34dbcdcf37db047ded8275de18da3a':
Igor Murashkin [Thu, 27 Aug 2015 04:02:05 +0000 (04:02 +0000)]
am
78f9b1a1: (-s ours) am
8cd99c8f: am
7745dc34: Merge "runtime: Add -Xverify:softfail and ART_TEST_INTERPRETER_ACCESS_CHECKS"
* commit '
78f9b1a11be03c3d4b4c9de24405e7319b2f31d6':
Aart Bik [Thu, 27 Aug 2015 04:02:00 +0000 (04:02 +0000)]
am
051c926c: (-s ours) am
73aca5e9: am
479ebe07: Merge "Extended test with "cross-over arrays"."
* commit '
051c926c786a39b53fbab8ab911f6ea5fb2aaae4':
Richard Uhler [Thu, 27 Aug 2015 04:01:56 +0000 (04:01 +0000)]
am
49cdd1ac: (-s ours) am
74c32d6a: am
511bb656: Merge "Fix FieldGap priority queue ordering bug."
* commit '
49cdd1ac8fa60728d7e0a20b0a6961cfc561cc2a':
Vladimir Marko [Thu, 27 Aug 2015 04:01:53 +0000 (04:01 +0000)]
am
c4a51c65: (-s ours) am
91825544: am
2661ffc6: Merge "Improve Thumb2 branch/load-literal fixup performance."
* commit '
c4a51c65f41548095a64abc09742b5bc05546228':
Nicolas Geoffray [Thu, 27 Aug 2015 04:01:49 +0000 (04:01 +0000)]
am
41d5ea96: (-s ours) am
eb4b5b09: am
75fd056e: Merge "Revert "Revert "Use the quickened metadata to compile -QUICK opcodes."""
* commit '
41d5ea96515ced05ef0c8f95a77105d350de6e39':
Nicolas Geoffray [Thu, 27 Aug 2015 04:01:47 +0000 (04:01 +0000)]
am
f609b818: (-s ours) am
030f2af2: Reduce space filter threshold to 128.
* commit '
f609b818f41f3c808fed9ec8fe542d212030aaf7':
Nicolas Geoffray [Thu, 27 Aug 2015 04:01:42 +0000 (04:01 +0000)]
am
b429fe90: (-s ours) am
06fc780f: am
33e50d85: Merge "Reduce space filter threshold to 128."
* commit '
b429fe90bf2f3115a6c2187367aa64ffd52199f0':
Nicolas Geoffray [Thu, 27 Aug 2015 04:01:37 +0000 (04:01 +0000)]
am
238c0f54: (-s ours) am
4c310c4c: am
32f59e58: Merge "Revert "Use the quickened metadata to compile -QUICK opcodes.""
* commit '
238c0f541bcaee9c665167ce041d65b225c83e9a':
Nicolas Geoffray [Thu, 27 Aug 2015 04:01:31 +0000 (04:01 +0000)]
am
a2536109: (-s ours) am
38216947: am
c3c0a06b: Merge "Use the quickened metadata to compile -QUICK opcodes."
* commit '
a2536109694b4332da14cf199c3f0c1306434068':
Nicolas Geoffray [Thu, 27 Aug 2015 04:01:22 +0000 (04:01 +0000)]
am
7439c5c0: (-s ours) resolved conflicts for merge of
a2407de1 to mnc-dev-plus-aosp
* commit '
7439c5c0608137bb9bd7524cd54687422743652b':
Aart Bik [Thu, 27 Aug 2015 04:01:13 +0000 (04:01 +0000)]
am
2b0d868b: (-s ours) am
2cf3fc24: am
913a737b: Merge "Test on (in)variant static and instance field arrays."
* commit '
2b0d868bcee5121abbe37ce10bf35f50371495a7':
Andreas Gampe [Thu, 27 Aug 2015 04:00:59 +0000 (04:00 +0000)]
am
9e9bccf0: (-s ours) am
69f77ac2: am
caa2fe33: Merge "ART: Fix System.arraycopy"
* commit '
9e9bccf090b6a8c8a7d19337c86d7d21703eacef':
Nicolas Geoffray [Thu, 27 Aug 2015 04:00:48 +0000 (04:00 +0000)]
am
5fa4d5d2: (-s ours) am
082046b3: am
6d3d1e3d: Merge "Disable test while investigating."
* commit '
5fa4d5d24fa19637afa52fae387aeb492251775f':
Serguei Katkov [Thu, 27 Aug 2015 04:00:26 +0000 (04:00 +0000)]
am
1d24e75f: (-s ours) am
3b7660de: ART: DCE should know that array-length can throw NPE
* commit '
1d24e75f74b38921f6f0d986031a7ce288d22dae':
Roland Levillain [Thu, 27 Aug 2015 04:00:03 +0000 (04:00 +0000)]
am
2242f052: (-s ours) am
6f942363: am
cced6ad1: Merge "Use (D)CHECK_ALIGNED more."
* commit '
2242f052c3508a6cae27f52d74d3e5b6ff3820b3':
Nicolas Geoffray [Thu, 27 Aug 2015 03:59:46 +0000 (03:59 +0000)]
am
aa8ca8cb: (-s ours) am
cda6573b: am
530f3185: Merge "Make oatdump see the new vmap table generated by dextodex."
* commit '
aa8ca8cb1023218e8c3582c9ca32e4b7f3f3d252':
Nicolas Geoffray [Thu, 27 Aug 2015 03:59:15 +0000 (03:59 +0000)]
am
21543911: (-s ours) am
ad709087: am
bca4d299: Merge "ART: Boolean simplifier fix"
* commit '
215439119a04d8cdbda19370f24846a9b3497fef':
Vladimir Marko [Thu, 27 Aug 2015 03:58:55 +0000 (03:58 +0000)]
am
525cb2f7: (-s ours) am
709dbfeb: am
8f861e39: Merge "ART: DCE should know that array-length can throw NPE"
* commit '
525cb2f76ebc16523e3d2ba19da4c202c0d4d644':
Roland Levillain [Thu, 27 Aug 2015 03:58:46 +0000 (03:58 +0000)]
am
f5ecdcc3: (-s ours) am
5d558a2b: am
fec9d09b: Merge "Fix the documentation of all-run-test-names."
* commit '
f5ecdcc334d36dca18ff4beb09020923c1bdb2aa':
Roland Levillain [Thu, 27 Aug 2015 03:58:31 +0000 (03:58 +0000)]
am
4b3fd3c5: (-s ours) am
5fe0050e: am
00b5c617: Merge "Use art::MemoryRegion::{Load,Store}Bits more in art::CodeInfo."
* commit '
4b3fd3c52eadab23e89579e3d0466da46574d44f':
Mathieu Chartier [Thu, 27 Aug 2015 03:58:23 +0000 (03:58 +0000)]
am
88d9471b: (-s ours) am
8dfcb627: am
a14e2e78: Merge "Move MarkObject to mark_sweep.cc"
* commit '
88d9471bca93576bcb94b656993c35a4d7b39bc1':
Evgenii Stepanov [Thu, 27 Aug 2015 03:58:16 +0000 (03:58 +0000)]
am
42296e95: (-s ours) am
2ecfacf5: am
2e7ccf9a: Merge "Enable ASan annotations in ART based on macro setting."
* commit '
42296e957ce329b692dc9fb829441b90fff5c804':
Mathieu Chartier [Thu, 27 Aug 2015 03:58:11 +0000 (03:58 +0000)]
am
31421716: (-s ours) am
d8c534a7: am
34ac23dc: Merge "Address some GC comments"
* commit '
314217162231e2ab4e419f5ec7e73c8bd8a7281b':
Mathieu Chartier [Thu, 27 Aug 2015 03:58:04 +0000 (03:58 +0000)]
am
849ac62b: (-s ours) am
a390a9f4: am
e5abf070: Merge "Use SuspendAllInternal for FlipThreadRoots"
* commit '
849ac62be316336e5e43e3218d506580039987a4':
Vladimir Marko [Thu, 27 Aug 2015 03:57:56 +0000 (03:57 +0000)]
am
add14290: (-s ours) am
8282e05e: am
12cfc600: Merge "Clean up after verifier changes wrt. conflict/undefined reg."
* commit '
add14290b5b90c24107d45079f74ff79b85cf5a0':
David Brazdil [Thu, 27 Aug 2015 03:57:47 +0000 (03:57 +0000)]
am
3cf35f60: (-s ours) am
be58ecaa: am
5c03f369: Merge "ART: Build SSA form when try/catch is present"
* commit '
3cf35f609325c3fc712e88759880d146cf9eafa6':
Nicolas Geoffray [Thu, 27 Aug 2015 03:57:41 +0000 (03:57 +0000)]
am
f4407788: (-s ours) am
e152c8a0: am
045da88b: Merge "Revert "Revert "Revert "Revert "Make dex2dex return a CompiledMethod after quickening."""""
* commit '
f44077884d6c70c7ce9e6b9d07186318e365da5e':
Vladimir Marko [Thu, 27 Aug 2015 03:57:26 +0000 (03:57 +0000)]
am
90d5c3ba: (-s ours) am
0513cf81: am
172c8f71: Merge "Avoid unexpected conversions to ArrayRef."
* commit '
90d5c3ba1fbf21a40197177e4f2e1ab40614d106':
Andreas Gampe [Thu, 27 Aug 2015 03:57:15 +0000 (03:57 +0000)]
am
40fd1a85: (-s ours) am
ac8c5b21: am
76ca8206: Merge "ART: Fix mac build"
* commit '
40fd1a85d243556b42f3d35bda43b00c0621700f':
Mathieu Chartier [Thu, 27 Aug 2015 03:56:57 +0000 (03:56 +0000)]
am
eabdae71: (-s ours) am
126643e7: am
19315c12: Merge "Clean up GC callbacks to be virtual methods"
* commit '
eabdae7155e13fbb1f430ca954872b9c8da79613':
Mathieu Chartier [Thu, 27 Aug 2015 03:56:40 +0000 (03:56 +0000)]
am
f2d3ba1a: (-s ours) am
65f5d929: am
70451aea: Merge "Change phony targets to set dalvik.vm.usejit properly"
* commit '
f2d3ba1abfa4954aeef2748d1d53c86069e9581f':
Hiroshi Yamauchi [Thu, 27 Aug 2015 03:56:25 +0000 (03:56 +0000)]
am
754cf9f9: (-s ours) am
b6a730af: am
8ae35889: Merge "Add ART_TEST_DEBUG_GC to help with debugging gc."
* commit '
754cf9f984e886c861ddabb679061377de76d0cb':
Andreas Gampe [Thu, 27 Aug 2015 03:56:07 +0000 (03:56 +0000)]
am
d4f13205: (-s ours) am
c95d94d0: am
34fcff08: Merge "ART: Remove art_quick_invoke_interface_trampoline"
* commit '
d4f1320517e9eed4a993dfb54c8d16a919ed6a67':
Mathieu Chartier [Thu, 27 Aug 2015 03:55:49 +0000 (03:55 +0000)]
Hiroshi Yamauchi [Thu, 27 Aug 2015 03:55:32 +0000 (03:55 +0000)]
am
c920aaa7: (-s ours) am
01cbb586: am
68953ebf: Merge "Add an option to run art tests with strace."
* commit '
c920aaa7989dac6c2c03ba9b5e5f987e9c7192c6':
Roland Levillain [Thu, 27 Aug 2015 03:55:14 +0000 (03:55 +0000)]
am
015d4fb0: (-s ours) am
047272ea: am
d1665b7a: Merge "Revert "Revert "Fuse long and FP compare & condition on ARM64 in Optimizing."""
* commit '
015d4fb059edbf8b8ed9a61ffcd66c79cd586a65':
Mathieu Chartier [Thu, 27 Aug 2015 03:54:53 +0000 (03:54 +0000)]
am
43dcb777: (-s ours) am
3caab920: am
c6f3439b: Merge "ART: JNI thread state transition optimization"
* commit '
43dcb7771b0b8250dfb0a53f78bc72da093a311d':
Evgenii Stepanov [Thu, 27 Aug 2015 03:54:42 +0000 (03:54 +0000)]
am
13905c6a: (-s ours) am
83527e77: am
e978aba2: Merge "Disable ASan on Thread::InstallImplicitProtection."
* commit '
13905c6a63e7f095532e6c7e7cc86e211d7f9bf4':
Evgenii Stepanov [Thu, 27 Aug 2015 03:54:25 +0000 (03:54 +0000)]
am
a47dec60: (-s ours) am
37fdd2cd: am
0541502e: Merge "Generalize Valgrind annotations in ART to support ASan."
* commit '
a47dec6062bd360542bbcb01df1dc1fabbc4930e':
Hiroshi Yamauchi [Thu, 27 Aug 2015 03:54:15 +0000 (03:54 +0000)]
am
2cc50db3: (-s ours) am
f8202a9d: am
5b1eea0a: Merge "Thread-local mark stacks for the CC collector."
* commit '
2cc50db39fdd8d25c3f411ad6c42816f0480b27c':
Christopher Ferris [Thu, 27 Aug 2015 03:53:57 +0000 (03:53 +0000)]
am
38ab69f0: (-s ours) am
16364599: am
24db1bc5: Merge "Fix cfi information for x86."
* commit '
38ab69f045847caca443406b0e8d635d9596e790':
Christopher Ferris [Thu, 27 Aug 2015 03:53:47 +0000 (03:53 +0000)]
am
8a96b315: (-s ours) am
22ee0902: Merge "Fix cfi information for x86." into mnc-dev
* commit '
8a96b3152f65be4589d23db2bbd28fc3ad8713d7':
Andreas Gampe [Thu, 27 Aug 2015 03:53:32 +0000 (03:53 +0000)]
am
80e55534: (-s ours) am
2a1bcdd3: am
cc22d7cd: Merge "ART: Fix DexFileVerifier try_items OoO validation"
* commit '
80e55534db59d04562bd041eb4ec6b03f8d3645c':
Nicolas Geoffray [Thu, 27 Aug 2015 03:53:24 +0000 (03:53 +0000)]
am
6b63fe3d: (-s ours) am
3df677fe: am
f68c8545: Merge "Revert "Revert "Revert "Make dex2dex return a CompiledMethod after quickening.""""
* commit '
6b63fe3d5382f7df0bc03230485afdaff38afb94':
Nicolas Geoffray [Thu, 27 Aug 2015 03:53:16 +0000 (03:53 +0000)]
am
a04e6128: (-s ours) am
fc36c603: am
6fb5b1bd: Merge "Fix baseline for arm64."
* commit '
a04e612895148ff421c2a8a0f26913a6879f8f24':
Vladimir Marko [Thu, 27 Aug 2015 03:53:06 +0000 (03:53 +0000)]
am
e352d744: (-s ours) am
b70f697d: am
f32521b1: Merge "ART: Don\'t nest indenters in oatdump."
* commit '
e352d7445041f6920c8e89874a3182e5003469c7':
Andreas Gampe [Thu, 27 Aug 2015 03:53:00 +0000 (03:53 +0000)]
am
76e4bdf1: (-s ours) am
9658ccd5: am
15c9881c: Merge "ART: Fix arm32 assembly stub CFI"
* commit '
76e4bdf1fc00c96a6fadf10ab13bd86923ed7f4e':
Nicolas Geoffray [Thu, 27 Aug 2015 03:52:54 +0000 (03:52 +0000)]
am
09067640: (-s ours) am
e0e83608: am
d562cb13: Merge "Revert "Revert "Make dex2dex return a CompiledMethod after quickening."""
* commit '
09067640319a1a3dffd5ccd07fd1ef551027e8ba':
Roland Levillain [Thu, 27 Aug 2015 03:52:48 +0000 (03:52 +0000)]
am
b6eadf6f: (-s ours) am
811cfddf: Re-enable run-test 449-checker-bce on MIPS64.
* commit '
b6eadf6f0d547cc47908615f185064613c5ef41d':
Roland Levillain [Thu, 27 Aug 2015 03:52:43 +0000 (03:52 +0000)]
am
b295337e: (-s ours) am
6576159b: am
af12baea: Merge "Re-enable run-test 449-checker-bce on MIPS64."
* commit '
b295337ea14259bd2e0d47912b7ef71f90f131fe':
Nicolas Geoffray [Thu, 27 Aug 2015 03:52:38 +0000 (03:52 +0000)]
am
a13a5a0f: (-s ours) am
3ce33cf7: am
f7b3c6ed: Merge "Remove the --compiler-backend option from script."
* commit '
a13a5a0f630a8b10c228fb9ec21034c422125b50':
Nicolas Geoffray [Thu, 27 Aug 2015 03:52:33 +0000 (03:52 +0000)]
am
ea65212e: (-s ours) am
582a0c3c: am
77d5e6bf: Merge "Change JIT code to use optimizing."
* commit '
ea65212ec6cfa055ff877e02a80be885df1effae':
Roland Levillain [Thu, 27 Aug 2015 03:52:28 +0000 (03:52 +0000)]
am
c7697526: (-s ours) am
54167205: Merge "Initialize pDeoptimize quick entry pointer for Mips." into mnc-dev
* commit '
c7697526bfdf7af9bdd0d8c62f4a426245eaefb1':
Nicolas Geoffray [Thu, 27 Aug 2015 03:52:22 +0000 (03:52 +0000)]
am
74c3db9e: (-s ours) am
8c8c2ad3: am
f185fb36: Merge "[optimizing] Don\'t rely on the verifier for String.<init>."
* commit '
74c3db9ed84d86aa55af5ecdfb12bc1c34da35fa':
Nicolas Geoffray [Thu, 27 Aug 2015 03:52:14 +0000 (03:52 +0000)]
am
bafe91ce: (-s ours) am
4af5742f: am
5e094de2: Merge "Revert "Make dex2dex return a CompiledMethod after quickening.""
* commit '
bafe91ce178a087c553bf513986be0b2dd8a915c':
Nicolas Geoffray [Thu, 27 Aug 2015 03:52:06 +0000 (03:52 +0000)]
am
b1c1738d: (-s ours) am
e2329f46: am
8bf1b566: Merge "Make dex2dex return a CompiledMethod after quickening."
* commit '
b1c1738d5d12b89b99720190559b8d92091a92a5':
Nicolas Geoffray [Thu, 27 Aug 2015 03:51:58 +0000 (03:51 +0000)]
am
57df58b3: (-s ours) resolved conflicts for merge of
b0139e85 to mnc-dev-plus-aosp
* commit '
57df58b35fd2d3f21ed1b4f5b5dbceeb730248bb':
Mathieu Chartier [Thu, 27 Aug 2015 03:51:47 +0000 (03:51 +0000)]
am
b52797ee: (-s ours) am
99767387: Fix proxy handling in FindDeclaredVirtualMethod
* commit '
b52797ee5924b649a38c2fc04a327fd779515a66':
Andreas Gampe [Thu, 27 Aug 2015 03:51:36 +0000 (03:51 +0000)]
am
0d171455: (-s ours) am
d3ef8f54: am
d4da3600: Merge "ART: Add Thread start VLOG"
* commit '
0d171455ab01afa52d17c9109ce8b51366038e06':
Mathieu Chartier [Thu, 27 Aug 2015 03:51:18 +0000 (03:51 +0000)]
am
9c9522e7: (-s ours) am
ea093986: am
ec97825f: Merge "Fix proxy handling in FindDeclaredVirtualMethod"
* commit '
9c9522e7b5396f3ac448da09f1cd7d0b812f88d6':
Mathieu Chartier [Thu, 27 Aug 2015 03:51:00 +0000 (03:51 +0000)]
am
b114ce32: (-s ours) am
3e9439c1: am
3aec6a37: Merge "Add VMDebug.countInstancesOfClasses"
* commit '
b114ce32026f263d1a8631e4afe9415ae567952d':
Mathieu Chartier [Thu, 27 Aug 2015 03:50:51 +0000 (03:50 +0000)]
am
6ee2142c: (-s ours) am
297e9c12: am
d6dae315: Merge "Change VisitNativeRoots to use unchecked get for method arrays"
* commit '
6ee2142cdcaf4379cdcefcc4ce71a8e651c3998e':
Mathieu Chartier [Thu, 27 Aug 2015 03:50:43 +0000 (03:50 +0000)]
am
6408e7e7: (-s ours) am
554dc0f7: am
eaffe350: Merge "Fix race condition for method root marking in VisitNativeRoots"
* commit '
6408e7e750acb6fbc3d83821a73621669b46791c':
Aart Bik [Thu, 27 Aug 2015 03:50:37 +0000 (03:50 +0000)]
am
496b1bbf: (-s ours) am
01aef866: am
753e36e2: Merge "Enable multi-dex content per file in dexlist/dump."
* commit '
496b1bbfcbe40805830d6f60531000c84d621f5e':
Roland Levillain [Thu, 27 Aug 2015 03:50:30 +0000 (03:50 +0000)]
am
c519e72f: (-s ours) am
3bf6e581: am
e46d0b50: Merge "Revert "Fuse long and FP compare & condition on ARM64 in Optimizing.""
* commit '
c519e72f6abdcac1d2ca5afd39440ddc6d087c3f':
Andreas Gampe [Thu, 27 Aug 2015 03:50:25 +0000 (03:50 +0000)]
am
2fb20f20: (-s ours) am
25e1af5b: ART: Change merges with Undefined to Undefined
* commit '
2fb20f2026e6240995469501844f0d427af32b1a':
Roland Levillain [Thu, 27 Aug 2015 03:50:20 +0000 (03:50 +0000)]
am
a13b1b80: (-s ours) am
2efd93fe: am
404ea410: Merge "Fuse long and FP compare & condition on ARM64 in Optimizing."
* commit '
a13b1b8029aa58d6118b11fd5e60ad5c1df007b9':
Roland Levillain [Thu, 27 Aug 2015 03:50:15 +0000 (03:50 +0000)]
am
35bf59e0: (-s ours) am
9e58a50d: am
f4000216: Merge "Fuse long and FP compare & condition on ARM in Optimizing."
* commit '
35bf59e0167b27f5542602d2e3397dcc5e6f4abd':
Roland Levillain [Thu, 27 Aug 2015 03:50:10 +0000 (03:50 +0000)]
am
a30d11b1: (-s ours) am
4821d42c: am
f16b820f: Merge "Initialize pDeoptimize quick entry pointer for Mips."
* commit '
a30d11b1847ba3dfa6cc8e24b645385aa618cef7':
Andreas Gampe [Thu, 27 Aug 2015 03:50:05 +0000 (03:50 +0000)]
am
acbf31a1: (-s ours) am
b0423784: am
f470eb88: Merge "ART: Change merges with Undefined to Undefined"
* commit '
acbf31a151f3517d7af0d27d601a172b8cd780bf':
Andreas Gampe [Thu, 27 Aug 2015 03:50:00 +0000 (03:50 +0000)]
Andreas Gampe [Thu, 27 Aug 2015 03:49:54 +0000 (03:49 +0000)]
am
ec9e6f8d: (-s ours) am
ed8fea78: Merge "ART: Improve the symbolize script" into mnc-dev
* commit '
ec9e6f8d357cfa6d88906cc802053b11cc9d8beb':
Mathieu Chartier [Thu, 27 Aug 2015 03:49:48 +0000 (03:49 +0000)]
am
cfd377b4: (-s ours) am
a52d36bc: am
d65ddd18: Merge "Remove unused WorkStealing thread pool"
* commit '
cfd377b4d240f85b20f86839d077303954eddb72':
Mathieu Chartier [Thu, 27 Aug 2015 03:49:42 +0000 (03:49 +0000)]
am
bba82ee8: (-s ours) am
9c920307: am
07c65d2b: Merge "Clean up some includes"
* commit '
bba82ee85457471297d661ecbe6b48039c520ef7':
Andreas Gampe [Thu, 27 Aug 2015 03:49:34 +0000 (03:49 +0000)]
am
4aea3e97: (-s ours) am
fb41b769: am
c89216b5: Merge "ART: Improve the symbolize script"
* commit '
4aea3e978e6921fa7efa4445572ed120c3678112':
Andreas Gampe [Thu, 27 Aug 2015 03:49:23 +0000 (03:49 +0000)]
Calin Juravle [Thu, 27 Aug 2015 03:49:05 +0000 (03:49 +0000)]
am
6a6cddd7: (-s ours) am
a4003558: am
a51df8a5: Merge "Fix makefile test against host os."
* commit '
6a6cddd7ab26d8d7e3be5ca40a016a4963387a5d':
David Brazdil [Thu, 27 Aug 2015 03:48:45 +0000 (03:48 +0000)]
am
3fb0a9ae: (-s ours) am
3f4df5e9: am
9781bb05: Merge "ART: Fix bug in GraphBuilder"
* commit '
3fb0a9ae3a2e18170ffb9ce0603a31e47f464c93':
Sebastien Hertz [Thu, 27 Aug 2015 03:48:22 +0000 (03:48 +0000)]
am
30bec90c: (-s ours) resolved conflicts for merge of
5ee9454d to mnc-dev-plus-aosp
* commit '
30bec90cc47aa16c23161d65d062e1fa87157b76':
David Brazdil [Thu, 27 Aug 2015 03:48:00 +0000 (03:48 +0000)]
am
c3880a47: (-s ours) am
b4a4f56f: am
7b3d3bc1: Merge "ART: Add regression test"
* commit '
c3880a4713a543763e8f54aaf72cde73c8cd8bfb':
Sebastien Hertz [Thu, 27 Aug 2015 03:47:46 +0000 (03:47 +0000)]
am
48784ef8: (-s ours) am
23e97f5d: am
0f40fbc8: Merge "Support compiling run-tests with jack"
* commit '
48784ef8df59ce2dcda7bf4b5b4b387aae45231a':
Andreas Gampe [Thu, 27 Aug 2015 03:47:39 +0000 (03:47 +0000)]
am
7df8e213: (-s ours) am
46f5dcbd: am
224a848b: Merge "ART: Allow to set and copy conflicts in the verifier"
* commit '
7df8e213c9b4fc96fd9111ee02f6a29c7261dae7':
Andreas Gampe [Thu, 27 Aug 2015 03:47:31 +0000 (03:47 +0000)]
am
32e8f524: (-s ours) am
c2bf1255: ART: Allow to set and copy conflicts in the verifier
* commit '
32e8f524c4a4ebf7ae725f251b0bc5802c73a3e0':
Mathieu Chartier [Thu, 27 Aug 2015 03:47:27 +0000 (03:47 +0000)]
am
14b87526: (-s ours) am
ff92b000: am
0e87d180: Merge "Fix potential bugs in allocation tracker"
* commit '
14b87526211693a39f3adf2b3d47a31058791523':
Ying Wang [Thu, 27 Aug 2015 03:47:24 +0000 (03:47 +0000)]
am
fc13c82f: (-s ours) am
54d804f8: am
e1f3a6ed: Merge "Have test-art-host-dexdump specifically depend on the host binaries."
* commit '
fc13c82ff90e0b1e968a62758e3958712610838c':
Aart Bik [Thu, 27 Aug 2015 03:47:22 +0000 (03:47 +0000)]
am
6040db90: (-s ours) am
d8618e13: am
784c6aee: Merge "Revert "Make Art dexdump/list the real utilities.""
* commit '
6040db901ce95ac962930e65c38439ad03f1649d':
Mathieu Chartier [Thu, 27 Aug 2015 03:47:20 +0000 (03:47 +0000)]
am
1533ea61: (-s ours) am
b560d884: am
2e3fc781: Merge "Use trap + async timeout for tests"
* commit '
1533ea61194012e6a1c81cfb121fe81cf61d9e3d':
Andreas Gampe [Thu, 27 Aug 2015 03:47:18 +0000 (03:47 +0000)]
am
39ca1d88: (-s ours) am
a3cd834a: ART: Avoid soft- after hard-fail in verifier
* commit '
39ca1d88efe0e18cd80e77138dc8eb9ab552be2d':
Andreas Gampe [Thu, 27 Aug 2015 03:47:16 +0000 (03:47 +0000)]
am
9c9bd6eb: (-s ours) am
0d8b449e: am
dffdfb9e: Merge "ART: Avoid soft- after hard-fail in verifier"
* commit '
9c9bd6ebc743c33b7f354da44b5115951328f0d0':