OSDN Git Service

android-x86/art.git
8 years agoMerge "Revamp art::CheckEntrypointTypes uses." am: 22c20ef131 am: f27aa970e6
Roland Levillain [Tue, 24 Nov 2015 17:55:08 +0000 (17:55 +0000)]
Merge "Revamp art::CheckEntrypointTypes uses." am: 22c20ef131 am: f27aa970e6
am: 38bab8eaae

* commit '38bab8eaae8e63e06c0d3c3b19810e6c3cc4eb17':
  Revamp art::CheckEntrypointTypes uses.

8 years agoMerge "MIPS64: Support short and long branches" am: 51a354c747 am: e73ddd8db1
Roland Levillain [Tue, 24 Nov 2015 17:55:00 +0000 (17:55 +0000)]
Merge "MIPS64: Support short and long branches" am: 51a354c747 am: e73ddd8db1
am: 448cd78d1f

* commit '448cd78d1fcd5e101ab97056dd54be5ba872fcb6':
  MIPS64: Support short and long branches

8 years agoMerge "Add another test for wide stores fix in optimizing." am: 7f8275549f am: 03ea981f95
Nicolas Geoffray [Tue, 24 Nov 2015 17:54:51 +0000 (17:54 +0000)]
Merge "Add another test for wide stores fix in optimizing." am: 7f8275549f am: 03ea981f95
am: ca6f2d57e6

* commit 'ca6f2d57e6ba19fe5fadafe722bbad8c716f80e0':
  Add another test for wide stores fix in optimizing.

8 years agoMerge "Clean up read barrier related comments in Optimizing." am: 43922a52eb am:...
Roland Levillain [Tue, 24 Nov 2015 17:54:43 +0000 (17:54 +0000)]
Merge "Clean up read barrier related comments in Optimizing." am: 43922a52eb am: 94d4b661ce
am: d3d0498687

* commit 'd3d0498687e3bd7f6f460aed8bbee60ba461c14f':
  Clean up read barrier related comments in Optimizing.

8 years agoMerge "Revert "lambda: Add support for invoke-interface for boxed innate lambdas...
Nicolas Geoffray [Tue, 24 Nov 2015 17:54:33 +0000 (17:54 +0000)]
Merge "Revert "lambda: Add support for invoke-interface for boxed innate lambdas"" am: a4bce7141a am: 3928e8ccc3
am: ddade0ebab  -s ours

* commit 'ddade0ebab3d79bdc07861b50c0253bc5646a18b':
  Revert "lambda: Add support for invoke-interface for boxed innate lambdas"

8 years agoMerge "Revamp art::CheckEntrypointTypes uses." am: 22c20ef131
Roland Levillain [Tue, 24 Nov 2015 15:52:07 +0000 (15:52 +0000)]
Merge "Revamp art::CheckEntrypointTypes uses." am: 22c20ef131
am: f27aa970e6

* commit 'f27aa970e68b96d8a954fd2e566b78c7bc9ea4e8':
  Revamp art::CheckEntrypointTypes uses.

8 years agoMerge "MIPS64: Support short and long branches" am: 51a354c747
Roland Levillain [Tue, 24 Nov 2015 15:50:45 +0000 (15:50 +0000)]
Merge "MIPS64: Support short and long branches" am: 51a354c747
am: e73ddd8db1

* commit 'e73ddd8db1e306217585b3d0fc03f03e6e09db46':
  MIPS64: Support short and long branches

8 years agoMerge "Add another test for wide stores fix in optimizing." am: 7f8275549f
Nicolas Geoffray [Tue, 24 Nov 2015 15:50:37 +0000 (15:50 +0000)]
Merge "Add another test for wide stores fix in optimizing." am: 7f8275549f
am: 03ea981f95

* commit '03ea981f950f877b34925a8fb8f75c4e1db07ba0':
  Add another test for wide stores fix in optimizing.

8 years agoMerge "Clean up read barrier related comments in Optimizing." am: 43922a52eb
Roland Levillain [Tue, 24 Nov 2015 15:50:29 +0000 (15:50 +0000)]
Merge "Clean up read barrier related comments in Optimizing." am: 43922a52eb
am: 94d4b661ce

* commit '94d4b661ced8836ec004b64aa8cfdf125d9e8578':
  Clean up read barrier related comments in Optimizing.

8 years agoMerge "Revert "lambda: Add support for invoke-interface for boxed innate lambdas...
Nicolas Geoffray [Tue, 24 Nov 2015 15:50:21 +0000 (15:50 +0000)]
Merge "Revert "lambda: Add support for invoke-interface for boxed innate lambdas"" am: a4bce7141a
am: 3928e8ccc3

* commit '3928e8ccc38d41f4340d128367590860ebf7690c':
  Revert "lambda: Add support for invoke-interface for boxed innate lambdas"

8 years agoMerge "Revamp art::CheckEntrypointTypes uses."
Roland Levillain [Tue, 24 Nov 2015 15:44:20 +0000 (15:44 +0000)]
Merge "Revamp art::CheckEntrypointTypes uses."
am: 22c20ef131

