OSDN Git Service

android-x86/art.git
8 years agoPerform write barrier on declaring class when adding instrumentation
Mathieu Chartier [Fri, 2 Oct 2015 20:08:39 +0000 (13:08 -0700)]
Perform write barrier on declaring class when adding instrumentation

Since the instrumentation is marked from the declaring class we need
to mark the card so that mod-union tables and card rescanning know
about the update.

This fixes some moving GC crashes on eng builds.

Bug: 24133607

Change-Id: I66de3e3e5e1e4d2d91a041e2fbc37b93c5091b12

8 years agoam 276795ea: am a6fa1724: am 42888b28: Merge "Change DecodeWeakGlobal to DecodeJObjec...
Mathieu Chartier [Fri, 2 Oct 2015 16:57:34 +0000 (16:57 +0000)]
am 276795ea: am a6fa1724: am 42888b28: Merge "Change DecodeWeakGlobal to DecodeJObject for class unloading"

* commit '276795eac60c1e4055138bad08100b11876a1d12':
  Change DecodeWeakGlobal to DecodeJObject for class unloading

8 years agoam a6fa1724: am 42888b28: Merge "Change DecodeWeakGlobal to DecodeJObject for class...
Mathieu Chartier [Fri, 2 Oct 2015 16:51:46 +0000 (16:51 +0000)]
am a6fa1724: am 42888b28: Merge "Change DecodeWeakGlobal to DecodeJObject for class unloading"

* commit 'a6fa1724f4ac9d34f5b97b9ebfdbc9314b0a3a42':
  Change DecodeWeakGlobal to DecodeJObject for class unloading

8 years agoam 42888b28: Merge "Change DecodeWeakGlobal to DecodeJObject for class unloading"
Mathieu Chartier [Fri, 2 Oct 2015 16:45:51 +0000 (16:45 +0000)]
am 42888b28: Merge "Change DecodeWeakGlobal to DecodeJObject for class unloading"

* commit '42888b28d2a0f112187c906296d4b28674c8bee2':
  Change DecodeWeakGlobal to DecodeJObject for class unloading

8 years agoMerge "Change DecodeWeakGlobal to DecodeJObject for class unloading"
Mathieu Chartier [Fri, 2 Oct 2015 16:40:06 +0000 (16:40 +0000)]
Merge "Change DecodeWeakGlobal to DecodeJObject for class unloading"

8 years agoam a2f82730: am 0c4d22c7: am edbff6f5: Merge "ART: Use an iterative way in DoDFSPreOr...
Vladimir Marko [Fri, 2 Oct 2015 16:20:55 +0000 (16:20 +0000)]
am a2f82730: am 0c4d22c7: am edbff6f5: Merge "ART: Use an iterative way in DoDFSPreOrderSSARename()"

* commit 'a2f82730fa9d2613f92fd08be8096e0285dd82af':
  ART: Use an iterative way in DoDFSPreOrderSSARename()

8 years agoam 0c4d22c7: am edbff6f5: Merge "ART: Use an iterative way in DoDFSPreOrderSSARename()"
Vladimir Marko [Fri, 2 Oct 2015 16:14:47 +0000 (16:14 +0000)]
am 0c4d22c7: am edbff6f5: Merge "ART: Use an iterative way in DoDFSPreOrderSSARename()"

* commit '0c4d22c7dbdb8e0a128cb45df97118ee18b34da6':
  ART: Use an iterative way in DoDFSPreOrderSSARename()

8 years agoam edbff6f5: Merge "ART: Use an iterative way in DoDFSPreOrderSSARename()"
Vladimir Marko [Fri, 2 Oct 2015 16:09:57 +0000 (16:09 +0000)]
am edbff6f5: Merge "ART: Use an iterative way in DoDFSPreOrderSSARename()"

* commit 'edbff6f51abc2bfb43be78b9a1beaa382c498a1f':
  ART: Use an iterative way in DoDFSPreOrderSSARename()

8 years agoMerge "ART: Use an iterative way in DoDFSPreOrderSSARename()"
Vladimir Marko [Fri, 2 Oct 2015 16:03:24 +0000 (16:03 +0000)]
Merge "ART: Use an iterative way in DoDFSPreOrderSSARename()"

8 years agoam d1f3e505: am a5d3769c: am acd70887: Merge "KNOWN_BROKEN/FAILING does not work...
Nicolas Geoffray [Fri, 2 Oct 2015 15:30:18 +0000 (15:30 +0000)]
am d1f3e505: am a5d3769c: am acd70887: Merge "KNOWN_BROKEN/FAILING does not work for gtests."

* commit 'd1f3e505b1fd95c2ad3373584de0245bd43f4a32':
  KNOWN_BROKEN/FAILING does not work for gtests.

8 years agoam a5d3769c: am acd70887: Merge "KNOWN_BROKEN/FAILING does not work for gtests."
Nicolas Geoffray [Fri, 2 Oct 2015 15:25:26 +0000 (15:25 +0000)]
am a5d3769c: am acd70887: Merge "KNOWN_BROKEN/FAILING does not work for gtests."

