OSDN Git Service

android-x86/art.git
9 years agoam 318d4b67: am 5f5feee6: am 310b0f5f: Fix another case of un-verified dead code.
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.

9 years agoam 5f5feee6: am 310b0f5f: Fix another case of un-verified dead code.
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.

9 years agoam 310b0f5f: Fix another case of un-verified dead code.
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.

9 years agoFix another case of un-verified dead code.
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

9 years agoam 84133e88: am 5a093022: am 22c4edd8: Merge "ART: Run GraphChecker after Builder...
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

9 years agoam 57e5e5bb: am fab3c175: am 2b1bc487: Merge "BCE: Narrow instead of unconditionnaly...
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.

9 years agoam cd73c395: am c0f26302: am b809daaf: Merge "ART: Stop creating a fallthrough block...
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

9 years agoam 5a093022: am 22c4edd8: Merge "ART: Run GraphChecker after Builder and SsaBuilder"
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

9 years agoam fab3c175: am 2b1bc487: Merge "BCE: Narrow instead of unconditionnaly overwrite...
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.

9 years agoam 22c4edd8: Merge "ART: Run GraphChecker after Builder and SsaBuilder"
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

9 years agoam 2b1bc487: Merge "BCE: Narrow instead of unconditionnaly overwrite the range."
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.

9 years agoam c0f26302: am b809daaf: Merge "ART: Stop creating a fallthrough block for Goto"
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

9 years agoMerge "ART: Run GraphChecker after Builder and SsaBuilder"
David Brazdil [Wed, 24 Jun 2015 14:11:45 +0000 (14:11 +0000)]
Merge "ART: Run GraphChecker after Builder and SsaBuilder"

9 years agoMerge "BCE: Narrow instead of unconditionnaly overwrite the range."
Nicolas Geoffray [Wed, 24 Jun 2015 14:10:57 +0000 (14:10 +0000)]
Merge "BCE: Narrow instead of unconditionnaly overwrite the range."

9 years agoBCE: 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

9 years agoam b809daaf: Merge "ART: Stop creating a fallthrough block for Goto"
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

9 years agoART: Run GraphChecker after Builder and SsaBuilder
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

9 years agoMerge "ART: Stop creating a fallthrough block for Goto"
David Brazdil [Wed, 24 Jun 2015 13:56:48 +0000 (13:56 +0000)]
Merge "ART: Stop creating a fallthrough block for Goto"

9 years agoam c3905766: am 46bccf7f: am 1c7f2f10: Merge "Fix codegen_test after DCE fix."
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.

9 years agoam 46bccf7f: am 1c7f2f10: Merge "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.

9 years agoam eb3e40f3: am 5ed81859: am 9dda8f23: Merge "Fix another case of un-verified dead...
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.

9 years agoam 1c7f2f10: Merge "Fix codegen_test after DCE fix."
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.

9 years agoMerge "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."

9 years agoFix 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

9 years agoART: Stop creating a fallthrough block for Goto
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

9 years agoam 5ed81859: am 9dda8f23: Merge "Fix another case of un-verified dead code."
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.

9 years agoam d6b42ad6: am 84dc1cec: am d61d77d6: Merge "Recompute dominator tree after DCE."
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.

9 years agoam 9dda8f23: Merge "Fix another case of un-verified dead code."
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.

9 years agoam 84dc1cec: am d61d77d6: Merge "Recompute dominator tree after DCE."
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.

9 years agoMerge "Fix another case of un-verified dead code."
Nicolas Geoffray [Wed, 24 Jun 2015 13:01:55 +0000 (13:01 +0000)]
Merge "Fix another case of un-verified dead code."

9 years agoam d61d77d6: Merge "Recompute dominator tree after DCE."
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.

9 years agoFix another case of un-verified dead code.
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

9 years agoMerge "Recompute dominator tree after DCE."
Nicolas Geoffray [Wed, 24 Jun 2015 12:50:33 +0000 (12:50 +0000)]
Merge "Recompute dominator tree after DCE."