* commit '22c20ef131812a6e7ff01f8c57ffe1eb0942fc39':
  Revamp art::CheckEntrypointTypes uses.

8 years agoMerge "MIPS64: Support short and long branches"
Roland Levillain [Tue, 24 Nov 2015 15:42:20 +0000 (15:42 +0000)]
Merge "MIPS64: Support short and long branches"
am: 51a354c747

* commit '51a354c747c8a76a4716a49a1f70bfd975d63787':
  MIPS64: Support short and long branches

8 years agoMerge "Add another test for wide stores fix in optimizing."
Nicolas Geoffray [Tue, 24 Nov 2015 15:42:13 +0000 (15:42 +0000)]
Merge "Add another test for wide stores fix in optimizing."
am: 7f8275549f

* commit '7f8275549fd503f82ac63d65800afacab85af09d':
  Add another test for wide stores fix in optimizing.

8 years agoMerge "Clean up read barrier related comments in Optimizing."
Roland Levillain [Tue, 24 Nov 2015 15:42:06 +0000 (15:42 +0000)]
Merge "Clean up read barrier related comments in Optimizing."
am: 43922a52eb

* commit '43922a52ebc159d048545ad4258aa12cd35cc176':
  Clean up read barrier related comments in Optimizing.

8 years agoMerge "Revert "lambda: Add support for invoke-interface for boxed innate lambdas""
Nicolas Geoffray [Tue, 24 Nov 2015 15:41:55 +0000 (15:41 +0000)]
Merge "Revert "lambda: Add support for invoke-interface for boxed innate lambdas""
am: a4bce7141a

* commit 'a4bce7141aa089d9664d064bdaea05223759447a':
  Revert "lambda: Add support for invoke-interface for boxed innate lambdas"

8 years agoMerge "Enso ThreadGroup.groups is an array not ArrayList"
Przemyslaw Szczepaniak [Tue, 24 Nov 2015 12:36:50 +0000 (12:36 +0000)]
Merge "Enso ThreadGroup.groups is an array not ArrayList"

8 years agoMerge "Revamp art::CheckEntrypointTypes uses."
Roland Levillain [Tue, 24 Nov 2015 12:05:25 +0000 (12:05 +0000)]
Merge "Revamp art::CheckEntrypointTypes uses."

8 years agoEnso ThreadGroup.groups is an array not ArrayList
Przemyslaw Szczepaniak [Tue, 24 Nov 2015 11:59:59 +0000 (11:59 +0000)]
Enso ThreadGroup.groups is an array not ArrayList

ThreadGroup.groups in the enso branch uses plain
array in place of ArrayList. debugger.cc code
needed minor adjustments to access it.

Bug: 25857261
Change-Id: I77ffb92b64a3642933c3240dbadedab5def5dc1b

8 years agoRevamp art::CheckEntrypointTypes uses.
Roland Levillain [Mon, 23 Nov 2015 18:53:50 +0000 (18:53 +0000)]
Revamp art::CheckEntrypointTypes uses.

Change-Id: I6e13e594539e766ed94524ac3282cec292ba91da

8 years agoRevert "lambda: Add support for invoke-interface for boxed innate lambdas"
Nicolas Geoffray [Tue, 24 Nov 2015 09:17:30 +0000 (09:17 +0000)]
Revert "lambda: Add support for invoke-interface for boxed innate lambdas"

955-lambda is flaky

Bug: 24618608
Bug: 25107649

This reverts commit 457e874459ae638145cab6d572e34d48480e39d2.

(cherry picked from commit 3a0909248e04b22c3981cbf617bc2502ed5b6380)

Change-Id: I24884344d21d7a4262e53e3f5dba57032687ddb7

8 years agoMerge "MIPS64: Support short and long branches"
Roland Levillain [Tue, 24 Nov 2015 10:34:22 +0000 (10:34 +0000)]
Merge "MIPS64: Support short and long branches"

8 years agoMerge "Add another test for wide stores fix in optimizing."
Nicolas Geoffray [Tue, 24 Nov 2015 10:23:38 +0000 (10:23 +0000)]
Merge "Add another test for wide stores fix in optimizing."

8 years agoAdd another test for wide stores fix in optimizing.
Nicolas Geoffray [Tue, 3 Nov 2015 16:05:38 +0000 (16:05 +0000)]
Add another test for wide stores fix in optimizing.

Change is https://android-review.googlesource.com/#/c/183273/

Change-Id: I8013795dfa67e8e03f51a13dfa3016b89d3b56b7

8 years agoMerge "Clean up read barrier related comments in Optimizing."
Roland Levillain [Tue, 24 Nov 2015 09:54:46 +0000 (09:54 +0000)]
Merge "Clean up read barrier related comments in Optimizing."

8 years agoMerge "Revert "lambda: Add support for invoke-interface for boxed innate lambdas""
Nicolas Geoffray [Tue, 24 Nov 2015 09:20:09 +0000 (09:20 +0000)]
Merge "Revert "lambda: Add support for invoke-interface for boxed innate lambdas""

