OSDN Git Service

android-x86/art.git
9 years agoam d7f3c38f: Merge "Make allocation tracker use less memory"
Mathieu Chartier [Thu, 25 Jun 2015 22:14:39 +0000 (22:14 +0000)]
am d7f3c38f: Merge "Make allocation tracker use less memory"

* commit 'd7f3c38f1b1d23c08b91abb474e08da3105689f8':
  Make allocation tracker use less memory

9 years agoMerge "Make allocation tracker use less memory"
Mathieu Chartier [Thu, 25 Jun 2015 22:02:33 +0000 (22:02 +0000)]
Merge "Make allocation tracker use less memory"

9 years agoMake allocation tracker use less memory
Man Cao [Tue, 23 Jun 2015 23:38:25 +0000 (16:38 -0700)]
Make allocation tracker use less memory

The allocation tracker no longer keeps recently allocated objects live.
Instead it just keeps their class objects live as strong roots. This fixed
the gc-stress test failure for 098-ddmc.

Also fixed the issue in DisableNewSystemWeak() for allocation tracker,
by making new allocation to wait until GC's sweeping to complete. I didn't
feel any significant slowdown with this wait.

Bug: 20037135
Change-Id: I6a98188832cf7ee478007e3788e742dc6e18f7b8

9 years agoam dfda6d74: Merge "Fixed bug in debugging information in dex file"
Andreas Gampe [Thu, 25 Jun 2015 21:01:11 +0000 (21:01 +0000)]
am dfda6d74: Merge "Fixed bug in debugging information in dex file"

* commit 'dfda6d74f97891d1b61027de9b4dca9bcd7c197d':
  Fixed bug in debugging information in dex file

9 years agoMerge "Fixed bug in debugging information in dex file"
Andreas Gampe [Thu, 25 Jun 2015 20:51:42 +0000 (20:51 +0000)]
Merge "Fixed bug in debugging information in dex file"

9 years agoam f3274f85: Merge "ART: Reset runtime_throw_failure flag"
Andreas Gampe [Thu, 25 Jun 2015 19:42:40 +0000 (19:42 +0000)]
am f3274f85: Merge "ART: Reset runtime_throw_failure flag"

* commit 'f3274f8514636e7f52171a2e6b018017b34784e5':
  ART: Reset runtime_throw_failure flag

9 years agoMerge "ART: Reset runtime_throw_failure flag"
Andreas Gampe [Thu, 25 Jun 2015 19:34:41 +0000 (19:34 +0000)]
Merge "ART: Reset runtime_throw_failure flag"

9 years agoART: Reset runtime_throw_failure flag
Andreas Gampe [Thu, 25 Jun 2015 17:26:40 +0000 (10:26 -0700)]
ART: Reset runtime_throw_failure flag

The flag is instruction-specific. It transports the info from Fail
to the main loop. It must be cleared after each iteration.

Introduce a second flag to store whether we saw such a failure at
all.

Update test expectations.

Bug: 22080519
Change-Id: I32be914819946233babaa4cb7343844d97b61ba5

9 years agoam 292edf0d: Merge "ART: Set methods to preverified in verify-none"
Andreas Gampe [Thu, 25 Jun 2015 17:34:31 +0000 (17:34 +0000)]
am 292edf0d: Merge "ART: Set methods to preverified in verify-none"

* commit '292edf0dacca4b0220522c9b4465638da18dadf4':
  ART: Set methods to preverified in verify-none

9 years agoFixed bug in debugging information in dex file
Aart Bik [Wed, 24 Jun 2015 23:33:32 +0000 (16:33 -0700)]
Fixed bug in debugging information in dex file

Rationale:
Not resetting signature field may cause "leaking" old extended
value into new non-extended value (exposed while implementing
an Art-based dexdump; it affects all debug iterators though)

Bug: 17442393
Change-Id: I4d1e2357ab7e0d77dbcf09786f24ac5cc54160b9

9 years agoMerge "ART: Set methods to preverified in verify-none"
Andreas Gampe [Thu, 25 Jun 2015 17:24:31 +0000 (17:24 +0000)]
Merge "ART: Set methods to preverified in verify-none"

9 years agoART: Set methods to preverified in verify-none
Andreas Gampe [Wed, 24 Jun 2015 23:25:33 +0000 (16:25 -0700)]
ART: Set methods to preverified in verify-none