* commit 'a5d3769c189ca1eabe950656c3ebc9078e2024b7':
  KNOWN_BROKEN/FAILING does not work for gtests.

8 years agoam acd70887: Merge "KNOWN_BROKEN/FAILING does not work for gtests."
Nicolas Geoffray [Fri, 2 Oct 2015 15:18:37 +0000 (15:18 +0000)]
am acd70887: Merge "KNOWN_BROKEN/FAILING does not work for gtests."

* commit 'acd7088735d8299c90c1e480be146c71adcd8d08':
  KNOWN_BROKEN/FAILING does not work for gtests.

8 years agoMerge "KNOWN_BROKEN/FAILING does not work for gtests."
Nicolas Geoffray [Fri, 2 Oct 2015 15:15:47 +0000 (15:15 +0000)]
Merge "KNOWN_BROKEN/FAILING does not work for gtests."

8 years agoKNOWN_BROKEN/FAILING does not work for gtests.
Nicolas Geoffray [Fri, 2 Oct 2015 13:41:18 +0000 (14:41 +0100)]
KNOWN_BROKEN/FAILING does not work for gtests.

Instead disable the test in the gtest file.

Change-Id: Iede5de7ca572c9454437981a5fa63cda444d0497

8 years agoam 7a4c82ba: am 07030460: am cc245eab: Merge "Fix lint error."
Nicolas Geoffray [Fri, 2 Oct 2015 11:51:52 +0000 (11:51 +0000)]
am 7a4c82ba: am 07030460: am cc245eab: Merge "Fix lint error."

* commit '7a4c82ba37a60e19cef0478f1fb81282d9bd2ac5':
  Fix lint error.

8 years agoam 07030460: am cc245eab: Merge "Fix lint error."
Nicolas Geoffray [Fri, 2 Oct 2015 11:46:08 +0000 (11:46 +0000)]
am 07030460: am cc245eab: Merge "Fix lint error."

* commit '070304601253200c0686b1fe93df4c7bcb954892':
  Fix lint error.

8 years agoam cc245eab: Merge "Fix lint error."
Nicolas Geoffray [Fri, 2 Oct 2015 11:42:41 +0000 (11:42 +0000)]
am cc245eab: Merge "Fix lint error."

* commit 'cc245eab2148547f9df37ddc5f767656dc033b81':
  Fix lint error.

8 years agoMerge "Fix lint error."
Nicolas Geoffray [Fri, 2 Oct 2015 11:39:37 +0000 (11:39 +0000)]
Merge "Fix lint error."

8 years agoFix lint error.
Nicolas Geoffray [Fri, 2 Oct 2015 11:38:40 +0000 (12:38 +0100)]
Fix lint error.

Change-Id: Icb10d23bdac6881b48d2025cac76dc130aefbf73

8 years agoam 4d424403: am 0defe0d5: am 00f24284: Merge "Test fails on mips."
Nicolas Geoffray [Fri, 2 Oct 2015 10:53:19 +0000 (10:53 +0000)]
am 4d424403: am 0defe0d5: am 00f24284: Merge "Test fails on mips."

* commit '4d4244037009101fb52f99350c245231a56fdfe7':
  Test fails on mips.

8 years agoam 85310c26: am 99240eff: am d0abb395: Merge "Do more inlining when JITting."
Nicolas Geoffray [Fri, 2 Oct 2015 10:53:17 +0000 (10:53 +0000)]
am 85310c26: am 99240eff: am d0abb395: Merge "Do more inlining when JITting."

* commit '85310c265aa954d0fd96ce81ae762e9901aec503':
  Do more inlining when JITting.

8 years agoam 0defe0d5: am 00f24284: Merge "Test fails on mips."
Nicolas Geoffray [Fri, 2 Oct 2015 10:45:06 +0000 (10:45 +0000)]
am 0defe0d5: am 00f24284: Merge "Test fails on mips."

* commit '0defe0d5251d1f950acdca8b554747adb42d0970':
  Test fails on mips.

8 years agoam 99240eff: am d0abb395: Merge "Do more inlining when JITting."
Nicolas Geoffray [Fri, 2 Oct 2015 10:45:04 +0000 (10:45 +0000)]
am 99240eff: am d0abb395: Merge "Do more inlining when JITting."

* commit '99240effd42280db003c9c9325128c7b3ada4660':
  Do more inlining when JITting.

8 years agoam 00f24284: Merge "Test fails on mips."
Nicolas Geoffray [Fri, 2 Oct 2015 10:40:45 +0000 (10:40 +0000)]
am 00f24284: Merge "Test fails on mips."

* commit '00f24284fd4bd12a7fc1865da4984dd6a7c71a94':
  Test fails on mips.

8 years agoam d0abb395: Merge "Do more inlining when JITting."
Nicolas Geoffray [Fri, 2 Oct 2015 10:40:43 +0000 (10:40 +0000)]
am d0abb395: Merge "Do more inlining when JITting."

* commit 'd0abb39540aa85306647801ef75fcc5c35fab69a':
  Do more inlining when JITting.