8 years agoRevert "lambda: Add support for invoke-interface for boxed innate lambdas"
Nicolas Geoffray [Tue, 24 Nov 2015 09:17:30 +0000 (09:17 +0000)]
Revert "lambda: Add support for invoke-interface for boxed innate lambdas"

955-lambda is flaky

Bug: 24618608
Bug: 25107649

This reverts commit 457e874459ae638145cab6d572e34d48480e39d2.

Change-Id: I24884344d21d7a4262e53e3f5dba57032687ddb7

8 years agoMerge "Disable JDWP tests with read barriers." am: 0c32fdeaed am: 54c9448680
Roland Levillain [Mon, 23 Nov 2015 19:36:29 +0000 (19:36 +0000)]
Merge "Disable JDWP tests with read barriers." am: 0c32fdeaed am: 54c9448680
am: 0142571eb6

* commit '0142571eb613fe8a528153664fb5b403c5875b00':
  Disable JDWP tests with read barriers.

8 years agoMerge "Disable JDWP tests with read barriers." am: 0c32fdeaed
Roland Levillain [Mon, 23 Nov 2015 19:33:08 +0000 (19:33 +0000)]
Merge "Disable JDWP tests with read barriers." am: 0c32fdeaed
am: 54c9448680

* commit '54c9448680df5a68a1fcccff131cabd743642155':
  Disable JDWP tests with read barriers.

8 years agoMerge "Disable JDWP tests with read barriers."
Roland Levillain [Mon, 23 Nov 2015 19:30:02 +0000 (19:30 +0000)]
Merge "Disable JDWP tests with read barriers."
am: 0c32fdeaed

* commit '0c32fdeaeda2a1e388e280da12662d1d18c834a2':
  Disable JDWP tests with read barriers.

8 years agoClean up read barrier related comments in Optimizing.
Roland Levillain [Mon, 23 Nov 2015 19:29:22 +0000 (19:29 +0000)]
Clean up read barrier related comments in Optimizing.

Bug: 12687968
Change-Id: Idf2e371e01e10d9d32c95b150735e2c96244232e

8 years agoMerge "Disable JDWP tests with read barriers."
Roland Levillain [Mon, 23 Nov 2015 19:25:48 +0000 (19:25 +0000)]
Merge "Disable JDWP tests with read barriers."

8 years agoDisable JDWP tests with read barriers.
Roland Levillain [Mon, 23 Nov 2015 19:24:25 +0000 (19:24 +0000)]
Disable JDWP tests with read barriers.

This is temporary, so as to have the builds turn green
again, while the deadlock issue is explored.

Bug: 25800335
Change-Id: I4520a0aa24441160c3fbb8a7a19103bd3f9e3fe6

8 years agoMerge "Make target-sync work with verity." am: db001ab8d8 am: 9db399ea9a
Alex Light [Mon, 23 Nov 2015 18:38:39 +0000 (18:38 +0000)]
Merge "Make target-sync work with verity." am: db001ab8d8 am: 9db399ea9a
am: 918baf4c4b

* commit '918baf4c4b613d7494e6451161b340b9ed3f4ad0':
  Make target-sync work with verity.

8 years agoMerge "ARM64: Add support for multiply-accumulate." am: 67e0ad6df9 am: f6dc22c5d7
Vladimir Marko [Mon, 23 Nov 2015 18:38:31 +0000 (18:38 +0000)]
Merge "ARM64: Add support for multiply-accumulate." am: 67e0ad6df9 am: f6dc22c5d7
am: c7fe34ffe8

* commit 'c7fe34ffe8b280222f1bf12f4fbd457b842c39bb':
  ARM64: Add support for multiply-accumulate.

8 years agoMerge "Make target-sync work with verity." am: db001ab8d8
Alex Light [Mon, 23 Nov 2015 18:34:49 +0000 (18:34 +0000)]
Merge "Make target-sync work with verity." am: db001ab8d8
am: 9db399ea9a

* commit '9db399ea9acc757164192c82c57c01c9e74356f6':
  Make target-sync work with verity.

8 years agoMerge "Make target-sync work with verity."
Alex Light [Mon, 23 Nov 2015 18:30:47 +0000 (18:30 +0000)]
Merge "Make target-sync work with verity."
am: db001ab8d8

* commit 'db001ab8d8a03084079631485bc5e007b86d1dee':
  Make target-sync work with verity.

8 years agoMerge "Make target-sync work with verity."
Alex Light [Mon, 23 Nov 2015 18:25:02 +0000 (18:25 +0000)]
Merge "Make target-sync work with verity."

8 years agoMerge "ARM64: Add support for multiply-accumulate." am: 67e0ad6df9
Vladimir Marko [Mon, 23 Nov 2015 17:45:40 +0000 (17:45 +0000)]
Merge "ARM64: Add support for multiply-accumulate." am: 67e0ad6df9
am: f6dc22c5d7