Actually mark all methods to be verified, so that the interpreter
doesn't do access checks. Speedup is about 2x on a Nexus 6 when booting
in verify-none mode.

Bug: 22040916
Change-Id: I2d6c8df2a68eae6e358da2639d980cb8bfcc1560

9 years agoam 1f77078d: Merge "Do not try to compile resource-only dex files."
Richard Uhler [Thu, 25 Jun 2015 17:09:15 +0000 (17:09 +0000)]
am 1f77078d: Merge "Do not try to compile resource-only dex files."

* commit '1f77078d818648415f9cf193c2b36ae56bd1cf38':
  Do not try to compile resource-only dex files.

9 years agoMerge "Do not try to compile resource-only dex files."
Richard Uhler [Thu, 25 Jun 2015 16:52:45 +0000 (16:52 +0000)]
Merge "Do not try to compile resource-only dex files."

9 years agoDo not try to compile resource-only dex files.
Richard Uhler [Wed, 24 Jun 2015 15:44:19 +0000 (08:44 -0700)]
Do not try to compile resource-only dex files.

This changes behavior in the case where we are asked to load a dex
file that does not exist or has no classes.dex entry.

Previously we would run dex2oat, which would log an error message and
fail. Now we skip running dex2oat, we report the DexOptStatus as
kNoDexOptNeeded, and we do not try to fall back to the missing
original dex files.

Bug: 21722039
(cherry picked from commit cb44b11a926696e34b3dc44288e762b4303cc128)

Change-Id: I84a85dc9ece54bcc0a5283f871e09bf68471c6e7

9 years agoam 7467fa30: Merge "Pass LD_USE_LOAD_BIAS to the art script."
Nicolas Geoffray [Thu, 25 Jun 2015 15:13:53 +0000 (15:13 +0000)]
am 7467fa30: Merge "Pass LD_USE_LOAD_BIAS to the art script."

* commit '7467fa30adceb7287e70075b7c8de0cdade60c4c':
  Pass LD_USE_LOAD_BIAS to the art script.

9 years agoMerge "Pass LD_USE_LOAD_BIAS to the art script."
Nicolas Geoffray [Thu, 25 Jun 2015 15:03:18 +0000 (15:03 +0000)]
Merge "Pass LD_USE_LOAD_BIAS to the art script."

9 years agoPass LD_USE_LOAD_BIAS to the art script.
Nicolas Geoffray [Thu, 25 Jun 2015 14:53:54 +0000 (15:53 +0100)]
Pass LD_USE_LOAD_BIAS to the art script.

The move to using dlopen requires it on the host.

Change-Id: I593818eac4e7c9ea15adbb86c5204e51f776cae4

9 years agoam 6c52aaf4: Merge "Disable test for all runs."
Nicolas Geoffray [Thu, 25 Jun 2015 10:48:43 +0000 (10:48 +0000)]
am 6c52aaf4: Merge "Disable test for all runs."

* commit '6c52aaf45256c858476c0ec4bba8fbb116349275':
  Disable test for all runs.

9 years agoMerge "Disable test for all runs."
Nicolas Geoffray [Thu, 25 Jun 2015 10:41:39 +0000 (10:41 +0000)]
Merge "Disable test for all runs."

9 years agoDisable test for all runs.
Nicolas Geoffray [Thu, 25 Jun 2015 10:40:42 +0000 (11:40 +0100)]
Disable test for all runs.

Change-Id: I2925e4172bee2751788e779b87e7f1165b8c81fc

9 years agoam a397746e: Merge "Hard-fail get-/put-object to a non-reference field."
Vladimir Marko [Thu, 25 Jun 2015 10:37:25 +0000 (10:37 +0000)]
am a397746e: Merge "Hard-fail get-/put-object to a non-reference field."

* commit 'a397746ecce0b991f0ae9cb783154dd7da79a2e8':
  Hard-fail get-/put-object to a non-reference field.

9 years agoMerge "Hard-fail get-/put-object to a non-reference field."
Vladimir Marko [Thu, 25 Jun 2015 10:28:15 +0000 (10:28 +0000)]
Merge "Hard-fail get-/put-object to a non-reference field."

9 years agoam bcc9d2b5: Merge "Only do some checks when compiling against the core image."
Nicolas Geoffray [Thu, 25 Jun 2015 09:55:08 +0000 (09:55 +0000)]
am bcc9d2b5: Merge "Only do some checks when compiling against the core image."

