OSDN Git Service
Nicolas Geoffray [Wed, 24 Jun 2015 17:06:36 +0000 (17:06 +0000)]
am
e5ed385b: resolved conflicts for merge of
53cb9daa to mnc-dev-plus-aosp
* commit '
e5ed385b52cd7ab081c27923a265df9544c6da69':
Use a flag from the verifier to know if we should compile.
Nicolas Geoffray [Wed, 24 Jun 2015 16:54:40 +0000 (17:54 +0100)]
resolved conflicts for merge of
53cb9daa to mnc-dev-plus-aosp
Change-Id: I4c205a5d152968d9076c21df7282ff643715a8a3
Nicolas Geoffray [Wed, 24 Jun 2015 16:48:03 +0000 (16:48 +0000)]
am
b2673eae: am
b5bf1c55: am
fdc9af0e: Merge "Use a flag from the verifier to know if we should compile."
* commit '
b2673eae8ea8ffc551093369f8322592f9d7bea6':
Use a flag from the verifier to know if we should compile.
Nicolas Geoffray [Wed, 24 Jun 2015 16:40:18 +0000 (16:40 +0000)]
am
b5bf1c55: am
fdc9af0e: Merge "Use a flag from the verifier to know if we should compile."
* commit '
b5bf1c551d126feba922bc6284a8923ede0bc8ca':
Use a flag from the verifier to know if we should compile.
Nicolas Geoffray [Wed, 24 Jun 2015 16:34:34 +0000 (16:34 +0000)]
am
28676346: Use a flag from the verifier to know if we should compile.
* commit '
286763464072ffb599846f76720c7ec54392ae6e':
Use a flag from the verifier to know if we should compile.
Nicolas Geoffray [Wed, 24 Jun 2015 16:28:32 +0000 (16:28 +0000)]
am
61763f46: am
923f49c9: am
b5171ff4: BCE: don\'t assume a bounds check always gets a HArrayLength.
* commit '
61763f46bb2a6d3380aaf941a046e4b7781c4c14':
BCE: don't assume a bounds check always gets a HArrayLength.
Nicolas Geoffray [Wed, 24 Jun 2015 16:28:30 +0000 (16:28 +0000)]
am
e02fe820: am
9cd358f9: am
0c955b17: Merge "BCE: don\'t assume a bounds check always gets a HArrayLength."
* commit '
e02fe8208b2918d260e58059de49ffc176eee656':
BCE: don't assume a bounds check always gets a HArrayLength.
Nicolas Geoffray [Wed, 24 Jun 2015 16:28:29 +0000 (16:28 +0000)]
am
5850e644: am
269a766b: am
0fd292dd: Fix codegen_test after DCE fix.
* commit '
5850e6440cb5cda695e52686f54e31a3e5eb5803':
Fix codegen_test after DCE fix.
Nicolas Geoffray [Wed, 24 Jun 2015 16:27:53 +0000 (16:27 +0000)]
am
fdc9af0e: Merge "Use a flag from the verifier to know if we should compile."
* commit '
fdc9af0ed76aa1a6efa05b122c9bcfdbb7e1e991':
Use a flag from the verifier to know if we should compile.
Nicolas Geoffray [Wed, 24 Jun 2015 16:21:40 +0000 (16:21 +0000)]
am
923f49c9: am
b5171ff4: BCE: don\'t assume a bounds check always gets a HArrayLength.
* commit '
923f49c9a6d9ef8257af03d06e2b09310fa3c9b8':
BCE: don't assume a bounds check always gets a HArrayLength.
Nicolas Geoffray [Wed, 24 Jun 2015 14:53:03 +0000 (15:53 +0100)]
Use a flag from the verifier to know if we should compile.
Only used for the lack of bottom type in the aget-object case
for now. Could be used for more.
bug:
21865466
(cherry picked from commit
4824c27988c8eeb302791624bb3ce1d557b0db6c)
Change-Id: I2bb7fe1d4737bd92c1076b5193607d74d8761ee7
Nicolas Geoffray [Wed, 24 Jun 2015 16:15:04 +0000 (16:15 +0000)]
am
9cd358f9: am
0c955b17: Merge "BCE: don\'t assume a bounds check always gets a HArrayLength."
* commit '
9cd358f9a81d597792dac4da38dbbcc43bf1b574':
BCE: don't assume a bounds check always gets a HArrayLength.
Nicolas Geoffray [Wed, 24 Jun 2015 16:14:35 +0000 (16:14 +0000)]
am
269a766b: am
0fd292dd: Fix codegen_test after DCE fix.
* commit '
269a766b786d85e03118af2c0e0a6a7206700c26':
Fix codegen_test after DCE fix.
Nicolas Geoffray [Wed, 24 Jun 2015 16:14:30 +0000 (16:14 +0000)]
Merge "Use a flag from the verifier to know if we should compile."
Nicolas Geoffray [Wed, 24 Jun 2015 16:14:15 +0000 (16:14 +0000)]
am
b5171ff4: BCE: don\'t assume a bounds check always gets a HArrayLength.
* commit '
b5171ff4859104a1e314c3091b6bd4872ad7c2b2':
BCE: don't assume a bounds check always gets a HArrayLength.
Nicolas Geoffray [Wed, 24 Jun 2015 16:08:11 +0000 (16:08 +0000)]
am
e9bea5f0: am
29e83af8: am
18b236e5: Recompute dominator tree after DCE.
* commit '
e9bea5f0e6a7d17b83c9b3d80ee304753d2a6301':
Recompute dominator tree after DCE.
Nicolas Geoffray [Wed, 24 Jun 2015 16:08:09 +0000 (16:08 +0000)]
am
2320f251: am
e62c0362: am
574cce14: BCE: Narrow instead of unconditionnaly overwrite the range.
* commit '
2320f251322af3c309f3cd4739351213b464a56f':
BCE: Narrow instead of unconditionnaly overwrite the range.
Nicolas Geoffray [Wed, 24 Jun 2015 16:02:09 +0000 (16:02 +0000)]
am
0c955b17: Merge "BCE: don\'t assume a bounds check always gets a HArrayLength."
* commit '
0c955b174bf64707ee0ee03195ed56f9cec26fa2':
BCE: don't assume a bounds check always gets a HArrayLength.
Nicolas Geoffray [Wed, 24 Jun 2015 16:01:46 +0000 (16:01 +0000)]
am
0fd292dd: Fix codegen_test after DCE fix.
* commit '
0fd292ddd463f1acf26b2b17d34d9b5a4ba93985':
Fix codegen_test after DCE fix.
Nicolas Geoffray [Wed, 24 Jun 2015 14:53:03 +0000 (15:53 +0100)]
Use a flag from the verifier to know if we should compile.
Only used for the lack of bottom type in the aget-object case
for now. Could be used for more.
bug:
21865466
Change-Id: I64c2c84dfa1c0d259631e65e5f44b94e4139e6a7
Nicolas Geoffray [Wed, 24 Jun 2015 15:56:26 +0000 (15:56 +0000)]
am
29e83af8: am
18b236e5: Recompute dominator tree after DCE.
* commit '
29e83af8d229c779bccb9c281862d938951f520d':
Recompute dominator tree after DCE.
Nicolas Geoffray [Wed, 24 Jun 2015 15:56:25 +0000 (15:56 +0000)]
am
e62c0362: am
574cce14: BCE: Narrow instead of unconditionnaly overwrite the range.
* commit '
e62c03620928b9b331446d9d056cdb019d25a195':
BCE: Narrow instead of unconditionnaly overwrite the range.
Nicolas Geoffray [Wed, 24 Jun 2015 15:56:20 +0000 (15:56 +0000)]
am
318d4b67: am
5f5feee6: am
310b0f5f: Fix another case of un-verified dead code.
* commit '
318d4b67e2ab6604a99724d8651ce28bcc145bf7':
Fix another case of un-verified dead code.
Nicolas Geoffray [Wed, 24 Jun 2015 13:57:44 +0000 (14:57 +0100)]
BCE: don't assume a bounds check always gets a HArrayLength.
Deoptimizations may change it to a HPhi.
bug:
22056703
(cherry picked from commit
8df886b9214802ad689316a1dedb00a6d102555c)
Change-Id: I8afcf88e3a12dbe4d87101e6a7cefb8b81e2bb96
Nicolas Geoffray [Wed, 24 Jun 2015 15:51:38 +0000 (15:51 +0000)]
Merge "BCE: don't assume a bounds check always gets a HArrayLength."
Nicolas Geoffray [Wed, 24 Jun 2015 15:45:38 +0000 (15:45 +0000)]
am
18b236e5: Recompute dominator tree after DCE.
* commit '
18b236e5261d2b1f312e632a4d3bb2273c8bf641':
Recompute dominator tree after DCE.
Nicolas Geoffray [Wed, 24 Jun 2015 15:45:37 +0000 (15:45 +0000)]
am
574cce14: BCE: Narrow instead of unconditionnaly overwrite the range.
* commit '
574cce14025e153d87ec051926d331c5a39e5f92':
BCE: Narrow instead of unconditionnaly overwrite the range.
Nicolas Geoffray [Wed, 24 Jun 2015 15:44:03 +0000 (15:44 +0000)]
am
5f5feee6: am
310b0f5f: Fix another case of un-verified dead code.
* commit '
5f5feee630c155403751abd247512feaa81782c1':
Fix another case of un-verified dead code.
Nicolas Geoffray [Wed, 24 Jun 2015 13:25:09 +0000 (14:25 +0100)]
Fix codegen_test after DCE fix.
(cherry picked from commit
ea80942c39cb5e9bc3e38a388583d1646c1e2a3f)
bug:
22031382
Change-Id: If410045779adb9e7e611af22c988232b5bf9a902
Nicolas Geoffray [Wed, 24 Jun 2015 11:20:24 +0000 (12:20 +0100)]
Recompute dominator tree after DCE.
bug:
22031382
(cherry picked from commit
1f82ecc6a0c9f88d03d6d1a6d95eeb8707bd06c1)
Change-Id: I9a74edb185cb806045903dfe9695d9cc1a02e86b
Nicolas Geoffray [Wed, 24 Jun 2015 15:29:35 +0000 (15:29 +0000)]
am
310b0f5f: Fix another case of un-verified dead code.
* commit '
310b0f5f15ac9ef8fb7ed0a12ff9ba3e4da17033':
Fix another case of un-verified dead code.
Nicolas Geoffray [Wed, 24 Jun 2015 09:38:27 +0000 (10:38 +0100)]
BCE: Narrow instead of unconditionnaly overwrite the range.
bug:
21862741
(cherry picked from commit
a09ff9c11f07863ac57e6120a824f0d20dfaa284)
Change-Id: Ia8e903e09a7f9c2b8ef7cf3522f73f154534b81f
Nicolas Geoffray [Wed, 24 Jun 2015 11:41:20 +0000 (12:41 +0100)]
Fix another case of un-verified dead code.
bug:
22042796
https://code.google.com/p/android/issues/detail?id=178008
(cherry picked from commit
1efcc22cd1895c48adccbe49270d8e8583c2b12d)
Change-Id: I5c0d783e842da39cd3dcbb2f18ccf784e797a64f
David Brazdil [Wed, 24 Jun 2015 14:47:21 +0000 (14:47 +0000)]
am
84133e88: am
5a093022: am
22c4edd8: Merge "ART: Run GraphChecker after Builder and SsaBuilder"
* commit '
84133e88032574a1eea639e470d14646db20fd85':
ART: Run GraphChecker after Builder and SsaBuilder
Nicolas Geoffray [Wed, 24 Jun 2015 14:47:20 +0000 (14:47 +0000)]
am
57e5e5bb: am
fab3c175: am
2b1bc487: Merge "BCE: Narrow instead of unconditionnaly overwrite the range."
* commit '
57e5e5bb482ebf05313870edf6da4df6a420b5d8':
BCE: Narrow instead of unconditionnaly overwrite the range.
David Brazdil [Wed, 24 Jun 2015 14:32:26 +0000 (14:32 +0000)]
am
cd73c395: am
c0f26302: am
b809daaf: Merge "ART: Stop creating a fallthrough block for Goto"
* commit '
cd73c3955717849775bc5b455716811afbf77c91':
ART: Stop creating a fallthrough block for Goto
David Brazdil [Wed, 24 Jun 2015 14:32:18 +0000 (14:32 +0000)]
am
5a093022: am
22c4edd8: Merge "ART: Run GraphChecker after Builder and SsaBuilder"
* commit '
5a09302277105505955a17cf0300bea0c11764f6':
ART: Run GraphChecker after Builder and SsaBuilder
Nicolas Geoffray [Wed, 24 Jun 2015 14:32:17 +0000 (14:32 +0000)]
am
fab3c175: am
2b1bc487: Merge "BCE: Narrow instead of unconditionnaly overwrite the range."
* commit '
fab3c175c80668145bc2b58c7161843c67d85536':
BCE: Narrow instead of unconditionnaly overwrite the range.
David Brazdil [Wed, 24 Jun 2015 14:19:57 +0000 (14:19 +0000)]
am
22c4edd8: Merge "ART: Run GraphChecker after Builder and SsaBuilder"
* commit '
22c4edd865bfdea29e80a789cef70e8e51d2a3a5':
ART: Run GraphChecker after Builder and SsaBuilder
Nicolas Geoffray [Wed, 24 Jun 2015 14:19:56 +0000 (14:19 +0000)]
am
2b1bc487: Merge "BCE: Narrow instead of unconditionnaly overwrite the range."
* commit '
2b1bc487d3fa84e4bac16e85112e5e45682ac0ba':
BCE: Narrow instead of unconditionnaly overwrite the range.
David Brazdil [Wed, 24 Jun 2015 14:19:27 +0000 (14:19 +0000)]
am
c0f26302: am
b809daaf: Merge "ART: Stop creating a fallthrough block for Goto"
* commit '
c0f26302722638750896c5cc13ba53c431f417e9':
ART: Stop creating a fallthrough block for Goto
David Brazdil [Wed, 24 Jun 2015 14:11:45 +0000 (14:11 +0000)]
Merge "ART: Run GraphChecker after Builder and SsaBuilder"
Nicolas Geoffray [Wed, 24 Jun 2015 14:10:57 +0000 (14:10 +0000)]
Merge "BCE: Narrow instead of unconditionnaly overwrite the range."
Nicolas Geoffray [Wed, 24 Jun 2015 09:38:27 +0000 (10:38 +0100)]
BCE: Narrow instead of unconditionnaly overwrite the range.
bug:
21862741
Change-Id: Ic1c2d6fa64255623f87af33a297c459cc9080d3c
David Brazdil [Wed, 24 Jun 2015 14:06:18 +0000 (14:06 +0000)]
am
b809daaf: Merge "ART: Stop creating a fallthrough block for Goto"
* commit '
b809daaffdd42dc01457ae06ae83f2d7ebdb5e65':
ART: Stop creating a fallthrough block for Goto
Nicolas Geoffray [Wed, 24 Jun 2015 13:57:44 +0000 (14:57 +0100)]
BCE: don't assume a bounds check always gets a HArrayLength.
Deoptimizations may change it to a HPhi.
bug:
22056703
Change-Id: I8995209438764dac496ed856782b147ba21f93e5
David Brazdil [Tue, 23 Jun 2015 17:27:30 +0000 (18:27 +0100)]
ART: Run GraphChecker after Builder and SsaBuilder
This patch refactors the way GraphChecker is invoked, utilizing the
same scoping mechanism as pass timing and graph visualizer. Therefore,
GraphChecker will now run not just after instances of HOptimization
but after the builders and reg alloc, too.
Change-Id: I8173b98b79afa95e1fcbf3ac9630a873d7f6c1d4
David Brazdil [Wed, 24 Jun 2015 13:56:48 +0000 (13:56 +0000)]
Merge "ART: Stop creating a fallthrough block for Goto"
Nicolas Geoffray [Wed, 24 Jun 2015 13:55:07 +0000 (13:55 +0000)]
am
c3905766: am
46bccf7f: am
1c7f2f10: Merge "Fix codegen_test after DCE fix."
* commit '
c3905766bdff890ddfc8873f3a47a27670b1d170':
Fix codegen_test after DCE fix.
Nicolas Geoffray [Wed, 24 Jun 2015 13:43:12 +0000 (13:43 +0000)]
am
46bccf7f: am
1c7f2f10: Merge "Fix codegen_test after DCE fix."
* commit '
46bccf7f36ec4f5c38ce04d4a4624aa6464766d0':
Fix codegen_test after DCE fix.
Nicolas Geoffray [Wed, 24 Jun 2015 13:36:03 +0000 (13:36 +0000)]
am
eb3e40f3: am
5ed81859: am
9dda8f23: Merge "Fix another case of un-verified dead code."
* commit '
eb3e40f3c486c74b519584498e243080700df1be':
Fix another case of un-verified dead code.
Nicolas Geoffray [Wed, 24 Jun 2015 13:35:37 +0000 (13:35 +0000)]
am
1c7f2f10: Merge "Fix codegen_test after DCE fix."
* commit '
1c7f2f10230baf7a549af5bfd16fd3f0fb73ba21':
Fix codegen_test after DCE fix.
Nicolas Geoffray [Wed, 24 Jun 2015 13:26:22 +0000 (13:26 +0000)]
Merge "Fix codegen_test after DCE fix."
Nicolas Geoffray [Wed, 24 Jun 2015 13:25:09 +0000 (14:25 +0100)]
Fix codegen_test after DCE fix.
Change-Id: I16c64abc26c64815da4cb4034276d60e9bfb6996
David Brazdil [Wed, 24 Jun 2015 13:23:56 +0000 (14:23 +0100)]
ART: Stop creating a fallthrough block for Goto
Optimizing's Builder used to create a basic block after a Goto under
the assumption that control flow can fall through.
Bug:
19084197
Change-Id: Id85f31df98a4177466750d3cd0bc8bb74782ca2d
Nicolas Geoffray [Wed, 24 Jun 2015 13:23:40 +0000 (13:23 +0000)]
am
5ed81859: am
9dda8f23: Merge "Fix another case of un-verified dead code."
* commit '
5ed818596c6a7c455f44925444e0bc976000c447':
Fix another case of un-verified dead code.
Nicolas Geoffray [Wed, 24 Jun 2015 13:17:21 +0000 (13:17 +0000)]
am
d6b42ad6: am
84dc1cec: am
d61d77d6: Merge "Recompute dominator tree after DCE."
* commit '
d6b42ad6820a1f6c2c71edd83c5a5b5b923ee748':
Recompute dominator tree after DCE.
Nicolas Geoffray [Wed, 24 Jun 2015 13:12:31 +0000 (13:12 +0000)]
am
9dda8f23: Merge "Fix another case of un-verified dead code."
* commit '
9dda8f231bf6aaac3f0397f1fa0cd9d42eb393ed':
Fix another case of un-verified dead code.
Nicolas Geoffray [Wed, 24 Jun 2015 13:10:16 +0000 (13:10 +0000)]
am
84dc1cec: am
d61d77d6: Merge "Recompute dominator tree after DCE."
* commit '
84dc1cec03fd340df8850fc7ea88728d146eb3d1':
Recompute dominator tree after DCE.
Nicolas Geoffray [Wed, 24 Jun 2015 13:01:55 +0000 (13:01 +0000)]
Merge "Fix another case of un-verified dead code."
Nicolas Geoffray [Wed, 24 Jun 2015 12:58:51 +0000 (12:58 +0000)]
am
d61d77d6: Merge "Recompute dominator tree after DCE."
* commit '
d61d77d67a90f2e12ef89997e181f91f8858d7a8':
Recompute dominator tree after DCE.
Nicolas Geoffray [Wed, 24 Jun 2015 11:41:20 +0000 (12:41 +0100)]
Fix another case of un-verified dead code.
bug:
22042796
https://code.google.com/p/android/issues/detail?id=178008
Change-Id: Ie77ccf17ce2a69c86b2278f7920aa4ad39bf142b
Nicolas Geoffray [Wed, 24 Jun 2015 12:50:33 +0000 (12:50 +0000)]
Merge "Recompute dominator tree after DCE."
Calin Juravle [Wed, 24 Jun 2015 11:44:52 +0000 (11:44 +0000)]
am
4bd4f476: am
0a8e9b94: am
a256ee9c: Merge "Revert "Use -Xno-dex-file-fallback for libcore tests.""
* commit '
4bd4f476d10fb469641989ded36107c2eb5b6e09':
Revert "Use -Xno-dex-file-fallback for libcore tests."
Calin Juravle [Wed, 24 Jun 2015 11:38:58 +0000 (11:38 +0000)]
am
0a8e9b94: am
a256ee9c: Merge "Revert "Use -Xno-dex-file-fallback for libcore tests.""
* commit '
0a8e9b945d3ab1b46e9c78f4287ceba09aef514b':
Revert "Use -Xno-dex-file-fallback for libcore tests."
Nicolas Geoffray [Wed, 24 Jun 2015 11:20:24 +0000 (12:20 +0100)]
Recompute dominator tree after DCE.
bug:
22031382
Change-Id: Ifebe169897b76872015e3ce0ed7d0a9662f80cef
Calin Juravle [Wed, 24 Jun 2015 11:32:42 +0000 (11:32 +0000)]
am
a256ee9c: Merge "Revert "Use -Xno-dex-file-fallback for libcore tests.""
* commit '
a256ee9ccbd01407541958476f388ae7c687a9c2':
Revert "Use -Xno-dex-file-fallback for libcore tests."
Calin Juravle [Wed, 24 Jun 2015 11:21:22 +0000 (11:21 +0000)]
Merge "Revert "Use -Xno-dex-file-fallback for libcore tests.""
Calin Juravle [Wed, 24 Jun 2015 11:21:09 +0000 (11:21 +0000)]
Revert "Use -Xno-dex-file-fallback for libcore tests."
This reverts commit
0b58603bc02c0922a1ec2d2cda8de9dbb3128294.
Change-Id: I80ec8f7c41907cd8716d1d73f25818fbb096daa6
Calin Juravle [Wed, 24 Jun 2015 11:03:39 +0000 (11:03 +0000)]
am
9fda9587: am
e8eb9baf: am
264e63bb: Merge "Use -Xno-dex-file-fallback for libcore tests."
* commit '
9fda9587edbbc46bba89cae87b727f85c059f956':
Use -Xno-dex-file-fallback for libcore tests.
Calin Juravle [Wed, 24 Jun 2015 10:56:50 +0000 (10:56 +0000)]
am
e8eb9baf: am
264e63bb: Merge "Use -Xno-dex-file-fallback for libcore tests."
* commit '
e8eb9baf35577af6c2ef8b5709c4448ff738fb5a':
Use -Xno-dex-file-fallback for libcore tests.
Calin Juravle [Wed, 24 Jun 2015 10:50:44 +0000 (10:50 +0000)]
am
264e63bb: Merge "Use -Xno-dex-file-fallback for libcore tests."
* commit '
264e63bb899320a779264964aee6b868de25515e':
Use -Xno-dex-file-fallback for libcore tests.
Calin Juravle [Wed, 24 Jun 2015 10:40:35 +0000 (10:40 +0000)]
Merge "Use -Xno-dex-file-fallback for libcore tests."
Nicolas Geoffray [Wed, 24 Jun 2015 10:09:00 +0000 (10:09 +0000)]
am
0cf627b7: am
7fad6702: am
a12f729e: Merge "Remove bogus DCHECK."
* commit '
0cf627b7d6925a6fbdca9f717a266d1078c662ba':
Remove bogus DCHECK.
Nicolas Geoffray [Wed, 24 Jun 2015 10:08:58 +0000 (10:08 +0000)]
am
66a1184b: am
22e1cbaa: am
582195df: Merge "libcore tests: increase the timeout in debug mode."
* commit '
66a1184bd8efc4606fa0c2683fc9505e5dc38666':
libcore tests: increase the timeout in debug mode.
Nicolas Geoffray [Wed, 24 Jun 2015 09:57:10 +0000 (09:57 +0000)]
am
7fad6702: am
a12f729e: Merge "Remove bogus DCHECK."
* commit '
7fad670294535c1d9c3dacbf235cb78c94c08e5a':
Remove bogus DCHECK.
Nicolas Geoffray [Wed, 24 Jun 2015 09:57:09 +0000 (09:57 +0000)]
am
22e1cbaa: am
582195df: Merge "libcore tests: increase the timeout in debug mode."
* commit '
22e1cbaaae7c9a120c7bd4628358adafd96f6edf':
libcore tests: increase the timeout in debug mode.
Nicolas Geoffray [Wed, 24 Jun 2015 09:47:28 +0000 (09:47 +0000)]
am
a12f729e: Merge "Remove bogus DCHECK."
* commit '
a12f729e7165780e73857e6248af0df00ad6ce2b':
Remove bogus DCHECK.
Nicolas Geoffray [Wed, 24 Jun 2015 09:47:27 +0000 (09:47 +0000)]
am
582195df: Merge "libcore tests: increase the timeout in debug mode."
* commit '
582195dfcee32586b71b0ed00a973cfc7d7b8b57':
libcore tests: increase the timeout in debug mode.
Nicolas Geoffray [Wed, 24 Jun 2015 09:03:56 +0000 (09:03 +0000)]
Merge "Remove bogus DCHECK."
Nicolas Geoffray [Tue, 23 Jun 2015 17:16:46 +0000 (18:16 +0100)]
Remove bogus DCHECK.
Spotted by running libcore tests with libartd.so. The FindClass
call will throw the exception if the element type is void.
Change-Id: Ic5df7eb6c9934b8e70f7bfdcfe533e5c1ad5c518
Nicolas Geoffray [Wed, 24 Jun 2015 08:21:31 +0000 (08:21 +0000)]
Merge "libcore tests: increase the timeout in debug mode."
Andreas Gampe [Tue, 23 Jun 2015 23:47:17 +0000 (23:47 +0000)]
Mathieu Chartier [Tue, 23 Jun 2015 23:47:16 +0000 (23:47 +0000)]
am
0fc147e8: am
a4ee2661: am
442cfa4c: Merge "Fix field ordering for String in hprof"
* commit '
0fc147e8fef50db013f0fbbf033157d6bfc8dcd4':
Fix field ordering for String in hprof
Andreas Gampe [Tue, 23 Jun 2015 23:47:14 +0000 (23:47 +0000)]
Andreas Gampe [Tue, 23 Jun 2015 23:39:48 +0000 (23:39 +0000)]
Mathieu Chartier [Tue, 23 Jun 2015 23:32:21 +0000 (23:32 +0000)]
am
a4ee2661: am
442cfa4c: Merge "Fix field ordering for String in hprof"
* commit '
a4ee266193a87420f24e7a33aef6f13ac70a473f':
Fix field ordering for String in hprof
Andreas Gampe [Tue, 23 Jun 2015 23:32:20 +0000 (23:32 +0000)]
Mathieu Chartier [Tue, 23 Jun 2015 23:31:25 +0000 (23:31 +0000)]
am
2e1ec2f9: am
a8a9eb0d: (-s ours) am
0cffac0c: Merge "Fix field ordering for String in hprof" into mnc-dev
* commit '
2e1ec2f99621e8f98f3336beb55e1931da7dffa8':
Fix field ordering for String in hprof
Andreas Gampe [Tue, 23 Jun 2015 23:25:11 +0000 (23:25 +0000)]
Mathieu Chartier [Tue, 23 Jun 2015 23:18:51 +0000 (23:18 +0000)]
am
a8a9eb0d: (-s ours) am
0cffac0c: Merge "Fix field ordering for String in hprof" into mnc-dev
* commit '
a8a9eb0dfba2582a512b2988579b8a34bd36779f':
Fix field ordering for String in hprof
Jeff Hao [Tue, 23 Jun 2015 23:18:09 +0000 (23:18 +0000)]
am
b2e7f51a: am
8424dbfe: am
b1452c2f: Merge "Make dex file verifier check that indexes are increasing."
* commit '
b2e7f51ab57b1e7b5880bb04639f5fcee92c796c':
Make dex file verifier check that indexes are increasing.
Jeff Hao [Tue, 23 Jun 2015 23:17:45 +0000 (23:17 +0000)]
am
250cc691: am
f8b8ab37: (-s ours) am
dd32833e: Make dex file verifier check that indexes are increasing.
* commit '
250cc691b95a668b84fafe5ce691ae9fff8e9df1':
Make dex file verifier check that indexes are increasing.
Mathieu Chartier [Tue, 23 Jun 2015 23:16:59 +0000 (23:16 +0000)]
am
442cfa4c: Merge "Fix field ordering for String in hprof"
* commit '
442cfa4cf08d4da6b95c48529bc79873fe6ff332':
Fix field ordering for String in hprof
Andreas Gampe [Tue, 23 Jun 2015 23:16:57 +0000 (23:16 +0000)]
Andreas Gampe [Tue, 23 Jun 2015 23:15:18 +0000 (23:15 +0000)]
Mathieu Chartier [Tue, 23 Jun 2015 23:10:45 +0000 (23:10 +0000)]
Merge "Fix field ordering for String in hprof"
Andreas Gampe [Tue, 23 Jun 2015 21:18:17 +0000 (14:18 -0700)]
ART: Follow-up to
507cc6f83bf6379728f2dd20391f2ed5fbfe6371
Do not trigger DCHECK aborts for final and abstract classes when
they are used from other classes. Instead issue a soft error that
leads to a runtime failure.
Bug:
21873151
(cherry picked from commit
f23f33de8b3e9abd16720e0f48d43d63d41dee16)
Change-Id: Ie5251a176722811b3c74585222874313a53f7e02
Andreas Gampe [Tue, 23 Jun 2015 23:03:07 +0000 (23:03 +0000)]
Mathieu Chartier [Tue, 23 Jun 2015 23:02:37 +0000 (23:02 +0000)]
am
0cffac0c: Merge "Fix field ordering for String in hprof" into mnc-dev
* commit '
0cffac0c639d81e77d82c29ed423c91fb4da073b':
Fix field ordering for String in hprof