8 years agoMerge "Test fails on mips."
Nicolas Geoffray [Fri, 2 Oct 2015 10:36:22 +0000 (10:36 +0000)]
Merge "Test fails on mips."

8 years agoMerge "Do more inlining when JITting."
Nicolas Geoffray [Fri, 2 Oct 2015 10:34:17 +0000 (10:34 +0000)]
Merge "Do more inlining when JITting."

8 years agoTest fails on mips.
Nicolas Geoffray [Fri, 2 Oct 2015 09:39:55 +0000 (10:39 +0100)]
Test fails on mips.

bug:24596015
Change-Id: Iad6ab18b287b398af82b6a0574cb74204619755d

8 years agoam d20e2313: am 8d960687: am 230033ba: Merge "Don\'t force the boot image to using...
Nicolas Geoffray [Fri, 2 Oct 2015 09:11:50 +0000 (09:11 +0000)]
am d20e2313: am 8d960687: am 230033ba: Merge "Don\'t force the boot image to using quick."

* commit 'd20e23133801dd1a6786be37855a8f60e0c4e2c0':
  Don't force the boot image to using quick.

8 years agoam 8d960687: am 230033ba: Merge "Don\'t force the boot image to using quick."
Nicolas Geoffray [Fri, 2 Oct 2015 09:05:36 +0000 (09:05 +0000)]
am 8d960687: am 230033ba: Merge "Don\'t force the boot image to using quick."

* commit '8d960687dc5c5d8474450068afe7b64ffef3d3db':
  Don't force the boot image to using quick.

8 years agoam 230033ba: Merge "Don\'t force the boot image to using quick."
Nicolas Geoffray [Fri, 2 Oct 2015 09:00:46 +0000 (09:00 +0000)]
am 230033ba: Merge "Don\'t force the boot image to using quick."

* commit '230033ba185ef83f7be84a4839d4d2e195ab50f4':
  Don't force the boot image to using quick.

8 years agoDo more inlining when JITting.
Nicolas Geoffray [Thu, 1 Oct 2015 13:34:20 +0000 (14:34 +0100)]
Do more inlining when JITting.

We now check the verification status of the class.

This triggered a bug when an inlined method was not compiled
(typically in a JIT configuration), and the path for deopting in
StackVisitor was using the wrong ArtMethod in order to know the
compiler that compiled the current frame.

Change-Id: I81d3ca0cf5cd3864b83b63dd954c58e1f2adaad4

8 years agoMerge "Don't force the boot image to using quick."
Nicolas Geoffray [Fri, 2 Oct 2015 08:01:09 +0000 (08:01 +0000)]
Merge "Don't force the boot image to using quick."

8 years agoam e3675b81: am 4e7e84fe: am 1604cb97: Merge "Fix x86_64 gtest."
Calin Juravle [Fri, 2 Oct 2015 06:56:13 +0000 (06:56 +0000)]
am e3675b81: am 4e7e84fe: am 1604cb97: Merge "Fix x86_64 gtest."

* commit 'e3675b81f63bc2b29679a0ea01c4a6bf35ce0867':
  Fix x86_64 gtest.

8 years agoam 4e7e84fe: am 1604cb97: Merge "Fix x86_64 gtest."
Calin Juravle [Fri, 2 Oct 2015 06:52:02 +0000 (06:52 +0000)]
am 4e7e84fe: am 1604cb97: Merge "Fix x86_64 gtest."

* commit '4e7e84fe4816805caf65381cec11585381abd9bc':
  Fix x86_64 gtest.

8 years agoam 1604cb97: Merge "Fix x86_64 gtest."
Calin Juravle [Fri, 2 Oct 2015 06:45:04 +0000 (06:45 +0000)]
am 1604cb97: Merge "Fix x86_64 gtest."

* commit '1604cb973e96ede4af275e676f0f35af46641f03':
  Fix x86_64 gtest.

8 years agoMerge "Fix x86_64 gtest."
Calin Juravle [Fri, 2 Oct 2015 06:40:57 +0000 (06:40 +0000)]
Merge "Fix x86_64 gtest."

8 years agoFix x86_64 gtest.
Calin Juravle [Fri, 2 Oct 2015 06:27:51 +0000 (07:27 +0100)]
Fix x86_64 gtest.

Calling convention for setting a 64bit field changed.
The CL fixes the test for x86_64 and disable it for other arches.

Change-Id: Iea3df0965f65b10c59ed975f91ca8069fde6e13c

8 years agoam 0e9f42c4: am 84fdbd74: am 77189602: Merge "Enable compilation of members with...
Calin Juravle [Fri, 2 Oct 2015 02:09:55 +0000 (02:09 +0000)]
am 0e9f42c4: am 84fdbd74: am 77189602: Merge "Enable compilation of members with access check failures."

* commit '0e9f42c40570e887866b3b7b50eeccf3002e174b':
  Enable compilation of members with access check failures.

8 years agoam db9c6b36: am 92db65c1: am 487e7b3a: Merge "Revert "Revert "Support unresolved...
Calin Juravle [Fri, 2 Oct 2015 02:09:53 +0000 (02:09 +0000)]
am db9c6b36: am 92db65c1: am 487e7b3a: Merge "Revert "Revert "Support unresolved fields in optimizing""