9 years agoam 4bd4f476: am 0a8e9b94: am a256ee9c: Merge "Revert "Use -Xno-dex-file-fallback...
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."

9 years agoam 0a8e9b94: am a256ee9c: Merge "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."

9 years agoRecompute dominator tree after DCE.
Nicolas Geoffray [Wed, 24 Jun 2015 11:20:24 +0000 (12:20 +0100)]
Recompute dominator tree after DCE.

bug:22031382
Change-Id: Ifebe169897b76872015e3ce0ed7d0a9662f80cef

9 years agoam a256ee9c: Merge "Revert "Use -Xno-dex-file-fallback for libcore tests.""
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."

9 years agoMerge "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.""

9 years agoRevert "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

9 years agoam 9fda9587: am e8eb9baf: am 264e63bb: Merge "Use -Xno-dex-file-fallback for libcore...
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.

9 years agoam e8eb9baf: am 264e63bb: Merge "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.

9 years agoam 264e63bb: Merge "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.

9 years agoMerge "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."

9 years agoam 0cf627b7: am 7fad6702: am a12f729e: Merge "Remove bogus DCHECK."
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.

9 years agoam 66a1184b: am 22e1cbaa: am 582195df: Merge "libcore tests: increase the timeout...
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.

9 years agoam 7fad6702: am a12f729e: Merge "Remove bogus DCHECK."
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.

9 years agoam 22e1cbaa: am 582195df: Merge "libcore tests: increase the timeout in debug mode."
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.

9 years agoam a12f729e: Merge "Remove bogus DCHECK."
Nicolas Geoffray [Wed, 24 Jun 2015 09:47:28 +0000 (09:47 +0000)]
am a12f729e: Merge "Remove bogus DCHECK."

* commit 'a12f729e7165780e73857e6248af0df00ad6ce2b':
  Remove bogus DCHECK.

9 years agoam 582195df: Merge "libcore tests: increase the timeout in debug mode."
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.

9 years agoMerge "Remove bogus DCHECK."
Nicolas Geoffray [Wed, 24 Jun 2015 09:03:56 +0000 (09:03 +0000)]
Merge "Remove bogus DCHECK."

9 years agoRemove 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

9 years agoMerge "libcore tests: increase the timeout in debug mode."
Nicolas Geoffray [Wed, 24 Jun 2015 08:21:31 +0000 (08:21 +0000)]
Merge "libcore tests: increase the timeout in debug mode."

9 years agoam f4cf1a8b: am 632aaa50: am 1a63351b: Merge "ART: Follow-up to 507cc6f83bf6379728f2d...
Andreas Gampe [Tue, 23 Jun 2015 23:47:17 +0000 (23:47 +0000)]
am f4cf1a8b: am 632aaa50: am 1a63351b: Merge "ART: Follow-up to 507cc6f83bf6379728f2dd20391f2ed5fbfe6371" into mnc-dev

* commit 'f4cf1a8b2b06238803ca5cc5b97d6ccdb5ba8b62':
  ART: Follow-up to 507cc6f83bf6379728f2dd20391f2ed5fbfe6371

9 years agoam 0fc147e8: am a4ee2661: am 442cfa4c: Merge "Fix field ordering for String in hprof"
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

9 years agoam 7274a71d: am 788a58f6: am 6f327bfb: Merge "ART: Follow-up to 507cc6f83bf6379728f2d...
Andreas Gampe [Tue, 23 Jun 2015 23:47:14 +0000 (23:47 +0000)]
am 7274a71d: am 788a58f6: am 6f327bfb: Merge "ART: Follow-up to 507cc6f83bf6379728f2dd20391f2ed5fbfe6371"

* commit '7274a71d55650333b463495024664cbe5160d782':
  ART: Follow-up to 507cc6f83bf6379728f2dd20391f2ed5fbfe6371

