OSDN Git Service

android-x86/art.git
9 years agoam 1be6044b: am ad805685: ART: Only print stripped dex2oat command line
Andreas Gampe [Fri, 26 Jun 2015 15:09:24 +0000 (15:09 +0000)]
am 1be6044b: am ad805685: ART: Only print stripped dex2oat command line

* commit '1be6044be3c5b390120b250acaa2dbb7d0e47e07':
  ART: Only print stripped dex2oat command line

9 years agoam a08a60a3: am 4a08e17a: Merge "Minor fixes to mips64 for the arch-specific optimisa...
Roland Levillain [Fri, 26 Jun 2015 11:56:40 +0000 (11:56 +0000)]
am a08a60a3: am 4a08e17a: Merge "Minor fixes to mips64 for the arch-specific optimisation framework."

* commit 'a08a60a323b42d1e712e8c610b00141097352625':
  Minor fixes to mips64 for the arch-specific optimisation framework.

9 years agoam 4a08e17a: Merge "Minor fixes to mips64 for the arch-specific optimisation framework."
Roland Levillain [Fri, 26 Jun 2015 11:43:14 +0000 (11:43 +0000)]
am 4a08e17a: Merge "Minor fixes to mips64 for the arch-specific optimisation framework."

* commit '4a08e17a9db0f68b9623849bc288c31a47868fbc':
  Minor fixes to mips64 for the arch-specific optimisation framework.

9 years agoMerge "Minor fixes to mips64 for the arch-specific optimisation framework."
Roland Levillain [Fri, 26 Jun 2015 11:33:01 +0000 (11:33 +0000)]
Merge "Minor fixes to mips64 for the arch-specific optimisation framework."

9 years agoam ccc95333: am d3eaade8: Merge "Revert "ART: Implement try/catch blocks in Builder""
David Brazdil [Fri, 26 Jun 2015 10:22:19 +0000 (10:22 +0000)]
am ccc95333: am d3eaade8: Merge "Revert "ART: Implement try/catch blocks in Builder""

* commit 'ccc95333e2a166ba8c06bd3fd339e4f679c28dd4':
  Revert "ART: Implement try/catch blocks in Builder"

9 years agoam 24067c2f: am 610a0499: Merge "Revert "ART: Fix gtests after try/catch change""
David Brazdil [Fri, 26 Jun 2015 10:22:18 +0000 (10:22 +0000)]
am 24067c2f: am 610a0499: Merge "Revert "ART: Fix gtests after try/catch change""

* commit '24067c2f0d02903d3c2560f4711b3edcb2469c7e':
  Revert "ART: Fix gtests after try/catch change"

9 years agoam d3eaade8: Merge "Revert "ART: Implement try/catch blocks in Builder""
David Brazdil [Fri, 26 Jun 2015 10:10:43 +0000 (10:10 +0000)]
am d3eaade8: Merge "Revert "ART: Implement try/catch blocks in Builder""

* commit 'd3eaade87ac079accca30473ef0a3b38ab600828':
  Revert "ART: Implement try/catch blocks in Builder"

9 years agoam 610a0499: Merge "Revert "ART: Fix gtests after try/catch change""
David Brazdil [Fri, 26 Jun 2015 10:10:41 +0000 (10:10 +0000)]
am 610a0499: Merge "Revert "ART: Fix gtests after try/catch change""

* commit '610a04994ea5988bd6e2e056b658182ec9c445e3':
  Revert "ART: Fix gtests after try/catch change"

9 years agoMerge "Revert "ART: Implement try/catch blocks in Builder""
David Brazdil [Fri, 26 Jun 2015 10:00:03 +0000 (10:00 +0000)]
Merge "Revert "ART: Implement try/catch blocks in Builder""

9 years agoRevert "ART: Implement try/catch blocks in Builder"
David Brazdil [Fri, 26 Jun 2015 09:59:52 +0000 (09:59 +0000)]
Revert "ART: Implement try/catch blocks in Builder"

Causes OutOfMemory issues, need to investigate.