* commit 'f6dc22c5d7c23774fa77f41fbce49bf3d80c5cc4':
  ARM64: Add support for multiply-accumulate.

8 years agoMerge "ARM64: Add support for multiply-accumulate."
Vladimir Marko [Mon, 23 Nov 2015 17:41:26 +0000 (17:41 +0000)]
Merge "ARM64: Add support for multiply-accumulate."
am: 67e0ad6df9

* commit '67e0ad6df9db9193fb1fb7115c249a39b1be6033':
  ARM64: Add support for multiply-accumulate.

8 years agoMerge "ARM64: Add support for multiply-accumulate."
Vladimir Marko [Mon, 23 Nov 2015 17:35:55 +0000 (17:35 +0000)]
Merge "ARM64: Add support for multiply-accumulate."

8 years agoFurther fix for class deduction for ctor access checks
Przemyslaw Szczepaniak [Mon, 23 Nov 2015 16:08:03 +0000 (16:08 +0000)]
Further fix for class deduction for ctor access checks

Previous fix went one frame to far, to get Constructor.newInstance
caller we need to look 2 frames in the past.

Bug: 25713446
Bug: 25753241
Bug: 24764403

Change-Id: Ieb9c144f1ef4df569302793243457f4623977b35

8 years agoManually close the JNI libraries
Yi Kong [Tue, 17 Nov 2015 19:22:30 +0000 (19:22 +0000)]
Manually close the JNI libraries

Runtime does not support repeatedly doing JNI->CreateVM, thus we need to
manually clean up the dynamic linking loader so that gtests would not
fail.

Bug: 25785594
Change-Id: I15d55e142b9f91735b1c94c8cb43cc854ec49ffe
(cherry picked from commit 46bc2a7c6c5ae6b4d5fc065d607208193c2d162e)

8 years agoMerge "ART: Fix wide stores in Optimizing" am: 349106d96c am: fb601d2eeb
David Brazdil [Mon, 23 Nov 2015 14:25:42 +0000 (14:25 +0000)]
Merge "ART: Fix wide stores in Optimizing" am: 349106d96c am: fb601d2eeb
am: c1d9bf07de

* commit 'c1d9bf07de7d629f347f876b9ac71975f5045430':
  ART: Fix wide stores in Optimizing

8 years agoMerge "ART: Fix wide stores in Optimizing" am: 349106d96c
David Brazdil [Mon, 23 Nov 2015 14:23:24 +0000 (14:23 +0000)]
Merge "ART: Fix wide stores in Optimizing" am: 349106d96c
am: fb601d2eeb

* commit 'fb601d2eeba807d24296c3ff47305b83bc1ff64a':
  ART: Fix wide stores in Optimizing

8 years agoMerge "ART: Fix wide stores in Optimizing"
David Brazdil [Mon, 23 Nov 2015 14:19:45 +0000 (14:19 +0000)]
Merge "ART: Fix wide stores in Optimizing"
am: 349106d96c

* commit '349106d96cc56399ab594aaee0beed223ee0b8f8':
  ART: Fix wide stores in Optimizing

8 years agoMerge "ART: Fix wide stores in Optimizing"
David Brazdil [Mon, 23 Nov 2015 14:17:53 +0000 (14:17 +0000)]
Merge "ART: Fix wide stores in Optimizing"

8 years agoMerge "Optimizing: Avoid a PrettyMethod() call per compiled method." am: eb4955b5aa...
Vladimir Marko [Mon, 23 Nov 2015 14:17:35 +0000 (14:17 +0000)]
Merge "Optimizing: Avoid a PrettyMethod() call per compiled method." am: eb4955b5aa am: a5c0a6c6de
am: 5a5aee483c

* commit '5a5aee483cd64236cc69018fc01ea0f45ebb0a63':
  Optimizing: Avoid a PrettyMethod() call per compiled method.

8 years agoMerge "Optimizing: Avoid a PrettyMethod() call per compiled method." am: eb4955b5aa
Vladimir Marko [Mon, 23 Nov 2015 14:15:22 +0000 (14:15 +0000)]
Merge "Optimizing: Avoid a PrettyMethod() call per compiled method." am: eb4955b5aa
am: a5c0a6c6de

* commit 'a5c0a6c6dec08f122d675e3767f6583d56851474':
  Optimizing: Avoid a PrettyMethod() call per compiled method.

8 years agoMerge "Optimizing: Avoid a PrettyMethod() call per compiled method."
Vladimir Marko [Mon, 23 Nov 2015 14:13:07 +0000 (14:13 +0000)]
Merge "Optimizing: Avoid a PrettyMethod() call per compiled method."
am: eb4955b5aa

* commit 'eb4955b5aaa82639802147a861cf230ca5294d46':
  Optimizing: Avoid a PrettyMethod() call per compiled method.

8 years agoMerge "Optimizing: Avoid a PrettyMethod() call per compiled method."
Vladimir Marko [Mon, 23 Nov 2015 14:10:50 +0000 (14:10 +0000)]
Merge "Optimizing: Avoid a PrettyMethod() call per compiled method."