9 years agoam 632aaa50: am 1a63351b: Merge "ART: Follow-up to 507cc6f83bf6379728f2dd20391f2ed5fb...
Andreas Gampe [Tue, 23 Jun 2015 23:39:48 +0000 (23:39 +0000)]
am 632aaa50: am 1a63351b: Merge "ART: Follow-up to 507cc6f83bf6379728f2dd20391f2ed5fbfe6371" into mnc-dev

* commit '632aaa50d3484d392b05d838203475edb62049b8':
  ART: Follow-up to 507cc6f83bf6379728f2dd20391f2ed5fbfe6371

9 years agoam a4ee2661: am 442cfa4c: Merge "Fix field ordering for String in hprof"
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

9 years agoam 788a58f6: am 6f327bfb: Merge "ART: Follow-up to 507cc6f83bf6379728f2dd20391f2ed5fb...
Andreas Gampe [Tue, 23 Jun 2015 23:32:20 +0000 (23:32 +0000)]
am 788a58f6: am 6f327bfb: Merge "ART: Follow-up to 507cc6f83bf6379728f2dd20391f2ed5fbfe6371"

* commit '788a58f622d9138ceb029de36b72b64e2ec84951':
  ART: Follow-up to 507cc6f83bf6379728f2dd20391f2ed5fbfe6371

9 years agoam 2e1ec2f9: am a8a9eb0d: (-s ours) am 0cffac0c: Merge "Fix field ordering for String...
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

9 years agoam 1a63351b: Merge "ART: Follow-up to 507cc6f83bf6379728f2dd20391f2ed5fbfe6371" into...
Andreas Gampe [Tue, 23 Jun 2015 23:25:11 +0000 (23:25 +0000)]
am 1a63351b: Merge "ART: Follow-up to 507cc6f83bf6379728f2dd20391f2ed5fbfe6371" into mnc-dev

* commit '1a63351b4b68a9ffb4e55ce8185e13cda6893ec1':
  ART: Follow-up to 507cc6f83bf6379728f2dd20391f2ed5fbfe6371

9 years agoam a8a9eb0d: (-s ours) am 0cffac0c: Merge "Fix field ordering for String in hprof...
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

9 years agoam b2e7f51a: am 8424dbfe: am b1452c2f: Merge "Make dex file verifier check that index...
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.

9 years agoam 250cc691: am f8b8ab37: (-s ours) am dd32833e: Make dex file verifier check that...
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.

9 years agoam 442cfa4c: Merge "Fix field ordering for String in hprof"
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

9 years agoam 6f327bfb: Merge "ART: Follow-up to 507cc6f83bf6379728f2dd20391f2ed5fbfe6371"
Andreas Gampe [Tue, 23 Jun 2015 23:16:57 +0000 (23:16 +0000)]
am 6f327bfb: Merge "ART: Follow-up to 507cc6f83bf6379728f2dd20391f2ed5fbfe6371"

* commit '6f327bfb6c9c45578794ff8ae3790189968af751':
  ART: Follow-up to 507cc6f83bf6379728f2dd20391f2ed5fbfe6371

9 years agoMerge "ART: Follow-up to 507cc6f83bf6379728f2dd20391f2ed5fbfe6371" into mnc-dev
Andreas Gampe [Tue, 23 Jun 2015 23:15:18 +0000 (23:15 +0000)]
Merge "ART: Follow-up to 507cc6f83bf6379728f2dd20391f2ed5fbfe6371" into mnc-dev

9 years agoMerge "Fix field ordering for String in hprof"
Mathieu Chartier [Tue, 23 Jun 2015 23:10:45 +0000 (23:10 +0000)]
Merge "Fix field ordering for String in hprof"

9 years agoART: Follow-up to 507cc6f83bf6379728f2dd20391f2ed5fbfe6371
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