This reverts commit 0b5c7d1994b76090afcc825e737f2b8c546da2f8.

Change-Id: I263e6cc4df5f9a56ad2ce44e18932ca51d7e349f

9 years agoMerge "Revert "ART: Fix gtests after try/catch change""
David Brazdil [Fri, 26 Jun 2015 09:59:19 +0000 (09:59 +0000)]
Merge "Revert "ART: Fix gtests after try/catch change""

9 years agoRevert "ART: Fix gtests after try/catch change"
David Brazdil [Fri, 26 Jun 2015 09:59:06 +0000 (09:59 +0000)]
Revert "ART: Fix gtests after try/catch change"

Need to revert the whole try/catch CL until issues are fixed.

This reverts commit a65930de077a4d7c1110e66ccd950061a85353d0.

Change-Id: Idd69215c87230a8616923665a55fe81891c78bec

9 years agoam 126a9db3: am 6808a0e5: Merge "ART: Fix gtests after try/catch change"
David Brazdil [Fri, 26 Jun 2015 09:46:54 +0000 (09:46 +0000)]
am 126a9db3: am 6808a0e5: Merge "ART: Fix gtests after try/catch change"

* commit '126a9db37db4867ba2c2433c9ef0bf1e84d1b74d':
  ART: Fix gtests after try/catch change

9 years agoam 580ed5ee: am 2f81cd8f: Merge "ART: Implement try/catch blocks in Builder"
David Brazdil [Fri, 26 Jun 2015 09:46:53 +0000 (09:46 +0000)]
am 580ed5ee: am 2f81cd8f: Merge "ART: Implement try/catch blocks in Builder"

* commit '580ed5ee62eacb0d9dfd602acc473025a940697d':
  ART: Implement try/catch blocks in Builder

9 years agoam 92e8c947: am e4a15549: Merge "List test as flaky."
Nicolas Geoffray [Fri, 26 Jun 2015 09:46:51 +0000 (09:46 +0000)]
am 92e8c947: am e4a15549: Merge "List test as flaky."

* commit '92e8c9470869c5bf83afe3d0b747ec990542a281':
  List test as flaky.

9 years agoam 6808a0e5: Merge "ART: Fix gtests after try/catch change"
David Brazdil [Fri, 26 Jun 2015 09:38:45 +0000 (09:38 +0000)]
am 6808a0e5: Merge "ART: Fix gtests after try/catch change"

* commit '6808a0e50a3caca2ccdf22e87cae1796d886d9aa':
  ART: Fix gtests after try/catch change

9 years agoam 2f81cd8f: Merge "ART: Implement try/catch blocks in Builder"
David Brazdil [Fri, 26 Jun 2015 09:38:43 +0000 (09:38 +0000)]
am 2f81cd8f: Merge "ART: Implement try/catch blocks in Builder"

* commit '2f81cd8f4ff21caf133024795bd5ae028c9f68cd':
  ART: Implement try/catch blocks in Builder

9 years agoam e4a15549: Merge "List test as flaky."
Nicolas Geoffray [Fri, 26 Jun 2015 09:38:42 +0000 (09:38 +0000)]
am e4a15549: Merge "List test as flaky."

* commit 'e4a15549608b1c5b1e1cb32f840a8467602dcc14':
  List test as flaky.

9 years agoMerge "ART: Fix gtests after try/catch change"
David Brazdil [Fri, 26 Jun 2015 09:33:32 +0000 (09:33 +0000)]
Merge "ART: Fix gtests after try/catch change"

9 years agoART: Fix gtests after try/catch change
David Brazdil [Fri, 26 Jun 2015 09:26:47 +0000 (10:26 +0100)]
ART: Fix gtests after try/catch change

The try/catch CL changed the order in which instructions were added
into entry/exit blocks which broke the sensitive gtests. This patch
swaps the order back.

Change-Id: Ib337491e5571a2cd38d6784275642f008886cc2a

9 years agoMerge "ART: Implement try/catch blocks in Builder"
David Brazdil [Fri, 26 Jun 2015 08:56:45 +0000 (08:56 +0000)]
Merge "ART: Implement try/catch blocks in Builder"