8 years agoOptimizing: Avoid a PrettyMethod() call per compiled method.
Vladimir Marko [Fri, 20 Nov 2015 13:02:22 +0000 (13:02 +0000)]
Optimizing: Avoid a PrettyMethod() call per compiled method.

PrettyMethod() is expensive so avoid it unless it's actually
needed.

Change-Id: I06ab29cc18e426b7dfb8c53b163757c88b53c27f

8 years agoART: Fix wide stores in Optimizing
David Brazdil [Thu, 19 Nov 2015 10:29:39 +0000 (10:29 +0000)]
ART: Fix wide stores in Optimizing

SsaBuilder::VisitStoreLocal did not take into account the following:
 (a) when storing a wide value, the high vreg must be invalidated,
 (b) when storing into the high vreg of a wide value, the low vreg
     must be invalidated.

Both situations cause overestimation of liveness but only (b) has
implications on correctness. CodeGenerator::EmitEnvironment will skip
the high vreg, causing deoptimizing and try/catch to load a wrong
value for that vreg.

In order to fix this bug, several changes had to be made to the
SsaBuilder:
 (1) phis need to be initialized with a type which matches its
     inputs' size,
 (2) eagerly created loop header phis may end up being undefined
     because of their corresponding vregs being invalidated inside
     the loop; these are marked dead during input setting,
 (3) the entire SSA-building algorithm should never revive an
     undefined loop header phi.

Bug: 25677992
Bug: https://code.google.com/p/android/issues/detail?id=194022

Change-Id: Id8a852e38c3f5ff1c2e608b1aafd6d5ac8311e32

8 years agoMerge "Temporarily disable compiler_driver_test."
Yi Kong [Mon, 23 Nov 2015 12:23:55 +0000 (12:23 +0000)]
Merge "Temporarily disable compiler_driver_test."

8 years agoTemporarily disable compiler_driver_test.
Yi Kong [Mon, 23 Nov 2015 12:21:12 +0000 (12:21 +0000)]
Temporarily disable compiler_driver_test.

bug: 25836016
Change-Id: I2d2e7c5b2bcbc2b906b38dd2cf39583ca6fbabde

8 years agoMerge "Do not change to the access check entrypoint when inlined." am: 6d92d59fb0...
Nicolas Geoffray [Mon, 23 Nov 2015 12:21:06 +0000 (12:21 +0000)]
Merge "Do not change to the access check entrypoint when inlined." am: 6d92d59fb0 am: c61ac2785c
am: a0e175d8eb

* commit 'a0e175d8eba66537d4be213499664fd1eb05a858':
  Do not change to the access check entrypoint when inlined.

8 years agoMerge "Do not change to the access check entrypoint when inlined." am: 6d92d59fb0
Nicolas Geoffray [Mon, 23 Nov 2015 12:17:52 +0000 (12:17 +0000)]
Merge "Do not change to the access check entrypoint when inlined." am: 6d92d59fb0
am: c61ac2785c

* commit 'c61ac2785c236a556fc4d70eca7b7e0fd83060f5':
  Do not change to the access check entrypoint when inlined.

8 years agoMerge "Do not change to the access check entrypoint when inlined."
Nicolas Geoffray [Mon, 23 Nov 2015 12:14:45 +0000 (12:14 +0000)]
Merge "Do not change to the access check entrypoint when inlined."
am: 6d92d59fb0

* commit '6d92d59fb0acc1f9fde1d736f80e6cb1a8541da9':
  Do not change to the access check entrypoint when inlined.

8 years agoMerge "Do not change to the access check entrypoint when inlined."
Nicolas Geoffray [Mon, 23 Nov 2015 12:11:46 +0000 (12:11 +0000)]
Merge "Do not change to the access check entrypoint when inlined."

8 years agoDo not change to the access check entrypoint when inlined.
Nicolas Geoffray [Mon, 23 Nov 2015 12:04:37 +0000 (12:04 +0000)]
Do not change to the access check entrypoint when inlined.

The allocation entrypoint that deals with access checks does
not work with inlined methods.

Fixes 542-unresolved-access-check in jit mode.

Change-Id: I02290a8b2089fcf06e2216dabf8089920b529765

8 years agoDisable 070-nio-buffer and 955-lambda-smali.
Narayan Kamath [Mon, 23 Nov 2015 11:27:54 +0000 (11:27 +0000)]
Disable 070-nio-buffer and 955-lambda-smali.

bug: 25835841
bug: 25759499
Change-Id: I393c12788182b62df011dc33f25e785923ae1896

8 years agoMerge "Optimizing/ARM: Improve long shifts by 1." am: f180af0fc0 am: f2550c7330
Vladimir Marko [Mon, 23 Nov 2015 11:29:09 +0000 (11:29 +0000)]
Merge "Optimizing/ARM: Improve long shifts by 1." am: f180af0fc0 am: f2550c7330
am: a4d4c41d9b