* commit 'db9c6b36e8c1688590c73a270c535623b8dbdc1a':
  Revert "Revert "Support unresolved fields in optimizing"

8 years agoam 84fdbd74: am 77189602: Merge "Enable compilation of members with access check...
Calin Juravle [Fri, 2 Oct 2015 02:02:52 +0000 (02:02 +0000)]
am 84fdbd74: am 77189602: Merge "Enable compilation of members with access check failures."

* commit '84fdbd74586478ae0dfcaa5f4cf2554a12a49810':
  Enable compilation of members with access check failures.

8 years agoam 92db65c1: am 487e7b3a: Merge "Revert "Revert "Support unresolved fields in optimiz...
Calin Juravle [Fri, 2 Oct 2015 02:02:50 +0000 (02:02 +0000)]
am 92db65c1: am 487e7b3a: Merge "Revert "Revert "Support unresolved fields in optimizing""

* commit '92db65c19545bb56571ec8bdcd51430f264fb7ac':
  Revert "Revert "Support unresolved fields in optimizing"

8 years agoam 77189602: Merge "Enable compilation of members with access check failures."
Calin Juravle [Fri, 2 Oct 2015 01:56:39 +0000 (01:56 +0000)]
am 77189602: Merge "Enable compilation of members with access check failures."

* commit '77189602d7bd291a7de87967b87b9b5a9b2eb68a':
  Enable compilation of members with access check failures.

8 years agoam 487e7b3a: Merge "Revert "Revert "Support unresolved fields in optimizing""
Calin Juravle [Fri, 2 Oct 2015 01:56:37 +0000 (01:56 +0000)]
am 487e7b3a: Merge "Revert "Revert "Support unresolved fields in optimizing""

* commit '487e7b3aca83d6e7d52f86b73eaa359f23993fcb':
  Revert "Revert "Support unresolved fields in optimizing"

8 years agoMerge "Enable compilation of members with access check failures."
Calin Juravle [Fri, 2 Oct 2015 01:53:08 +0000 (01:53 +0000)]
Merge "Enable compilation of members with access check failures."

8 years agoMerge "Revert "Revert "Support unresolved fields in optimizing""
Calin Juravle [Fri, 2 Oct 2015 01:52:46 +0000 (01:52 +0000)]
Merge "Revert "Revert "Support unresolved fields in optimizing""

8 years agoam 22dc235a: am 96d6adb1: am 2a09e92a: Merge "Make SetStateUnsafe run checkpoints...
Mathieu Chartier [Fri, 2 Oct 2015 01:43:00 +0000 (01:43 +0000)]
am 22dc235a: am 96d6adb1: am 2a09e92a: Merge "Make SetStateUnsafe run checkpoints before going to suspended"

* commit '22dc235a12192e60a7aba7ae871e6b7eab4501f3':
  Make SetStateUnsafe run checkpoints before going to suspended

8 years agoam 96d6adb1: am 2a09e92a: Merge "Make SetStateUnsafe run checkpoints before going...
Mathieu Chartier [Fri, 2 Oct 2015 01:36:29 +0000 (01:36 +0000)]
am 96d6adb1: am 2a09e92a: Merge "Make SetStateUnsafe run checkpoints before going to suspended"

* commit '96d6adb12439327d33099c24189ccff138af3c47':
  Make SetStateUnsafe run checkpoints before going to suspended

8 years agoam 7dbc4abc: am b3419d86: am c448024b: Merge "Improvements for table lookup read...
Hiroshi Yamauchi [Fri, 2 Oct 2015 01:31:48 +0000 (01:31 +0000)]
am 7dbc4abc: am b3419d86: am c448024b: Merge "Improvements for table lookup read barriers."

* commit '7dbc4abc7256023b8cf1ef7d82032a46a082d835':
  Improvements for table lookup read barriers.

8 years agoam 348b1588: am 1213fb1c: am 25217af2: Merge "Add more error printing to TransitionFr...
Mathieu Chartier [Fri, 2 Oct 2015 01:31:36 +0000 (01:31 +0000)]
am 348b1588: am 1213fb1c: am 25217af2: Merge "Add more error printing to TransitionFromSuspendedToRunnable"

* commit '348b15882ab4fb65609fcf96d78b0ea465e8cd29':
  Add more error printing to TransitionFromSuspendedToRunnable

8 years agoam 914506b0: am e2ef7b50: am 506b08cb: Merge "Revert "Revert "ART: Remove unnecessary...
Andreas Gampe [Fri, 2 Oct 2015 01:31:34 +0000 (01:31 +0000)]
am 914506b0: am e2ef7b50: am 506b08cb: Merge "Revert "Revert "ART: Remove unnecessary SHARED_REQUIRES in ArtMethod"""

* commit '914506b03d07b659c297f6265d88d1a35f345c0d':
  Revert "Revert "ART: Remove unnecessary SHARED_REQUIRES in ArtMethod""