9 years agoMerge "List test as flaky."
Nicolas Geoffray [Fri, 26 Jun 2015 08:25:03 +0000 (08:25 +0000)]
Merge "List test as flaky."

9 years agoList test as flaky.
Nicolas Geoffray [Fri, 26 Jun 2015 08:24:16 +0000 (09:24 +0100)]
List test as flaky.

bug:22106064
Change-Id: I54b7d38162bebdd1338d498f4f89734ffe28c563

9 years agoam ad805685: ART: Only print stripped dex2oat command line
Andreas Gampe [Fri, 26 Jun 2015 03:28:00 +0000 (03:28 +0000)]
am ad805685: ART: Only print stripped dex2oat command line

* commit 'ad805685621cd6cd8a8144f7f83a69fd1fc171e5':
  ART: Only print stripped dex2oat command line

9 years agoam bbecbeae: am eeca5451: Merge "ART: Only print stripped dex2oat command line"
Andreas Gampe [Fri, 26 Jun 2015 02:52:35 +0000 (02:52 +0000)]
am bbecbeae: am eeca5451: Merge "ART: Only print stripped dex2oat command line"

* commit 'bbecbeae909a38c63ac83a8e57c2b2e1f5f7961c':
  ART: Only print stripped dex2oat command line

9 years agoam eeca5451: Merge "ART: Only print stripped dex2oat command line"
Andreas Gampe [Fri, 26 Jun 2015 02:40:58 +0000 (02:40 +0000)]
am eeca5451: Merge "ART: Only print stripped dex2oat command line"

* commit 'eeca5451918dc36aab02a46e945330d3d4a9c18e':
  ART: Only print stripped dex2oat command line

9 years agoART: Only print stripped dex2oat command line
Andreas Gampe [Tue, 19 May 2015 06:22:54 +0000 (23:22 -0700)]
ART: Only print stripped dex2oat command line

To curb logcat noise, strip many dex2oat parameters from the
logcat printout.

Bug: 20501758

(cherry picked from commit 046c706707ea0f16c804136e237ac7cbfdc897a1)

Change-Id: Ifc367f91f593916e0773af1ca950c798f129889f

9 years agoMerge "ART: Only print stripped dex2oat command line"
Andreas Gampe [Fri, 26 Jun 2015 02:32:14 +0000 (02:32 +0000)]
Merge "ART: Only print stripped dex2oat command line"

9 years agoART: Only print stripped dex2oat command line
Andreas Gampe [Tue, 19 May 2015 06:22:54 +0000 (23:22 -0700)]
ART: Only print stripped dex2oat command line

To curb logcat noise, strip many dex2oat parameters from the
logcat printout.

Bug: 20501758
Change-Id: Ifc367f91f593916e0773af1ca950c798f129889f

9 years agoam 6b846ca9: am 52ce9a2d: Merge "ART: Fix kEverything compiler filter"
buzbee [Thu, 25 Jun 2015 23:28:07 +0000 (23:28 +0000)]
am 6b846ca9: am 52ce9a2d: Merge "ART: Fix kEverything compiler filter"

* commit '6b846ca9ad84a3e842c150a5acd84478600746a1':
  ART: Fix kEverything compiler filter

9 years agoam f7951fbc: am 6056c8fb: Merge "interpreter: Fix string init for soft-failed invokes"
Igor Murashkin [Thu, 25 Jun 2015 23:28:05 +0000 (23:28 +0000)]
am f7951fbc: am 6056c8fb: Merge "interpreter: Fix string init for soft-failed invokes"

* commit 'f7951fbc69ac2386135c8a1f427bada835f10be1':
  interpreter: Fix string init for soft-failed invokes

9 years agoam 52ce9a2d: Merge "ART: Fix kEverything compiler filter"
buzbee [Thu, 25 Jun 2015 23:15:14 +0000 (23:15 +0000)]
am 52ce9a2d: Merge "ART: Fix kEverything compiler filter"