* commit 'a4d4c41d9b8c1636fc63947f281c95a60ba3aae1':
  Optimizing/ARM: Improve long shifts by 1.

8 years agoMerge "Optimizing/ARM: Improve long shifts by 1." am: f180af0fc0
Vladimir Marko [Mon, 23 Nov 2015 11:26:03 +0000 (11:26 +0000)]
Merge "Optimizing/ARM: Improve long shifts by 1." am: f180af0fc0
am: f2550c7330

* commit 'f2550c7330c5bc012a6aafdcc0188472ed332dc1':
  Optimizing/ARM: Improve long shifts by 1.

8 years agoMerge "Optimizing/ARM: Improve long shifts by 1."
Vladimir Marko [Mon, 23 Nov 2015 11:23:03 +0000 (11:23 +0000)]
Merge "Optimizing/ARM: Improve long shifts by 1."
am: f180af0fc0

* commit 'f180af0fc0d0bd981dd6356848df2ba237e1a227':
  Optimizing/ARM: Improve long shifts by 1.

8 years agoMerge "Optimizing/ARM: Improve long shifts by 1."
Vladimir Marko [Mon, 23 Nov 2015 11:20:35 +0000 (11:20 +0000)]
Merge "Optimizing/ARM: Improve long shifts by 1."

8 years agoFix jni_internal_test
Yi Kong [Thu, 19 Nov 2015 13:58:04 +0000 (13:58 +0000)]
Fix jni_internal_test

by loading correct dependent classes for OpenJDK DirectByteBuffer.

Bug: 25810235

(cherry picked from commit 0cef3d3e85e7a992fe5adb2c853233d6f5ce3a63)

Change-Id: I4b4c1ac164d4710df544d68b508af5da7f18e124

8 years agoSwitch init order of WellKnownClasses and NativeMethods
Yi Kong [Fri, 20 Nov 2015 16:00:31 +0000 (16:00 +0000)]
Switch init order of WellKnownClasses and NativeMethods

Native methods need to be loaded before initializing java.lang.Thread
class, make sure we do that first.

Bug: 25760806

(cherry picked from commit 321f0cdf07e09335cad13a96de35c28795880535)

Change-Id: I5f3f7819f660f9ce472a96a13201ab09950e92e3

8 years agoMerge "Optimizing/Thumb2: Improve load/store for large offsets." am: 97cd5bb34c am...
Vladimir Marko [Mon, 23 Nov 2015 10:24:30 +0000 (10:24 +0000)]
Merge "Optimizing/Thumb2: Improve load/store for large offsets." am: 97cd5bb34c am: 7d1e7e8dc4
am: 227216b0fc

* commit '227216b0fce1a276774fa93aee2a55c7db4d7f33':
  Optimizing/Thumb2: Improve load/store for large offsets.

8 years agoMerge "Optimizing/Thumb2: Improve load/store for large offsets." am: 97cd5bb34c
Vladimir Marko [Mon, 23 Nov 2015 10:21:27 +0000 (10:21 +0000)]
Merge "Optimizing/Thumb2: Improve load/store for large offsets." am: 97cd5bb34c
am: 7d1e7e8dc4

* commit '7d1e7e8dc4a829bef7786540cbc7aa09706bc90c':
  Optimizing/Thumb2: Improve load/store for large offsets.

8 years agoMerge "Optimizing/Thumb2: Improve load/store for large offsets."
Vladimir Marko [Mon, 23 Nov 2015 10:18:23 +0000 (10:18 +0000)]
Merge "Optimizing/Thumb2: Improve load/store for large offsets."
am: 97cd5bb34c

* commit '97cd5bb34ca97e7e87a030b2e1acec004fd26275':
  Optimizing/Thumb2: Improve load/store for large offsets.

8 years agoMerge "Optimizing/Thumb2: Improve load/store for large offsets."
Vladimir Marko [Mon, 23 Nov 2015 10:15:01 +0000 (10:15 +0000)]
Merge "Optimizing/Thumb2: Improve load/store for large offsets."

8 years agoMerge "Fix lint error." am: dde8b86949 am: b67e19ca71
Nicolas Geoffray [Mon, 23 Nov 2015 10:01:22 +0000 (10:01 +0000)]
Merge "Fix lint error." am: dde8b86949 am: b67e19ca71
am: 2f20bbfaa9

* commit '2f20bbfaa93166723b9db3b337523bc7207cc86f':
  Fix lint error.

8 years agoMerge "ART: Fix uninitialized variable" am: 911542ed69 am: f01e70d214
David Brazdil [Mon, 23 Nov 2015 10:01:15 +0000 (10:01 +0000)]
Merge "ART: Fix uninitialized variable" am: 911542ed69 am: f01e70d214
am: 476e44efeb

* commit '476e44efebeccbbeb4dcf477ba9156cb5d23fcf0':
  ART: Fix uninitialized variable

8 years agoMerge "Merge mnc-dr-enso-dev into goog/master"
Przemyslaw Szczepaniak [Mon, 23 Nov 2015 09:57:16 +0000 (09:57 +0000)]
Merge "Merge mnc-dr-enso-dev into goog/master"