8 years agoam 2a09e92a: Merge "Make SetStateUnsafe run checkpoints before going to suspended"
Mathieu Chartier [Fri, 2 Oct 2015 01:29:16 +0000 (01:29 +0000)]
am 2a09e92a: Merge "Make SetStateUnsafe run checkpoints before going to suspended"

* commit '2a09e92a87ff788479ba481b3b216609424aabdc':
  Make SetStateUnsafe run checkpoints before going to suspended

8 years agoEnable compilation of members with access check failures.
Calin Juravle [Thu, 17 Sep 2015 13:15:12 +0000 (14:15 +0100)]
Enable compilation of members with access check failures.

Change-Id: I0de73099b53612072c3e6f1235c22f96339fe440

8 years agoRevert "Revert "Support unresolved fields in optimizing"
Calin Juravle [Tue, 29 Sep 2015 03:52:17 +0000 (04:52 +0100)]
Revert "Revert "Support unresolved fields in optimizing"

The CL also changes the calling convetion for 64bit static field set
to use kArg2 instead of kArg1. This allows optimizing to keep
the asumptions:
- arm pairs are always of form (even_reg, odd_reg)
- ecx_edx is not used as a register on x86.

This reverts commit e6f49b47b6a4dc9c7684e4483757872cfc7ff1a1.

Change-Id: I93159917565824084abc96775f31be1a4249f2f3

8 years agoMerge "Make SetStateUnsafe run checkpoints before going to suspended"
Mathieu Chartier [Fri, 2 Oct 2015 01:23:04 +0000 (01:23 +0000)]
Merge "Make SetStateUnsafe run checkpoints before going to suspended"

8 years agoam b3419d86: am c448024b: Merge "Improvements for table lookup read barriers."
Hiroshi Yamauchi [Fri, 2 Oct 2015 01:11:42 +0000 (01:11 +0000)]
am b3419d86: am c448024b: Merge "Improvements for table lookup read barriers."

* commit 'b3419d8658b1a089e2ef0c51e51ec532995dccf8':
  Improvements for table lookup read barriers.

8 years agoMake SetStateUnsafe run checkpoints before going to suspended
Mathieu Chartier [Thu, 1 Oct 2015 22:58:41 +0000 (15:58 -0700)]
Make SetStateUnsafe run checkpoints before going to suspended

This prevents cases where we can get a checkpoint request in runnable
and then unsafe set to suspended. This was bad behavior since the
checkpoint may not be run in a timely manner.

Bug: 24191051
Change-Id: I73605c1a1154f67699f3902141f3232ab064793f

8 years agoam c448024b: Merge "Improvements for table lookup read barriers."
Hiroshi Yamauchi [Fri, 2 Oct 2015 01:05:15 +0000 (01:05 +0000)]
am c448024b: Merge "Improvements for table lookup read barriers."

* commit 'c448024b005bb2debb851f4de1b7fb5e544c3a80':
  Improvements for table lookup read barriers.

8 years agoMerge "Improvements for table lookup read barriers."
Hiroshi Yamauchi [Fri, 2 Oct 2015 01:01:25 +0000 (01:01 +0000)]
Merge "Improvements for table lookup read barriers."

8 years agoImprovements for table lookup read barriers.
Hiroshi Yamauchi [Thu, 1 Oct 2015 03:12:11 +0000 (20:12 -0700)]
Improvements for table lookup read barriers.

- Implement fast paths for the GC root read barrier routines.
- Avoid unnecessary CAS operations.

Bug: 12687968
Change-Id: Iceef44e253062af5bf2295a521a9c64403deafe1

8 years agoChange DecodeWeakGlobal to DecodeJObject for class unloading
Mathieu Chartier [Fri, 2 Oct 2015 00:08:44 +0000 (17:08 -0700)]
Change DecodeWeakGlobal to DecodeJObject for class unloading

DecodeWeakGlobal returns the sentinel object for cleared JNI weak
globals. This was causing a memory leak since it wouldn't delete
class tables and linear allocs due to never returning null. The bug
was found by yamauchi.

Bug: 22720414

Change-Id: Iff4681495232b9a9756dbdb51d10ea72691a85dd

8 years agoam 1213fb1c: am 25217af2: Merge "Add more error printing to TransitionFromSuspendedTo...
Mathieu Chartier [Thu, 1 Oct 2015 23:00:05 +0000 (23:00 +0000)]
am 1213fb1c: am 25217af2: Merge "Add more error printing to TransitionFromSuspendedToRunnable"

* commit '1213fb1c80ce6088e9bae84120ffd5469828628f':
  Add more error printing to TransitionFromSuspendedToRunnable

8 years agoam e2ef7b50: am 506b08cb: Merge "Revert "Revert "ART: Remove unnecessary SHARED_REQUI...
Andreas Gampe [Thu, 1 Oct 2015 22:59:55 +0000 (22:59 +0000)]
am e2ef7b50: am 506b08cb: Merge "Revert "Revert "ART: Remove unnecessary SHARED_REQUIRES in ArtMethod"""