9 years agoMerge "ART: Follow-up to 507cc6f83bf6379728f2dd20391f2ed5fbfe6371"
Andreas Gampe [Tue, 23 Jun 2015 23:03:07 +0000 (23:03 +0000)]
Merge "ART: Follow-up to 507cc6f83bf6379728f2dd20391f2ed5fbfe6371"

9 years agoam 0cffac0c: Merge "Fix field ordering for String in hprof" into mnc-dev
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

9 years agoART: Follow-up to 507cc6f83bf6379728f2dd20391f2ed5fbfe6371
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
Change-Id: Ie5251a176722811b3c74585222874313a53f7e02

9 years agoFix field ordering for String in hprof
Mathieu Chartier [Tue, 23 Jun 2015 22:45:15 +0000 (15:45 -0700)]
Fix field ordering for String in hprof

We were inserting value field after the Object field instead of
the String fields.

(cherry picked from commit c94c6a751ef1ee31cbc3b924835290bcdef731a0)

Bug: 22043800
Change-Id: Ibaddbd7299562949e32eceb625feac325539e3ce

9 years agoMerge "Fix field ordering for String in hprof" into mnc-dev
Mathieu Chartier [Tue, 23 Jun 2015 22:54:48 +0000 (22:54 +0000)]
Merge "Fix field ordering for String in hprof" into mnc-dev

9 years agoam 8424dbfe: am b1452c2f: Merge "Make dex file verifier check that indexes are increa...
Jeff Hao [Tue, 23 Jun 2015 22:48:50 +0000 (22:48 +0000)]
am 8424dbfe: am b1452c2f: Merge "Make dex file verifier check that indexes are increasing."

* commit '8424dbfe4069ba2059c9e17b2d90caf6043a964c':
  Make dex file verifier check that indexes are increasing.

9 years agoFix field ordering for String in hprof
Mathieu Chartier [Tue, 23 Jun 2015 22:45:15 +0000 (15:45 -0700)]
Fix field ordering for String in hprof

We were inserting value field after the Object field instead of
the String fields.

Bug: 22043800
Change-Id: Ibaddbd7299562949e32eceb625feac325539e3ce

9 years agoam b1452c2f: Merge "Make dex file verifier check that indexes are increasing."
Jeff Hao [Tue, 23 Jun 2015 22:36:48 +0000 (22:36 +0000)]
am b1452c2f: Merge "Make dex file verifier check that indexes are increasing."

* commit 'b1452c2fb01bfb663dbac94010c73b97e0c094e8':
  Make dex file verifier check that indexes are increasing.

9 years agoam f8b8ab37: (-s ours) am dd32833e: Make dex file verifier check that indexes are...
Jeff Hao [Tue, 23 Jun 2015 22:28:46 +0000 (22:28 +0000)]
am f8b8ab37: (-s ours) am dd32833e: Make dex file verifier check that indexes are increasing.

* commit 'f8b8ab374bcb88149c74d4aff4012872c611d9a9':
  Make dex file verifier check that indexes are increasing.

9 years agoMerge "Make dex file verifier check that indexes are increasing."
Jeff Hao [Tue, 23 Jun 2015 22:27:06 +0000 (22:27 +0000)]
Merge "Make dex file verifier check that indexes are increasing."

9 years agoam dd32833e: Make dex file verifier check that indexes are increasing.
Jeff Hao [Tue, 23 Jun 2015 22:12:17 +0000 (22:12 +0000)]
am dd32833e: Make dex file verifier check that indexes are increasing.

* commit 'dd32833e24241508aa697d5349edf6aba9922434':
  Make dex file verifier check that indexes are increasing.

9 years agoMake dex file verifier check that indexes are increasing.
Jeff Hao [Tue, 23 Jun 2015 03:20:30 +0000 (20:20 -0700)]
Make dex file verifier check that indexes are increasing.

Note that this still allows duplicates.

Bug: 21868011

(cherry-picked from commit dd32833e24241508aa697d5349edf6aba9922434)

Change-Id: Ifcb2cda465d9451c16b122185a260ca8cebc41c5