* commit '52ce9a2d8d36a5f2f09c4de37182cd356cbd34cf':
  ART: Fix kEverything compiler filter

9 years agoam 6056c8fb: Merge "interpreter: Fix string init for soft-failed invokes"
Igor Murashkin [Thu, 25 Jun 2015 23:15:12 +0000 (23:15 +0000)]
am 6056c8fb: Merge "interpreter: Fix string init for soft-failed invokes"

* commit '6056c8fb5d397e0cb97221dc70def239597c252e':
  interpreter: Fix string init for soft-failed invokes

9 years agoMerge "ART: Fix kEverything compiler filter"
buzbee [Thu, 25 Jun 2015 23:07:46 +0000 (23:07 +0000)]
Merge "ART: Fix kEverything compiler filter"

9 years agoMerge "interpreter: Fix string init for soft-failed invokes"
Igor Murashkin [Thu, 25 Jun 2015 23:07:42 +0000 (23:07 +0000)]
Merge "interpreter: Fix string init for soft-failed invokes"

9 years agoART: Fix kEverything compiler filter
buzbee [Thu, 25 Jun 2015 22:53:45 +0000 (15:53 -0700)]
ART: Fix kEverything compiler filter

Previously the kEverything filter failed to compile class
initializers. Now it will.

Bug: 19576257
Change-Id: I189d2b5b379aee112c4e95f8d3e6c32abab6ed41

9 years agoam c863f23e: am d7f3c38f: Merge "Make allocation tracker use less memory"
Mathieu Chartier [Thu, 25 Jun 2015 22:27:18 +0000 (22:27 +0000)]
am c863f23e: am d7f3c38f: Merge "Make allocation tracker use less memory"

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

9 years agointerpreter: Fix string init for soft-failed invokes
Igor Murashkin [Thu, 25 Jun 2015 22:18:12 +0000 (15:18 -0700)]
interpreter: Fix string init for soft-failed invokes

Bug: 22040916
Change-Id: Id5b6f0f29e763c31bab4d85877cd8aaf02334e48

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 agoam c2ba5c38: am dfda6d74: Merge "Fixed bug in debugging information in dex file"
Andreas Gampe [Thu, 25 Jun 2015 21:12:32 +0000 (21:12 +0000)]
am c2ba5c38: am dfda6d74: Merge "Fixed bug in debugging information in dex file"

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

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 d7dcb25c: am 6415013f: ART: Reset runtime_throw_failure flag
Andreas Gampe [Thu, 25 Jun 2015 20:21:27 +0000 (20:21 +0000)]
am d7dcb25c: am 6415013f: ART: Reset runtime_throw_failure flag

* commit 'd7dcb25c86a0db2346521a9013eb24208f22f110':
  ART: Reset runtime_throw_failure flag

9 years agoam 6415013f: ART: Reset runtime_throw_failure flag
Andreas Gampe [Thu, 25 Jun 2015 20:07:39 +0000 (20:07 +0000)]
am 6415013f: ART: Reset runtime_throw_failure flag

* commit '6415013f0b9509fed8367871daaf66c6841223f1':
  ART: Reset runtime_throw_failure flag

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

* commit 'c4df3b9a46475c7e0e4d5815f11d374ec06cfb77':
  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

(cherry picked from commit d12e782bcee03ecb6dec41aa9673ef53b638dcea)

Change-Id: I32be914819946233babaa4cb7343844d97b61ba5

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 e993dfd1: am 005deb0a: ART: Set methods to preverified in verify-none
Andreas Gampe [Thu, 25 Jun 2015 18:17:03 +0000 (18:17 +0000)]
am e993dfd1: am 005deb0a: ART: Set methods to preverified in verify-none

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

9 years agoam 005deb0a: ART: Set methods to preverified in verify-none
Andreas Gampe [Thu, 25 Jun 2015 18:06:31 +0000 (18:06 +0000)]
am 005deb0a: ART: Set methods to preverified in verify-none