* commit 'e2ef7b5043acea15c5fca36e8419030d4da41231':
  Revert "Revert "ART: Remove unnecessary SHARED_REQUIRES in ArtMethod""

8 years agoam 25217af2: Merge "Add more error printing to TransitionFromSuspendedToRunnable"
Mathieu Chartier [Thu, 1 Oct 2015 22:16:26 +0000 (22:16 +0000)]
am 25217af2: Merge "Add more error printing to TransitionFromSuspendedToRunnable"

* commit '25217af2a7cae96b32ba566aaf697288f3374c99':
  Add more error printing to TransitionFromSuspendedToRunnable

8 years agoam 506b08cb: Merge "Revert "Revert "ART: Remove unnecessary SHARED_REQUIRES in ArtMet...
Andreas Gampe [Thu, 1 Oct 2015 22:11:39 +0000 (22:11 +0000)]
am 506b08cb: Merge "Revert "Revert "ART: Remove unnecessary SHARED_REQUIRES in ArtMethod"""

* commit '506b08cbd5e44bedc32f31ea74ddcc921c98ec99':
  Revert "Revert "ART: Remove unnecessary SHARED_REQUIRES in ArtMethod""

8 years agoMerge "Add more error printing to TransitionFromSuspendedToRunnable"
Mathieu Chartier [Thu, 1 Oct 2015 22:08:56 +0000 (22:08 +0000)]
Merge "Add more error printing to TransitionFromSuspendedToRunnable"

8 years agoMerge "Revert "Revert "ART: Remove unnecessary SHARED_REQUIRES in ArtMethod"""
Andreas Gampe [Thu, 1 Oct 2015 22:05:49 +0000 (22:05 +0000)]
Merge "Revert "Revert "ART: Remove unnecessary SHARED_REQUIRES in ArtMethod"""

8 years agoAdd more error printing to TransitionFromSuspendedToRunnable
Mathieu Chartier [Thu, 1 Oct 2015 21:46:29 +0000 (14:46 -0700)]
Add more error printing to TransitionFromSuspendedToRunnable

Bug: 24191051
Change-Id: I5c66ba5c76bf86e8d603110989b9da883ca4ca65

8 years agoam f2c79ce6: am de6e73d8: am 9b29f3ef: Merge "MIPS64: Implement intrinsic java.lang...
Andreas Gampe [Thu, 1 Oct 2015 21:22:29 +0000 (21:22 +0000)]
am f2c79ce6: am de6e73d8: am 9b29f3ef: Merge "MIPS64: Implement intrinsic java.lang.Thread.currentThread()"

* commit 'f2c79ce69d39f7f65132050ca18fea45e4b841c3':
  MIPS64: Implement intrinsic java.lang.Thread.currentThread()

8 years agoam de6e73d8: am 9b29f3ef: Merge "MIPS64: Implement intrinsic java.lang.Thread.current...
Andreas Gampe [Thu, 1 Oct 2015 21:13:42 +0000 (21:13 +0000)]
am de6e73d8: am 9b29f3ef: Merge "MIPS64: Implement intrinsic java.lang.Thread.currentThread()"

* commit 'de6e73d8068d4614e5406d212efc9cb43cbda6cd':
  MIPS64: Implement intrinsic java.lang.Thread.currentThread()

8 years agoam 9b29f3ef: Merge "MIPS64: Implement intrinsic java.lang.Thread.currentThread()"
Andreas Gampe [Thu, 1 Oct 2015 21:05:46 +0000 (21:05 +0000)]
am 9b29f3ef: Merge "MIPS64: Implement intrinsic java.lang.Thread.currentThread()"

* commit '9b29f3ef7df18c84d922634709e38a1913709ad7':
  MIPS64: Implement intrinsic java.lang.Thread.currentThread()

8 years agoMerge "MIPS64: Implement intrinsic java.lang.Thread.currentThread()"
Andreas Gampe [Thu, 1 Oct 2015 20:29:43 +0000 (20:29 +0000)]
Merge "MIPS64: Implement intrinsic java.lang.Thread.currentThread()"

8 years agoam 3434a77f: am a7c8f538: am 8446ed41: Merge "Fix another poisoning problem."
Nicolas Geoffray [Thu, 1 Oct 2015 18:18:04 +0000 (18:18 +0000)]
am 3434a77f: am a7c8f538: am 8446ed41: Merge "Fix another poisoning problem."

* commit '3434a77f170bd1a5424ca02775de8c4fac996584':
  Fix another poisoning problem.

8 years agoam a7c8f538: am 8446ed41: Merge "Fix another poisoning problem."
Nicolas Geoffray [Thu, 1 Oct 2015 18:10:45 +0000 (18:10 +0000)]
am a7c8f538: am 8446ed41: Merge "Fix another poisoning problem."

* commit 'a7c8f538824ff710cb5dbb4fc8ba0df07178c878':
  Fix another poisoning problem.

8 years agoam 8446ed41: Merge "Fix another poisoning problem."
Nicolas Geoffray [Thu, 1 Oct 2015 18:05:43 +0000 (18:05 +0000)]
am 8446ed41: Merge "Fix another poisoning problem."