8 years agoMerge "Fix lint error." am: dde8b86949
Nicolas Geoffray [Mon, 23 Nov 2015 09:57:00 +0000 (09:57 +0000)]
Merge "Fix lint error." am: dde8b86949
am: b67e19ca71

* commit 'b67e19ca717b94d032fefd1e391c5f8f6384b6f8':
  Fix lint error.

8 years agoMerge "ART: Fix uninitialized variable" am: 911542ed69
David Brazdil [Mon, 23 Nov 2015 09:56:53 +0000 (09:56 +0000)]
Merge "ART: Fix uninitialized variable" am: 911542ed69
am: f01e70d214

* commit 'f01e70d21414a14ff0d85565560289f207744e01':
  ART: Fix uninitialized variable

8 years agoMerge "Fix lint error."
Nicolas Geoffray [Mon, 23 Nov 2015 09:53:30 +0000 (09:53 +0000)]
Merge "Fix lint error."
am: dde8b86949

* commit 'dde8b8694954c0268eb12a7ccbddf07d9de262fd':
  Fix lint error.

8 years agoMerge "ART: Fix uninitialized variable"
David Brazdil [Mon, 23 Nov 2015 09:53:22 +0000 (09:53 +0000)]
Merge "ART: Fix uninitialized variable"
am: 911542ed69

* commit '911542ed69dbb8bc2fc1132c71261cc741b7afb3':
  ART: Fix uninitialized variable

8 years agoMerge "Fix lint error."
Nicolas Geoffray [Mon, 23 Nov 2015 09:51:01 +0000 (09:51 +0000)]
Merge "Fix lint error."

8 years agoMerge "ART: Fix uninitialized variable"
David Brazdil [Mon, 23 Nov 2015 09:50:29 +0000 (09:50 +0000)]
Merge "ART: Fix uninitialized variable"

8 years agoFix lint error.
Nicolas Geoffray [Mon, 23 Nov 2015 09:50:18 +0000 (09:50 +0000)]
Fix lint error.

Change-Id: I29632dc7e49f7ec63040455fa40fcf87e9282e5e

8 years agoART: Fix uninitialized variable
David Brazdil [Mon, 23 Nov 2015 09:44:52 +0000 (09:44 +0000)]
ART: Fix uninitialized variable

Change-Id: I906de334b3c3cb1e36eff4944457f4598b7c174f

8 years agoMerge "Simplify boolean condition compared to 0" am: 2171e2ab84 am: 0af5e3b30f
David Brazdil [Mon, 23 Nov 2015 09:25:55 +0000 (09:25 +0000)]
Merge "Simplify boolean condition compared to 0" am: 2171e2ab84 am: 0af5e3b30f
am: e4a2c1c1a6

* commit 'e4a2c1c1a63d05f10cf947b1f7c97835111fcb1b':
  Simplify boolean condition compared to 0

8 years agoMerge "Simplify boolean condition compared to 0" am: 2171e2ab84
David Brazdil [Mon, 23 Nov 2015 09:22:57 +0000 (09:22 +0000)]
Merge "Simplify boolean condition compared to 0" am: 2171e2ab84
am: 0af5e3b30f

* commit '0af5e3b30f2a118530c750943dd4de9b0a383aea':
  Simplify boolean condition compared to 0

8 years agoMerge "Simplify boolean condition compared to 0"
David Brazdil [Mon, 23 Nov 2015 09:19:25 +0000 (09:19 +0000)]
Merge "Simplify boolean condition compared to 0"
am: 2171e2ab84

* commit '2171e2ab84baa41770489d01df9197a3ce871262':
  Simplify boolean condition compared to 0

8 years agoMerge "Simplify boolean condition compared to 0"
David Brazdil [Mon, 23 Nov 2015 09:16:02 +0000 (09:16 +0000)]
Merge "Simplify boolean condition compared to 0"

8 years agoMerge "Revert "Add stats support for existing optimizations"" am: 5d78a0f808 am:...
Nicolas Geoffray [Mon, 23 Nov 2015 09:08:29 +0000 (09:08 +0000)]
Merge "Revert "Add stats support for existing optimizations"" am: 5d78a0f808 am: 05718eb6a9
am: 3da4fe0ac2

* commit '3da4fe0ac2c0b52ab2e14791f98ea3297432e63b':
  Revert "Add stats support for existing optimizations"

8 years agoMerge "Revert "Add stats support for existing optimizations"" am: 5d78a0f808
Nicolas Geoffray [Mon, 23 Nov 2015 09:05:26 +0000 (09:05 +0000)]
Merge "Revert "Add stats support for existing optimizations"" am: 5d78a0f808
am: 05718eb6a9

* commit '05718eb6a93a7525705ca5e823bdd8bea672582d':
  Revert "Add stats support for existing optimizations"