* commit 'bcc9d2b5f07afb6d7e83d71179c3069825a69d7c':
  Only do some checks when compiling against the core image.

9 years agoHard-fail get-/put-object to a non-reference field.
Vladimir Marko [Tue, 23 Jun 2015 16:45:21 +0000 (17:45 +0100)]
Hard-fail get-/put-object to a non-reference field.

Bug: 21886894
Change-Id: Iec870c223ce97fd90dcce05ae80c002e2b24cb5d

9 years agoMerge "Only do some checks when compiling against the core image."
Nicolas Geoffray [Thu, 25 Jun 2015 09:41:39 +0000 (09:41 +0000)]
Merge "Only do some checks when compiling against the core image."

9 years agoOnly do some checks when compiling against the core image.
Nicolas Geoffray [Thu, 25 Jun 2015 09:01:47 +0000 (10:01 +0100)]
Only do some checks when compiling against the core image.

This will avoid false negatives when running dex2oatd on apks.

bug:21865473

Change-Id: Id8eacaefae0bcf07a2ada8aedd7951854cdb5c4f

9 years agoam 1dd3136d: Merge "[MIPS64] JNI Compiler: Sign-extend int function arguments"
Andreas Gampe [Thu, 25 Jun 2015 05:26:44 +0000 (05:26 +0000)]
am 1dd3136d: Merge "[MIPS64] JNI Compiler: Sign-extend int function arguments"

* commit '1dd3136d9f6b1c7d551897a2d96c8314e40f7324':
  [MIPS64] JNI Compiler: Sign-extend int function arguments

9 years agoMerge "[MIPS64] JNI Compiler: Sign-extend int function arguments"
Andreas Gampe [Thu, 25 Jun 2015 05:16:20 +0000 (05:16 +0000)]
Merge "[MIPS64] JNI Compiler: Sign-extend int function arguments"

9 years agoam a3c9b467: Merge "ART: Fix arm32 instrumentation exit stub"
Andreas Gampe [Thu, 25 Jun 2015 04:38:42 +0000 (04:38 +0000)]
am a3c9b467: Merge "ART: Fix arm32 instrumentation exit stub"

* commit 'a3c9b4671d4ea89fb7175d5688a13656429d3ab7':
  ART: Fix arm32 instrumentation exit stub

9 years agoMerge "ART: Fix arm32 instrumentation exit stub"
Andreas Gampe [Thu, 25 Jun 2015 04:28:34 +0000 (04:28 +0000)]
Merge "ART: Fix arm32 instrumentation exit stub"

9 years agoART: Fix arm32 instrumentation exit stub
Andreas Gampe [Wed, 24 Jun 2015 06:28:59 +0000 (23:28 -0700)]
ART: Fix arm32 instrumentation exit stub

Properly store, pass and restore floating point result.

Bug: 22047833

(cherry picked from commit 844fb67a8b5638c4e195dbbe510dc1626824a16c)

Change-Id: If5d9efbe63334c9b6353f76ce6e4fe519602482a

9 years agoam eab80576: Merge "Fix force copy"
Mathieu Chartier [Thu, 25 Jun 2015 03:11:07 +0000 (03:11 +0000)]
am eab80576: Merge "Fix force copy"

* commit 'eab80576240892148d14321c56c8869358e131ab':
  Fix force copy

9 years agoMerge "Fix force copy"
Mathieu Chartier [Thu, 25 Jun 2015 03:00:33 +0000 (03:00 +0000)]
Merge "Fix force copy"

9 years agoFix force copy
Mathieu Chartier [Thu, 25 Jun 2015 00:04:17 +0000 (17:04 -0700)]
Fix force copy

We now correctly pass the returned pointer back onto the release functions.

Bug: 22056708
Change-Id: I1a7300d3a4522a3c81b432ec742ae1c0bd00b51e

9 years agoam 1f1d53eb: Merge "ART: Correctly hard-fail method with undefined register"
Andreas Gampe [Wed, 24 Jun 2015 21:43:40 +0000 (21:43 +0000)]
am 1f1d53eb: Merge "ART: Correctly hard-fail method with undefined register"

* commit '1f1d53ebfc7f955c28f8d5659b7811ad6cef8f19':
  ART: Correctly hard-fail method with undefined register