* commit '8446ed412d3a4ca2c70737d6f40c4129b0ee8ab1':
  Fix another poisoning problem.

8 years agoMerge "Fix another poisoning problem."
Nicolas Geoffray [Thu, 1 Oct 2015 17:41:27 +0000 (17:41 +0000)]
Merge "Fix another poisoning problem."

8 years agoFix another poisoning problem.
Nicolas Geoffray [Thu, 1 Oct 2015 14:50:27 +0000 (15:50 +0100)]
Fix another poisoning problem.

We were using the wrong temp.

Change-Id: Id79d5079cc85f61eb1a45d741a67f24d33e8fa03

8 years agoam b46ccc28: am 851dce75: am b3577f0a: Merge "ART: Fix a static_cast int32_t -> uint6...
David Brazdil [Thu, 1 Oct 2015 14:36:08 +0000 (14:36 +0000)]
am b46ccc28: am 851dce75: am b3577f0a: Merge "ART: Fix a static_cast int32_t -> uint64_t bug."

* commit 'b46ccc28852e0fabba23767b075f4a14db5a8698':
  ART: Fix a static_cast int32_t -> uint64_t bug.

8 years agoam 851dce75: am b3577f0a: Merge "ART: Fix a static_cast int32_t -> uint64_t bug."
David Brazdil [Thu, 1 Oct 2015 14:29:02 +0000 (14:29 +0000)]
am 851dce75: am b3577f0a: Merge "ART: Fix a static_cast int32_t -> uint64_t bug."

* commit '851dce7576549176f610037be65ab94d4b8202ea':
  ART: Fix a static_cast int32_t -> uint64_t bug.

8 years agoam b3577f0a: Merge "ART: Fix a static_cast int32_t -> uint64_t bug."
David Brazdil [Thu, 1 Oct 2015 14:22:19 +0000 (14:22 +0000)]
am b3577f0a: Merge "ART: Fix a static_cast int32_t -> uint64_t bug."

* commit 'b3577f0ab8f1765d3554f575d99adbc65bfaf1b6':
  ART: Fix a static_cast int32_t -> uint64_t bug.

8 years agoMerge "ART: Fix a static_cast int32_t -> uint64_t bug."
David Brazdil [Thu, 1 Oct 2015 14:16:40 +0000 (14:16 +0000)]
Merge "ART: Fix a static_cast int32_t -> uint64_t bug."

8 years agoART: Fix a static_cast int32_t -> uint64_t bug.
David Brazdil [Thu, 1 Oct 2015 13:32:56 +0000 (14:32 +0100)]
ART: Fix a static_cast int32_t -> uint64_t bug.

HConstant::GetValueAsUint64 is used by SsaChecker to verify that
equivalent phis are created only for untyped constants. The test
would fail because a static_cast would sign extend the value of the
IntConstant.

Bug: 24561315
Change-Id: I818ce6a2080994a7c4395d084c1df7fd615a246d

8 years agoam 334fc657: am fc1b34b0: am 9664c089: Merge "CUSTOM_TARGET_LINKER is set by the...
Nicolas Geoffray [Thu, 1 Oct 2015 11:30:26 +0000 (11:30 +0000)]
am 334fc657: am fc1b34b0: am 9664c089: Merge "CUSTOM_TARGET_LINKER is set by the buildbot already."

* commit '334fc6579fdef166cd3d5e4850c0e3d9f3a6bc16':
  CUSTOM_TARGET_LINKER is set by the buildbot already.

8 years agoam f74632bb: am fe9b010e: am 47b1416f: Merge "Fix poisoining bug in arm64."
Nicolas Geoffray [Thu, 1 Oct 2015 11:30:24 +0000 (11:30 +0000)]
am f74632bb: am fe9b010e: am 47b1416f: Merge "Fix poisoining bug in arm64."

* commit 'f74632bbacc85219a17c244f9a7dca5708be8053':
  Fix poisoining bug in arm64.

8 years agoam fc1b34b0: am 9664c089: Merge "CUSTOM_TARGET_LINKER is set by the buildbot already."
Nicolas Geoffray [Thu, 1 Oct 2015 10:58:20 +0000 (10:58 +0000)]
am fc1b34b0: am 9664c089: Merge "CUSTOM_TARGET_LINKER is set by the buildbot already."

* commit 'fc1b34b0dd2a6982992528ee0823e4030e108daa':
  CUSTOM_TARGET_LINKER is set by the buildbot already.

8 years agoam 9664c089: Merge "CUSTOM_TARGET_LINKER is set by the buildbot already."
Nicolas Geoffray [Thu, 1 Oct 2015 10:52:12 +0000 (10:52 +0000)]
am 9664c089: Merge "CUSTOM_TARGET_LINKER is set by the buildbot already."

* commit '9664c08964c7db92151335023c6ea595f75f4033':
  CUSTOM_TARGET_LINKER is set by the buildbot already.

8 years agoam fe9b010e: am 47b1416f: Merge "Fix poisoining bug in arm64."
Nicolas Geoffray [Thu, 1 Oct 2015 10:48:09 +0000 (10:48 +0000)]
am fe9b010e: am 47b1416f: Merge "Fix poisoining bug in arm64."