8 years agoMerge "Explicitly add HLoadClass/HClinitCheck for HNewInstance." am: 01b88a2c89 am...
Nicolas Geoffray [Mon, 23 Nov 2015 09:02:20 +0000 (09:02 +0000)]
Merge "Explicitly add HLoadClass/HClinitCheck for HNewInstance." am: 01b88a2c89 am: 43392ff9c6
am: 498121dfed

* commit '498121dfed54bb4be38d1ea302b38e55385ee1b4':
  Explicitly add HLoadClass/HClinitCheck for HNewInstance.

8 years agoMerge "Revert "Add stats support for existing optimizations""
Nicolas Geoffray [Mon, 23 Nov 2015 09:02:09 +0000 (09:02 +0000)]
Merge "Revert "Add stats support for existing optimizations""
am: 5d78a0f808

* commit '5d78a0f808b4bf65e7f42880b39f2d0f3942cee6':
  Revert "Add stats support for existing optimizations"

8 years agoMerge "Add stats support for existing optimizations" am: be0c2d9102 am: aeb99f91a1
Nicolas Geoffray [Mon, 23 Nov 2015 09:02:09 +0000 (09:02 +0000)]
Merge "Add stats support for existing optimizations" am: be0c2d9102 am: aeb99f91a1
am: f321ac3e9d

* commit 'f321ac3e9d866cc1897c743a56f3c66c4b8e4536':
  Add stats support for existing optimizations

8 years agoMerge "Revert "Add stats support for existing optimizations""
Nicolas Geoffray [Mon, 23 Nov 2015 08:59:29 +0000 (08:59 +0000)]
Merge "Revert "Add stats support for existing optimizations""

8 years agoRevert "Add stats support for existing optimizations"
Nicolas Geoffray [Mon, 23 Nov 2015 08:59:07 +0000 (08:59 +0000)]
Revert "Add stats support for existing optimizations"

Breaks the build. Please ensure your changes build.

This reverts commit 06241b1b07fb031b7d2cf55f4b78d3444d07cc2d.

Change-Id: I68b18f99a9882719bf6654d3313531a7965b8483

8 years agoMerge "Explicitly add HLoadClass/HClinitCheck for HNewInstance." am: 01b88a2c89
Nicolas Geoffray [Mon, 23 Nov 2015 08:58:58 +0000 (08:58 +0000)]
Merge "Explicitly add HLoadClass/HClinitCheck for HNewInstance." am: 01b88a2c89
am: 43392ff9c6

* commit '43392ff9c62fd106d087d28183b5be42ab1e2778':
  Explicitly add HLoadClass/HClinitCheck for HNewInstance.

8 years agoMerge "Add stats support for existing optimizations" am: be0c2d9102
Nicolas Geoffray [Mon, 23 Nov 2015 08:58:50 +0000 (08:58 +0000)]
Merge "Add stats support for existing optimizations" am: be0c2d9102
am: aeb99f91a1

* commit 'aeb99f91a1690d80df50d81b1a1548cc5d10a4fa':
  Add stats support for existing optimizations

8 years agoMerge "Explicitly add HLoadClass/HClinitCheck for HNewInstance."
Nicolas Geoffray [Mon, 23 Nov 2015 08:55:36 +0000 (08:55 +0000)]
Merge "Explicitly add HLoadClass/HClinitCheck for HNewInstance."
am: 01b88a2c89

* commit '01b88a2c8903954ca72067bab93471b2c6aca135':
  Explicitly add HLoadClass/HClinitCheck for HNewInstance.

8 years agoMerge "Add stats support for existing optimizations"
Nicolas Geoffray [Mon, 23 Nov 2015 08:55:27 +0000 (08:55 +0000)]
Merge "Add stats support for existing optimizations"
am: be0c2d9102

* commit 'be0c2d91027929682fa754ae21943f52b4e111b7':
  Add stats support for existing optimizations

8 years agoMerge "Explicitly add HLoadClass/HClinitCheck for HNewInstance."
Nicolas Geoffray [Mon, 23 Nov 2015 08:51:44 +0000 (08:51 +0000)]
Merge "Explicitly add HLoadClass/HClinitCheck for HNewInstance."

8 years agoMerge "Add stats support for existing optimizations"
Nicolas Geoffray [Mon, 23 Nov 2015 08:51:21 +0000 (08:51 +0000)]
Merge "Add stats support for existing optimizations"

8 years agoAdd stats support for existing optimizations
Jean-Philippe Halimi [Thu, 3 Sep 2015 15:28:38 +0000 (17:28 +0200)]
Add stats support for existing optimizations

This patch adds support for the --dump-stats facility with existing
optimizations.

Change-Id: I68751b119a030952a11057cb651a3c63e87e73ea
Signed-off-by: Jean-Philippe Halimi <jean-philippe.halimi@intel.com>
8 years agoMIPS64: Support short and long branches
Alexey Frunze [Fri, 25 Sep 2015 05:57:20 +0000 (22:57 -0700)]
MIPS64: Support short and long branches

Change-Id: I618c960bd211048166d9fde78d4106bd3ca42b3a