9 years agoMake dex file verifier check that indexes are increasing.
Jeff Hao [Tue, 23 Jun 2015 03:20:30 +0000 (20:20 -0700)]
Make dex file verifier check that indexes are increasing.

Note that this still allows duplicates.

Bug: 21868011
Change-Id: Ib0e91c816eccfaf3b0dac340c05ffd5dc4df17cc

9 years agolibcore tests: increase the timeout in debug mode.
Nicolas Geoffray [Tue, 23 Jun 2015 17:20:41 +0000 (18:20 +0100)]
libcore tests: increase the timeout in debug mode.

libcore.java.lang.SystemTest#testArrayCopyConcurrentModification
is slow on device.

Change-Id: I21e6533b2a3199e9e85d17b059065a6289553f8b

9 years agoam 1acb9531: am cae9bc61: am bb3dabaf: Merge "ART: Improve Indenter performance."
Vladimir Marko [Tue, 23 Jun 2015 17:18:25 +0000 (17:18 +0000)]
am 1acb9531: am cae9bc61: am bb3dabaf: Merge "ART: Improve Indenter performance."

* commit '1acb953126f8e5b9a5eefb2aa4becef02883a005':
  ART: Improve Indenter performance.

9 years agoam cae9bc61: am bb3dabaf: Merge "ART: Improve Indenter performance."
Vladimir Marko [Tue, 23 Jun 2015 17:05:13 +0000 (17:05 +0000)]
am cae9bc61: am bb3dabaf: Merge "ART: Improve Indenter performance."

* commit 'cae9bc61a8ecdc98dc883eafa14fec78865d12d7':
  ART: Improve Indenter performance.

9 years agoam bb3dabaf: Merge "ART: Improve Indenter performance."
Vladimir Marko [Tue, 23 Jun 2015 16:53:06 +0000 (16:53 +0000)]
am bb3dabaf: Merge "ART: Improve Indenter performance."

* commit 'bb3dabaf804e0d0bd2bf34e69091b2f86fd4e78b':
  ART: Improve Indenter performance.

9 years agoMerge "ART: Improve Indenter performance."
Vladimir Marko [Tue, 23 Jun 2015 16:43:31 +0000 (16:43 +0000)]
Merge "ART: Improve Indenter performance."

9 years agoam 21b12c35: am 12d729c6: am 568e8f39: Merge "Fix 496 test."
Nicolas Geoffray [Tue, 23 Jun 2015 16:29:14 +0000 (16:29 +0000)]
am 21b12c35: am 12d729c6: am 568e8f39: Merge "Fix 496 test."

* commit '21b12c35ae6dbdd10714a8f3b8b6a9e18795b2f7':
  Fix 496 test.

9 years agoam 12d729c6: am 568e8f39: Merge "Fix 496 test."
Nicolas Geoffray [Tue, 23 Jun 2015 16:16:52 +0000 (16:16 +0000)]
am 12d729c6: am 568e8f39: Merge "Fix 496 test."

* commit '12d729c6bd3b4b0eb730038a97e292bfa556c99d':
  Fix 496 test.

9 years agoam 568e8f39: Merge "Fix 496 test."
Nicolas Geoffray [Tue, 23 Jun 2015 16:05:22 +0000 (16:05 +0000)]
am 568e8f39: Merge "Fix 496 test."

* commit '568e8f394b264a9b7932f081f971b141e563641e':
  Fix 496 test.

9 years agoMerge "Fix 496 test."
Nicolas Geoffray [Tue, 23 Jun 2015 15:57:12 +0000 (15:57 +0000)]
Merge "Fix 496 test."

9 years agoFix 496 test.
Nicolas Geoffray [Tue, 23 Jun 2015 11:09:55 +0000 (12:09 +0100)]
Fix 496 test.

Make sure the class requested by LoadedByMyClassLoader.bar
is not loaded yet ('Main' is already loaded), in order to
do a proper class loader lookup and not use a dex cache
version.