* commit 'fe9b010e49d8cc1bd45f2838845dff0f1c31aa79':
  Fix poisoining bug in arm64.

8 years agoMerge "CUSTOM_TARGET_LINKER is set by the buildbot already."
Nicolas Geoffray [Thu, 1 Oct 2015 10:47:57 +0000 (10:47 +0000)]
Merge "CUSTOM_TARGET_LINKER is set by the buildbot already."

8 years agoam 47b1416f: Merge "Fix poisoining bug in arm64."
Nicolas Geoffray [Thu, 1 Oct 2015 10:43:53 +0000 (10:43 +0000)]
am 47b1416f: Merge "Fix poisoining bug in arm64."

* commit '47b1416fdef714ac427db3728b5e05215bd5df0a':
  Fix poisoining bug in arm64.

8 years agoMerge "Fix poisoining bug in arm64."
Nicolas Geoffray [Thu, 1 Oct 2015 10:41:17 +0000 (10:41 +0000)]
Merge "Fix poisoining bug in arm64."

8 years agoDon't force the boot image to using quick.
Nicolas Geoffray [Thu, 1 Oct 2015 09:32:19 +0000 (10:32 +0100)]
Don't force the boot image to using quick.

Instead, put the debuggable flag.

Also, remove obsolete ART_USE_OPTIMIZING_COMPILER environment
variable.

Change-Id: Idde00da0d063aa461faa0308134f3b420de9fe0a

8 years agoFix poisoining bug in arm64.
Nicolas Geoffray [Thu, 1 Oct 2015 09:27:52 +0000 (10:27 +0100)]
Fix poisoining bug in arm64.

Change-Id: I30ca7f237009d81c9d83fabb6a4c76bf4c74d451

8 years agoam 26a23403: am 2cd872a1: am 59349e6a: Merge "Mark one more Checker test broken for...
David Brazdil [Thu, 1 Oct 2015 09:20:12 +0000 (09:20 +0000)]
am 26a23403: am 2cd872a1: am 59349e6a: Merge "Mark one more Checker test broken for mips32"

* commit '26a234033989e1cabfeb31c2b45f7e2f4c316add':
  Mark one more Checker test broken for mips32

8 years agoam 2cd872a1: am 59349e6a: Merge "Mark one more Checker test broken for mips32"
David Brazdil [Thu, 1 Oct 2015 09:12:28 +0000 (09:12 +0000)]
am 2cd872a1: am 59349e6a: Merge "Mark one more Checker test broken for mips32"

* commit '2cd872a1c92b7ce0c49403c4633e98ed500a1cbb':
  Mark one more Checker test broken for mips32

8 years agoam 59349e6a: Merge "Mark one more Checker test broken for mips32"
David Brazdil [Thu, 1 Oct 2015 09:03:44 +0000 (09:03 +0000)]
am 59349e6a: Merge "Mark one more Checker test broken for mips32"

* commit '59349e6a67c8c95e35439c2a8097846886ae5ced':
  Mark one more Checker test broken for mips32

8 years agoMerge "Mark one more Checker test broken for mips32"
David Brazdil [Thu, 1 Oct 2015 08:57:17 +0000 (08:57 +0000)]
Merge "Mark one more Checker test broken for mips32"

8 years agoMark one more Checker test broken for mips32
David Brazdil [Thu, 1 Oct 2015 08:55:45 +0000 (09:55 +0100)]
Mark one more Checker test broken for mips32

Change-Id: I5289e91ff4b8bc530530eef000091c52f96fcc45

8 years agoam 7ee585f9: am 88b8bed5: am dc2ce636: Merge "Optimize ArraySet for x86/x64/arm/arm64."
Nicolas Geoffray [Thu, 1 Oct 2015 07:48:14 +0000 (07:48 +0000)]
am 7ee585f9: am 88b8bed5: am dc2ce636: Merge "Optimize ArraySet for x86/x64/arm/arm64."

* commit '7ee585f9dc04db923eabe5d242c7956ac2511f5e':
  Optimize ArraySet for x86/x64/arm/arm64.

8 years agoam 88b8bed5: am dc2ce636: Merge "Optimize ArraySet for x86/x64/arm/arm64."
Nicolas Geoffray [Thu, 1 Oct 2015 07:44:58 +0000 (07:44 +0000)]
am 88b8bed5: am dc2ce636: Merge "Optimize ArraySet for x86/x64/arm/arm64."

* commit '88b8bed50f1ac1b9c398063a42050e785f863658':
  Optimize ArraySet for x86/x64/arm/arm64.

8 years agoam dc2ce636: Merge "Optimize ArraySet for x86/x64/arm/arm64."
Nicolas Geoffray [Thu, 1 Oct 2015 07:38:18 +0000 (07:38 +0000)]
am dc2ce636: Merge "Optimize ArraySet for x86/x64/arm/arm64."

* commit 'dc2ce636d6a98118a5998b93da161ef7840ec645':
  Optimize ArraySet for x86/x64/arm/arm64.