* commit '005deb0a1683f9ee03a2cf2785dc6a7d7a8f16be':
  ART: Set methods to preverified in verify-none

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

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

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

(cherry picked from commit 1c284f2abdfe1b0ed87d5216021e69146f10b116)

Change-Id: I2d6c8df2a68eae6e358da2639d980cb8bfcc1560

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 d4c47ec9: am 1f77078d: Merge "Do not try to compile resource-only dex files."
Richard Uhler [Thu, 25 Jun 2015 17:15:54 +0000 (17:15 +0000)]
am d4c47ec9: am 1f77078d: Merge "Do not try to compile resource-only dex files."

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

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 agoam c45f922c: am 9ae03f09: Merge "Do not try to compile resource-only dex files."...
Richard Uhler [Thu, 25 Jun 2015 16:02:03 +0000 (16:02 +0000)]
am c45f922c: am 9ae03f09: Merge "Do not try to compile resource-only dex files." into mnc-dev

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

9 years agoART: Implement try/catch blocks in Builder
David Brazdil [Thu, 11 Jun 2015 10:17:49 +0000 (11:17 +0100)]
ART: Implement try/catch blocks in Builder

This patch enables the GraphBuilder to generate blocks and edges which
represent the exceptional control flow when try/catch blocks are
present in the code. Actual compilation is still delegated to Quick
and Baseline ignores the additional code.

To represent the relationship between try and catch blocks, Builder
splits the edges which enter/exit a try block and links the newly
created blocks to the corresponding exception handlers. This layout
will later enable the SsaBuilder to correctly infer the dominators of
the catch blocks and to produce the appropriate reverse post ordering.
It will not, however, allow for building the complete SSA form of the
catch blocks and consequently optimizing such blocks.

To this end, a new TryBoundary control-flow instruction is introduced.
Codegen treats it the same as a Goto but it allows for additional
successors (the handlers).

Change-Id: I415b985596d5bebb7b1bb358a46e08b7b04bb53a

9 years agoresolved conflicts for merge of 85e9888d to mnc-dev-plus-aosp
Vladimir Marko [Thu, 25 Jun 2015 15:56:06 +0000 (16:56 +0100)]
resolved conflicts for merge of 85e9888d to mnc-dev-plus-aosp

9 years agoresolved conflicts for merge of f717cfc6 to mnc-dev-plus-aosp
Nicolas Geoffray [Thu, 25 Jun 2015 15:34:52 +0000 (16:34 +0100)]
resolved conflicts for merge of f717cfc6 to mnc-dev-plus-aosp

Change-Id: Idbdcf3971240bace78e59cabb35d1815a794d903

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 9ae03f09: Merge "Do not try to compile resource-only dex files." into mnc-dev
Richard Uhler [Thu, 25 Jun 2015 15:32:37 +0000 (15:32 +0000)]
am 9ae03f09: Merge "Do not try to compile resource-only dex files." into mnc-dev

* commit '9ae03f09f33c64b6589e85faeac4142b80531b10':
  Do not try to compile resource-only dex files.

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

* commit 'de85ec30d99997f0606dc4bc51dbf5918c4ee0aa':
  Pass LD_USE_LOAD_BIAS to the art script.

9 years agoMerge "Do not try to compile resource-only dex files." into mnc-dev
Richard Uhler [Thu, 25 Jun 2015 15:21:12 +0000 (15:21 +0000)]
Merge "Do not try to compile resource-only dex files." into mnc-dev

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 agoam 02d662d4: am 559b1cc2: [MIPS64] JNI Compiler: Sign-extend int function arguments
Lazar Trsic [Thu, 25 Jun 2015 15:12:18 +0000 (15:12 +0000)]
am 02d662d4: am 559b1cc2: [MIPS64] JNI Compiler: Sign-extend int function arguments

* commit '02d662d4f5269ec7a1820f0d5b03534aa37d50d1':
  [MIPS64] JNI Compiler: Sign-extend int function arguments

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 92067896: Hard-fail get-/put-object to a non-reference field.
Vladimir Marko [Thu, 25 Jun 2015 13:38:11 +0000 (13:38 +0000)]
am 92067896: Hard-fail get-/put-object to a non-reference field.

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

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