Change-Id: I77215ae489e6d2c50b90684951bccd0bbf8c1a53

9 years agoART: Improve Indenter performance.
Vladimir Marko [Tue, 23 Jun 2015 14:39:01 +0000 (15:39 +0100)]
ART: Improve Indenter performance.

This reduces the time taken by oatdump_test by ~15s (16%)
on host and ~30s (5%) on N5. The Indenter.overflow() was
previously the hottest function according to perf.

Change-Id: I96eb69ce3f5420cd09dba23b29f8025cedc3d80a

9 years agoam b0b2e9b2: am 99711a57: am d4a02cfc: Merge "Replace some run-time assertions with...
Roland Levillain [Tue, 23 Jun 2015 14:28:15 +0000 (14:28 +0000)]
am b0b2e9b2: am 99711a57: am d4a02cfc: Merge "Replace some run-time assertions with compile-time ones in ART."

* commit 'b0b2e9b21f40866ba55c8b800e9ff960da2e848f':
  Replace some run-time assertions with compile-time ones in ART.

9 years agoam 99711a57: am d4a02cfc: Merge "Replace some run-time assertions with compile-time...
Roland Levillain [Tue, 23 Jun 2015 14:17:17 +0000 (14:17 +0000)]
am 99711a57: am d4a02cfc: Merge "Replace some run-time assertions with compile-time ones in ART."

* commit '99711a57b3eaac5311b5f23aa28f1bb92832de1b':
  Replace some run-time assertions with compile-time ones in ART.

9 years agoam d4a02cfc: Merge "Replace some run-time assertions with compile-time ones in ART."
Roland Levillain [Tue, 23 Jun 2015 14:05:29 +0000 (14:05 +0000)]
am d4a02cfc: Merge "Replace some run-time assertions with compile-time ones in ART."

* commit 'd4a02cfc59a449d216faa687cfdaa4252b4a433f':
  Replace some run-time assertions with compile-time ones in ART.

9 years agoMerge "Replace some run-time assertions with compile-time ones in ART."
Roland Levillain [Tue, 23 Jun 2015 13:53:54 +0000 (13:53 +0000)]
Merge "Replace some run-time assertions with compile-time ones in ART."

9 years agoam 86677fac: am 1ccd50b7: am 0022bdf7: Merge "ART: Fix data loss when symbolizing...
Roland Levillain [Tue, 23 Jun 2015 13:34:09 +0000 (13:34 +0000)]
am 86677fac: am 1ccd50b7: am 0022bdf7: Merge "ART: Fix data loss when symbolizing oat files."

* commit '86677fac68389816079c96654cdd89465c577673':
  ART: Fix data loss when symbolizing oat files.

9 years agoam 1ccd50b7: am 0022bdf7: Merge "ART: Fix data loss when symbolizing oat files."
Roland Levillain [Tue, 23 Jun 2015 13:24:54 +0000 (13:24 +0000)]
am 1ccd50b7: am 0022bdf7: Merge "ART: Fix data loss when symbolizing oat files."

* commit '1ccd50b7c944ea4d9ee62243b514984c1cb20dd1':
  ART: Fix data loss when symbolizing oat files.

9 years agoUse -Xno-dex-file-fallback for libcore tests.
Calin Juravle [Thu, 18 Jun 2015 17:38:48 +0000 (18:38 +0100)]
Use -Xno-dex-file-fallback for libcore tests.

Change-Id: I23911d17c4d71504b3ff9293325af533097ba49d

9 years agoam 0022bdf7: Merge "ART: Fix data loss when symbolizing oat files."
Roland Levillain [Tue, 23 Jun 2015 13:10:40 +0000 (13:10 +0000)]
am 0022bdf7: Merge "ART: Fix data loss when symbolizing oat files."

* commit '0022bdf71533a300deebe6b9cf287eaceeb0620c':
  ART: Fix data loss when symbolizing oat files.