9 years agoMerge "ART: Correctly hard-fail method with undefined register"
Andreas Gampe [Wed, 24 Jun 2015 21:31:01 +0000 (21:31 +0000)]
Merge "ART: Correctly hard-fail method with undefined register"

9 years agoART: Correctly hard-fail method with undefined register
Andreas Gampe [Wed, 24 Jun 2015 17:26:13 +0000 (10:26 -0700)]
ART: Correctly hard-fail method with undefined register

In case a return-object gets an undefined return value register
and an unresolved return type, the "undefined" must take precedence
and lead to a hard fail of the method.

Bug: 22045582
Change-Id: Id5595a72331cd6272aa9ebc8ff3b9cea046294a2

9 years agoam 2f233b48: Merge "Adding optimizing compiler test case for String.<init>."
Jeff Hao [Wed, 24 Jun 2015 17:44:56 +0000 (17:44 +0000)]
am 2f233b48: Merge "Adding optimizing compiler test case for String.<init>."

* commit '2f233b481d8423bf09e295fea9608b68f09a1862':
  Adding optimizing compiler test case for String.<init>.

9 years agoMerge "Adding optimizing compiler test case for String.<init>."
Jeff Hao [Wed, 24 Jun 2015 17:35:32 +0000 (17:35 +0000)]
Merge "Adding optimizing compiler test case for String.<init>."

9 years agoAdding optimizing compiler test case for String.<init>.
Jeff Hao [Wed, 24 Jun 2015 00:34:04 +0000 (17:34 -0700)]
Adding optimizing compiler test case for String.<init>.

Bug: 21991156

(cherry-picked from commit e7c7d8ed18a4e1d2291af78944ff913319ec1f23)

Change-Id: I282edaaa422f393629a09cb807da889422e33fb2

9 years agoam f46e9d76: Merge "Increase alt signal stack to 32K on host."
Christopher Ferris [Wed, 24 Jun 2015 17:13:37 +0000 (17:13 +0000)]
am f46e9d76: Merge "Increase alt signal stack to 32K on host."

* commit 'f46e9d76c1fb99f0bb3a9a68f5b421d29ab25f7a':
  Increase alt signal stack to 32K on host.

9 years agoMerge "Increase alt signal stack to 32K on host."
Christopher Ferris [Wed, 24 Jun 2015 17:04:28 +0000 (17:04 +0000)]
Merge "Increase alt signal stack to 32K on host."

9 years agoIncrease alt signal stack to 32K on host.
Christopher Ferris [Wed, 24 Jun 2015 16:37:39 +0000 (09:37 -0700)]
Increase alt signal stack to 32K on host.

On host, when there is a crash, the code tries to do an unwind
from the signal handler. Under some conditions this can require
a stack larger than 16K, so increase this value to 32K.

The symptom of this is that you get an empty backtrace running
art tests when there is a crash.

Bug: 21949571
Change-Id: I8306da55e35212a0f349e43a7f2ad546e8da8c76

9 years agoam fdc9af0e: Merge "Use a flag from the verifier to know if we should compile."
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.

9 years agoMerge "Use a flag from the verifier to know if we should compile."
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."

9 years agoam 0c955b17: Merge "BCE: don\'t assume a bounds check always gets a HArrayLength."
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.

9 years agoUse a flag from the verifier to know if we should compile.
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

9 years agoMerge "BCE: don't assume a bounds check always gets a HArrayLength."
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."

9 years ago[MIPS64] JNI Compiler: Sign-extend int function arguments
Lazar Trsic [Wed, 24 Jun 2015 14:30:21 +0000 (16:30 +0200)]
[MIPS64] JNI Compiler: Sign-extend int function arguments

MIPS n64 ABI differs from arm64. Arguments smaller than the 8B stack
slot need to be sign-extended.

Use combination (lw,sd), instead of (lw,sw) for 4B values.

Change fixes software keyboard crash on mips64.

Change-Id: I7574d37f6039e9e8c9e0047254be71d28d4c829a

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 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 agoBCE: don't assume a bounds check always gets a HArrayLength.
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

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 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 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 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 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 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 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 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 "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 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 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 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 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 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 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 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 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 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 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.

9 years agoMerge "ART: Fix data loss when symbolizing oat files."
Roland Levillain [Tue, 23 Jun 2015 13:00:43 +0000 (13:00 +0000)]
Merge "ART: Fix data loss when symbolizing oat files."