* commit 'a1a495e40d7531af949d495de585bea23d23a375':
  Disable test for all runs.

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

(cherry picked from commit 414000ec4d728b5c85f8c6dee4f867fecde59b01)

Change-Id: Iafc32f0e45d26f3aaa2d521b98353e7cede16c6f

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

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

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 20d60dd2: Only do some checks when compiling against the core image.
Nicolas Geoffray [Thu, 25 Jun 2015 10:18:36 +0000 (10:18 +0000)]
am 20d60dd2: Only do some checks when compiling against the core image.

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

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

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

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

(cherry picked from commit 335005e2b3a179f26b7a8ae64ca60a1406b669bd)

Change-Id: Iac6dbe30c9d576077a0384b88696f79937d89471

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 5b2fdbd5: am 1dd3136d: Merge "[MIPS64] JNI Compiler: Sign-extend int function...
Andreas Gampe [Thu, 25 Jun 2015 05:43:05 +0000 (05:43 +0000)]
am 5b2fdbd5: am 1dd3136d: Merge "[MIPS64] JNI Compiler: Sign-extend int function arguments"

* commit '5b2fdbd50b20481754a49cc0f179fd7501b2a68e':
  [MIPS64] JNI Compiler: Sign-extend int function arguments

9 years agoam 4de22934: am a3c9b467: Merge "ART: Fix arm32 instrumentation exit stub"
Andreas Gampe [Thu, 25 Jun 2015 05:43:01 +0000 (05:43 +0000)]
am 4de22934: am a3c9b467: Merge "ART: Fix arm32 instrumentation exit stub"

* commit '4de229342bb9221a1f3c1543f05ac37badb4c248':
  ART: Fix arm32 instrumentation exit stub

9 years agoam 559b1cc2: [MIPS64] JNI Compiler: Sign-extend int function arguments
Lazar Trsic [Thu, 25 Jun 2015 05:27:14 +0000 (05:27 +0000)]
am 559b1cc2: [MIPS64] JNI Compiler: Sign-extend int function arguments

* commit '559b1cc279deb9299414ddd46595bb8bca7fa090':
  [MIPS64] JNI Compiler: Sign-extend int function arguments

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 agoam f7cf2dcc: am 2eb85431: Merge "ART: Fix arm32 instrumentation exit stub" into mnc-dev
Andreas Gampe [Thu, 25 Jun 2015 05:20:35 +0000 (05:20 +0000)]
am f7cf2dcc: am 2eb85431: Merge "ART: Fix arm32 instrumentation exit stub" into mnc-dev

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

9 years agoam b8536f95: am 71e46c1a: Fix force copy
Mathieu Chartier [Thu, 25 Jun 2015 05:20:34 +0000 (05:20 +0000)]
am b8536f95: am 71e46c1a: Fix force copy

* commit 'b8536f958cbe5da51862adeb688b61e80013d716':
  Fix force copy

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.

Bug: 21555893

(cherry picked from commit f652d605753f1387e7797461b47116c5dcdf928d)

Change-Id: I7574d37f6039e9e8c9e0047254be71d28d4c829a

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 2eb85431: Merge "ART: Fix arm32 instrumentation exit stub" into mnc-dev
Andreas Gampe [Thu, 25 Jun 2015 05:08:53 +0000 (05:08 +0000)]
am 2eb85431: Merge "ART: Fix arm32 instrumentation exit stub" into mnc-dev

* commit '2eb85431142f5f45f5f5b3dd67dad42bb1dc4a8a':
  ART: Fix arm32 instrumentation exit stub

9 years agoam 71e46c1a: Fix force copy
Mathieu Chartier [Thu, 25 Jun 2015 05:08:44 +0000 (05:08 +0000)]
am 71e46c1a: Fix force copy

* commit '71e46c1a2e1a8c2ef87b6137e8503dd12e18bb8d':
  Fix force copy