OSDN Git Service

android-x86/art.git
7 years agoMerge "Fix possible deadlock in AddAccessFlags and ClearAccessFlags" am: 07d2e7a760...
Mathieu Chartier [Wed, 11 Jan 2017 18:04:51 +0000 (18:04 +0000)]
Merge "Fix possible deadlock in AddAccessFlags and ClearAccessFlags" am: 07d2e7a760 am: daee00f71c
am: 5a6251c55d

Change-Id: I915e7a427f1d0bb5de9b2a228a119e087960ec61

7 years agoMerge "Fix possible deadlock in AddAccessFlags and ClearAccessFlags" am: 07d2e7a760
Mathieu Chartier [Wed, 11 Jan 2017 17:59:49 +0000 (17:59 +0000)]
Merge "Fix possible deadlock in AddAccessFlags and ClearAccessFlags" am: 07d2e7a760
am: daee00f71c

Change-Id: I8dd9ea873552e04589563c16075ba91d43dd770e

7 years agoMerge "Fix possible deadlock in AddAccessFlags and ClearAccessFlags"
Mathieu Chartier [Wed, 11 Jan 2017 17:54:48 +0000 (17:54 +0000)]
Merge "Fix possible deadlock in AddAccessFlags and ClearAccessFlags"
am: 07d2e7a760

Change-Id: I44d2446d606ae3ff225a595a20d794182b71a7a9

7 years agoMerge "Fix possible deadlock in AddAccessFlags and ClearAccessFlags"
Mathieu Chartier [Wed, 11 Jan 2017 17:47:30 +0000 (17:47 +0000)]
Merge "Fix possible deadlock in AddAccessFlags and ClearAccessFlags"

7 years agoMerge "Keep resolved String in HLoadString." am: db47a144d8 am: 307aa06217
Nicolas Geoffray [Wed, 11 Jan 2017 14:19:05 +0000 (14:19 +0000)]
Merge "Keep resolved String in HLoadString." am: db47a144d8 am: 307aa06217
am: a5bf56deb6

Change-Id: I3a76df3fe40f4d51b2f35dda83882ac4ebef49ab

7 years agoMerge "Keep resolved String in HLoadString." am: db47a144d8
Nicolas Geoffray [Wed, 11 Jan 2017 14:14:07 +0000 (14:14 +0000)]
Merge "Keep resolved String in HLoadString." am: db47a144d8
am: 307aa06217

Change-Id: Iefe5a195d4bde09eeaab2b80ee360baf326036ed

7 years agoMerge "Keep resolved String in HLoadString."
Nicolas Geoffray [Wed, 11 Jan 2017 14:08:36 +0000 (14:08 +0000)]
Merge "Keep resolved String in HLoadString."
am: db47a144d8

Change-Id: I232a6ac98c9d310c726d77fde99e15be567fca42

7 years agoMerge "Keep resolved String in HLoadString."
Nicolas Geoffray [Wed, 11 Jan 2017 14:05:08 +0000 (14:05 +0000)]
Merge "Keep resolved String in HLoadString."

7 years agoMerge "ARM: Instruction set features clean-up." am: f62455a422 am: 2fc8f634df
Serban Constantinescu [Wed, 11 Jan 2017 13:20:03 +0000 (13:20 +0000)]
Merge "ARM: Instruction set features clean-up." am: f62455a422 am: 2fc8f634df
am: 1af95b74c2

Change-Id: I38c75a9eee20aec3bfafec695c1fc49135fe6514

7 years agoMerge "ARM: Instruction set features clean-up." am: f62455a422
Serban Constantinescu [Wed, 11 Jan 2017 13:13:33 +0000 (13:13 +0000)]
Merge "ARM: Instruction set features clean-up." am: f62455a422
am: 2fc8f634df

Change-Id: I5a1ed64f97e0915570e9ecf7aff249632a0466a8

7 years agoMerge "ARM: Instruction set features clean-up."
Serban Constantinescu [Wed, 11 Jan 2017 13:08:32 +0000 (13:08 +0000)]
Merge "ARM: Instruction set features clean-up."
am: f62455a422

Change-Id: I7f3977589d9da93eba52f8cb14d3546153f81e17

7 years agoMerge "ARM: Instruction set features clean-up."
Treehugger Robot [Wed, 11 Jan 2017 12:58:15 +0000 (12:58 +0000)]
Merge "ARM: Instruction set features clean-up."

7 years agoMerge "Remove the unused SMP instruction set feature option." am: bc7d0deda4 am:...
Vladimir Marko [Wed, 11 Jan 2017 11:45:58 +0000 (11:45 +0000)]
Merge "Remove the unused SMP instruction set feature option." am: bc7d0deda4 am: 3dc7c913ea
am: 5ddfcc8b79

Change-Id: I2c98deabe7bedaa7fb981aee9e843d7e3528009a

7 years agoMerge "Remove the unused SMP instruction set feature option." am: bc7d0deda4
Vladimir Marko [Wed, 11 Jan 2017 11:40:58 +0000 (11:40 +0000)]
Merge "Remove the unused SMP instruction set feature option." am: bc7d0deda4
am: 3dc7c913ea

Change-Id: If8e1d8035a8523aa7338506a214e7b365056ef25

7 years agoMerge "Remove the unused SMP instruction set feature option."
Vladimir Marko [Wed, 11 Jan 2017 11:34:26 +0000 (11:34 +0000)]
Merge "Remove the unused SMP instruction set feature option."
am: bc7d0deda4

Change-Id: I719f43019f2b76f18cc8de65ad504ab82b1f785b

7 years agoMerge "Remove the unused SMP instruction set feature option."
Vladimir Marko [Wed, 11 Jan 2017 11:25:38 +0000 (11:25 +0000)]
Merge "Remove the unused SMP instruction set feature option."

7 years agoMerge "Make object allocation entrypoints only take a class." am: 816988efb8 am:...
Nicolas Geoffray [Wed, 11 Jan 2017 11:06:58 +0000 (11:06 +0000)]
Merge "Make object allocation entrypoints only take a class." am: 816988efb8 am: 5ef494cfa6
am: cde1d063ab

Change-Id: I56dfd8fecf60c1a1048e2a9b66ec034aa4bd052c

7 years agoMerge "Do not return patchoat for dexopt needed." am: c9a060f268 am: 8d74dafcf6
Richard Uhler [Wed, 11 Jan 2017 10:57:37 +0000 (10:57 +0000)]
Merge "Do not return patchoat for dexopt needed." am: c9a060f268 am: 8d74dafcf6
am: 2347dc9172

Change-Id: Ic4c2fec827195cd04237c089dc5c74260fa9b07d

7 years agoMerge "Make object allocation entrypoints only take a class." am: 816988efb8
Nicolas Geoffray [Wed, 11 Jan 2017 10:56:56 +0000 (10:56 +0000)]
Merge "Make object allocation entrypoints only take a class." am: 816988efb8
am: 5ef494cfa6

Change-Id: Ib8b057b17cdd463d8acd9020654b97c9a76a3a74

7 years agoMerge "Do not return patchoat for dexopt needed." am: c9a060f268
Richard Uhler [Wed, 11 Jan 2017 10:47:05 +0000 (10:47 +0000)]
Merge "Do not return patchoat for dexopt needed." am: c9a060f268
am: 8d74dafcf6

Change-Id: Ib5e65ea19fb15309bccc66d82c6659db03d119a0

7 years agoMerge "Make object allocation entrypoints only take a class."
Nicolas Geoffray [Wed, 11 Jan 2017 10:46:25 +0000 (10:46 +0000)]
Merge "Make object allocation entrypoints only take a class."
am: 816988efb8

Change-Id: Ib5c1b8db34d5b2388a8f10daae92112b8bf82fec

7 years agoMerge "Make object allocation entrypoints only take a class."
Nicolas Geoffray [Wed, 11 Jan 2017 10:37:54 +0000 (10:37 +0000)]
Merge "Make object allocation entrypoints only take a class."

7 years agoMerge "Do not return patchoat for dexopt needed."
Richard Uhler [Wed, 11 Jan 2017 10:36:42 +0000 (10:36 +0000)]
Merge "Do not return patchoat for dexopt needed."
am: c9a060f268

Change-Id: I932952dc273aa023a611406fb45219015ef40409

7 years agoMake object allocation entrypoints only take a class.
Nicolas Geoffray [Fri, 6 Jan 2017 14:40:07 +0000 (14:40 +0000)]
Make object allocation entrypoints only take a class.

Change motivated by:
- Dex cache compression: having the allocation fast path do a
  dex cache lookup will be too expensive. So instead, rely on the
  compiler having direct access to the class (either through BSS for
  AOT, or JIT tables for JIT).
- Inlining: the entrypoints relied on the caller of the allocation to
  have the same dex cache as the outer method (stored at the bottom of
  the stack). This meant we could not inline methods from a different
  dex file that do allocations. By avoiding the dex cache lookup in
  the entrypoint, we can now remove this restriction.

Code expansion on average for Docs/Gms/FB/Framework (go/lem numbers):
- Around 0.8% on arm64
- Around 1% for x64, arm
- Around 1.5% on x86

Test: test-art-host, test-art-target, ART_USE_READ_BARRIER=true/false
Test: test-art-host, test-art-target,  ART_DEFAULT_GC_TYPE=SS ART_USE_TLAB=true

Change-Id: I41f3748bb4d251996aaf6a90fae4c50176f9295f

7 years agoMerge "Track libcore java.lang.reflect.Proxy update" am: 198b5dbf34 am: 1b480fc29b
Przemyslaw Szczepaniak [Wed, 11 Jan 2017 10:29:57 +0000 (10:29 +0000)]
Merge "Track libcore java.lang.reflect.Proxy update" am: 198b5dbf34 am: 1b480fc29b
am: f1b48fbf00

Change-Id: If21efc80f4d673014747c5594d8c0c327a6429fe

7 years agoMerge "Do not return patchoat for dexopt needed."
Treehugger Robot [Wed, 11 Jan 2017 10:28:16 +0000 (10:28 +0000)]
Merge "Do not return patchoat for dexopt needed."

7 years agoMerge "Track libcore java.lang.reflect.Proxy update" am: 198b5dbf34
Przemyslaw Szczepaniak [Wed, 11 Jan 2017 10:24:58 +0000 (10:24 +0000)]
Merge "Track libcore java.lang.reflect.Proxy update" am: 198b5dbf34
am: 1b480fc29b

Change-Id: Id616bcd33272ae46d04eacb99030a5d5d49fe608

7 years agoMerge "Track libcore java.lang.reflect.Proxy update"
Przemyslaw Szczepaniak [Wed, 11 Jan 2017 10:18:56 +0000 (10:18 +0000)]
Merge "Track libcore java.lang.reflect.Proxy update"
am: 198b5dbf34

Change-Id: I317a57a5793a99dcd4ccf96c99c68776f5643106

7 years agoMerge "Track libcore java.lang.reflect.Proxy update"
Przemyslaw Szczepaniak [Wed, 11 Jan 2017 10:15:43 +0000 (10:15 +0000)]
Merge "Track libcore java.lang.reflect.Proxy update"

7 years agoMerge "Recognize getClass() in RTP." am: 5e83eb74e8 am: d48eb7d4c0
Nicolas Geoffray [Wed, 11 Jan 2017 09:27:20 +0000 (09:27 +0000)]
Merge "Recognize getClass() in RTP." am: 5e83eb74e8 am: d48eb7d4c0
am: 3d48f5c1d3

Change-Id: I47438bf0533b76cd96fb729829c4c23e76b03545

7 years agoMerge "Recognize getClass() in RTP." am: 5e83eb74e8
Nicolas Geoffray [Wed, 11 Jan 2017 09:21:51 +0000 (09:21 +0000)]
Merge "Recognize getClass() in RTP." am: 5e83eb74e8
am: d48eb7d4c0

Change-Id: I5d7477a9dbf764c06bd43af3bc11aceefdc0b714

7 years agoMerge "Recognize getClass() in RTP."
Nicolas Geoffray [Wed, 11 Jan 2017 09:16:20 +0000 (09:16 +0000)]
Merge "Recognize getClass() in RTP."
am: 5e83eb74e8

Change-Id: I0173910c704387c60a680a35ecc15df56adaff4e

7 years agoMerge "Recognize getClass() in RTP."
Nicolas Geoffray [Wed, 11 Jan 2017 09:08:09 +0000 (09:08 +0000)]
Merge "Recognize getClass() in RTP."

7 years agoMerge "Make all class redefinition operations after suspend_all infallible" am: 4cd51...
Alex Light [Wed, 11 Jan 2017 01:00:20 +0000 (01:00 +0000)]
Merge "Make all class redefinition operations after suspend_all infallible" am: 4cd5155218 am: 16feb48167
am: 6d9abafa41

Change-Id: I059ba710186ea26ca2a423d7d7805163eef787ba

7 years agoFix possible deadlock in AddAccessFlags and ClearAccessFlags
Mathieu Chartier [Wed, 11 Jan 2017 00:48:11 +0000 (16:48 -0800)]
Fix possible deadlock in AddAccessFlags and ClearAccessFlags

Reload the value each loop iteration or else it will spin forever
if the CAS fails due to another thread adding a different flag.

Test: mm

Change-Id: Idc320921597acc20d56301899b398756563029f2

7 years agoMerge "Make all class redefinition operations after suspend_all infallible" am: 4cd51...
Alex Light [Wed, 11 Jan 2017 00:55:51 +0000 (00:55 +0000)]
Merge "Make all class redefinition operations after suspend_all infallible" am: 4cd5155218
am: 16feb48167

Change-Id: Ib745e8299835db990fa4e25f457d1f9e1c59abc9

7 years agoMerge "Make all class redefinition operations after suspend_all infallible"
Alex Light [Wed, 11 Jan 2017 00:50:18 +0000 (00:50 +0000)]
Merge "Make all class redefinition operations after suspend_all infallible"
am: 4cd5155218

Change-Id: I1edac3e24aedc552328d2b2129edd53cf1f7acbb

7 years agoMerge "ART: Add system properties support" am: 2ef87a523a am: 541c54f68b
Andreas Gampe [Wed, 11 Jan 2017 00:44:49 +0000 (00:44 +0000)]
Merge "ART: Add system properties support" am: 2ef87a523a am: 541c54f68b
am: 531f4fe9eb

Change-Id: I0a10ae7d57d885650da8b593d8792e2e7d47f415

7 years agoMerge "Make all class redefinition operations after suspend_all infallible"
Treehugger Robot [Wed, 11 Jan 2017 00:42:14 +0000 (00:42 +0000)]
Merge "Make all class redefinition operations after suspend_all infallible"

7 years agoMerge "ART: Add system properties support" am: 2ef87a523a
Andreas Gampe [Wed, 11 Jan 2017 00:39:17 +0000 (00:39 +0000)]
Merge "ART: Add system properties support" am: 2ef87a523a
am: 541c54f68b

Change-Id: Icd740821a33c239b0ac237578e8b4bbdaa20fab9

7 years agoMerge "ART: Add system properties support"
Andreas Gampe [Wed, 11 Jan 2017 00:33:47 +0000 (00:33 +0000)]
Merge "ART: Add system properties support"
am: 2ef87a523a

Change-Id: I1718cd897c9d66007c8dcac58414a46551f60962

7 years agoMerge "ART: Add system properties support"
Treehugger Robot [Wed, 11 Jan 2017 00:26:10 +0000 (00:26 +0000)]
Merge "ART: Add system properties support"

7 years agoMake all class redefinition operations after suspend_all infallible
Alex Light [Tue, 10 Jan 2017 21:33:56 +0000 (13:33 -0800)]
Make all class redefinition operations after suspend_all infallible

We can guarantee that the mutations to the class, classloader, method
& stack data-structures which occur after the suspend_all can never
fail. This will simplify implementing the required semantics of class
redefinition with respect to atomically updating multiple classes at
once.

Test: mma -j40 test-art-host
Change-Id: Iab95c66afbdcfe161a9486f5fb7193c53642c060

7 years agoKeep resolved String in HLoadString.
Nicolas Geoffray [Mon, 9 Jan 2017 20:54:52 +0000 (20:54 +0000)]
Keep resolved String in HLoadString.

For the following reasons:
- Avoids needing to do a lookup again in CodeGenerator::EmitJitRoots.
- Fixes races where we the string was GC'ed before CodeGenerator::EmitJitRoots.
- Makes it possible to do GVN on the same string but defined in different
  dex files.

Test: test-art-host, test-art-target
Change-Id: If2b5d3079f7555427b1b96ab04546b3373fcf921

7 years agoART: Add system properties support
Andreas Gampe [Tue, 10 Jan 2017 03:21:06 +0000 (19:21 -0800)]
ART: Add system properties support

Add simple support for GetSystemProperties, GetSystemProperty and
SetSystemProperty. Add a test.

Bug: 31455788
Test: m test-art-host-run-test-922-properties
Change-Id: I02914f04643f0f8fab96f1b372925c2c5306fc9b

7 years agoMerge "Fix some issues reported by Valgrind" am: 2e17788df0 am: 1b0abe48f7
Mathieu Chartier [Tue, 10 Jan 2017 18:57:00 +0000 (18:57 +0000)]
Merge "Fix some issues reported by Valgrind" am: 2e17788df0 am: 1b0abe48f7
am: 4e809054a0

Change-Id: I3d1b3f789e5dd1d8c3c632da9d3280db4ceed342

7 years agoMerge "Fix some issues reported by Valgrind" am: 2e17788df0
Mathieu Chartier [Tue, 10 Jan 2017 18:52:00 +0000 (18:52 +0000)]
Merge "Fix some issues reported by Valgrind" am: 2e17788df0
am: 1b0abe48f7

Change-Id: Ia18042adbf57201104416f54008aa878056d3efa

7 years agoMerge "Fix some issues reported by Valgrind"
Mathieu Chartier [Tue, 10 Jan 2017 18:46:56 +0000 (18:46 +0000)]
Merge "Fix some issues reported by Valgrind"
am: 2e17788df0

Change-Id: I62227ec60741d42f9b1a246840fe0c70c0ab8ed7

7 years agoMerge "Fix some issues reported by Valgrind"
Mathieu Chartier [Tue, 10 Jan 2017 18:40:25 +0000 (18:40 +0000)]
Merge "Fix some issues reported by Valgrind"

7 years agoMerge "Delete extra arm64/mips64 MterpReturn suspend check" am: 26baea602e am: d27d8707cd
Mathieu Chartier [Tue, 10 Jan 2017 18:26:54 +0000 (18:26 +0000)]
Merge "Delete extra arm64/mips64 MterpReturn suspend check" am: 26baea602e am: d27d8707cd
am: 088bb54fa2

Change-Id: I484974731b1d7b5bde56da1b9646df6b67b08339

7 years agoMerge "Delete extra arm64/mips64 MterpReturn suspend check" am: 26baea602e
Mathieu Chartier [Tue, 10 Jan 2017 18:21:54 +0000 (18:21 +0000)]
Merge "Delete extra arm64/mips64 MterpReturn suspend check" am: 26baea602e
am: d27d8707cd

Change-Id: I2ee29ffde64f445359bdfdf157863055d4d51f98

7 years agoMerge "Delete extra arm64/mips64 MterpReturn suspend check"
Mathieu Chartier [Tue, 10 Jan 2017 18:16:53 +0000 (18:16 +0000)]
Merge "Delete extra arm64/mips64 MterpReturn suspend check"
am: 26baea602e

Change-Id: I727de568787f6cc651017a213fd1c542023032aa

7 years agoMerge "Delete extra arm64/mips64 MterpReturn suspend check"
Mathieu Chartier [Tue, 10 Jan 2017 18:09:21 +0000 (18:09 +0000)]
Merge "Delete extra arm64/mips64 MterpReturn suspend check"

7 years agoMerge "Revert "Revert "Add basic implementation of IsModifiableClass""" am: 4814f5e75...
Alex Light [Tue, 10 Jan 2017 17:18:05 +0000 (17:18 +0000)]
Merge "Revert "Revert "Add basic implementation of IsModifiableClass""" am: 4814f5e756 am: 48a8ebf55a
am: 3e3f1db293

Change-Id: I965caa030f96b4b156c599d2afc1fa61c9ee6ae0

7 years agoMerge "Revert "Revert "Add basic checks for redefinition.""" am: 6c71cf9faf am: 344d7...
Alex Light [Tue, 10 Jan 2017 17:17:49 +0000 (17:17 +0000)]
Merge "Revert "Revert "Add basic checks for redefinition.""" am: 6c71cf9faf am: 344d790b9b
am: 7c5bb5ea50

Change-Id: I807ad0630a9de1739659c86609351392f4519c1f

7 years agoMerge "Revert "Revert "Add basic implementation of IsModifiableClass""" am: 4814f5e756
Alex Light [Tue, 10 Jan 2017 17:13:06 +0000 (17:13 +0000)]
Merge "Revert "Revert "Add basic implementation of IsModifiableClass""" am: 4814f5e756
am: 48a8ebf55a

Change-Id: I93b8883ef58e64c49995f7a16c7529d73c14b224

7 years agoMerge "Revert "Revert "Add basic checks for redefinition.""" am: 6c71cf9faf
Alex Light [Tue, 10 Jan 2017 17:12:50 +0000 (17:12 +0000)]
Merge "Revert "Revert "Add basic checks for redefinition.""" am: 6c71cf9faf
am: 344d790b9b

Change-Id: I0ad02843fc280ea5ed5d5e17a0b258cc0ac11783

7 years agoMerge "Revert "Revert "Add basic implementation of IsModifiableClass"""
Alex Light [Tue, 10 Jan 2017 17:07:42 +0000 (17:07 +0000)]
Merge "Revert "Revert "Add basic implementation of IsModifiableClass"""
am: 4814f5e756

Change-Id: Ib24bf13f95c362cbf5d9d8c28c39383608057aba

7 years agoMerge "Revert "Revert "Add basic checks for redefinition."""
Alex Light [Tue, 10 Jan 2017 17:07:19 +0000 (17:07 +0000)]
Merge "Revert "Revert "Add basic checks for redefinition."""
am: 6c71cf9faf

Change-Id: Ib79a51ba61950dc702727d868cb83859f03d1798

7 years agoMerge "Revert "Revert "Add basic implementation of IsModifiableClass"""
Treehugger Robot [Tue, 10 Jan 2017 17:04:13 +0000 (17:04 +0000)]
Merge "Revert "Revert "Add basic implementation of IsModifiableClass"""

7 years agoMerge "Revert "Revert "Add basic checks for redefinition."""
Treehugger Robot [Tue, 10 Jan 2017 17:01:12 +0000 (17:01 +0000)]
Merge "Revert "Revert "Add basic checks for redefinition."""

7 years agoTrack libcore java.lang.reflect.Proxy update
Przemyslaw Szczepaniak [Wed, 17 Aug 2016 16:46:38 +0000 (17:46 +0100)]
Track libcore java.lang.reflect.Proxy update

Test: make -j 32 & booted device & m test-art-host
Bug: 28666126
Change-Id: I6e7d75fd904e9b130925756ef1ff1122c25ab245

7 years agoDelete extra arm64/mips64 MterpReturn suspend check
Mathieu Chartier [Tue, 10 Jan 2017 02:48:11 +0000 (18:48 -0800)]
Delete extra arm64/mips64 MterpReturn suspend check

Doing a suspend check after moving the result into the shadow frame
result_register_ is not safe since result_register_ is not a GC
root. The suspend check is unnecessary since the opcodes that branch
to MterpReturn already do a suspend check.

This could maybe explain one crash for CC that was seen after calling
a getter that had no compiled code.

The extra suspend check appears to only be present on arm64 amd mips64.

Test: test-art-target ART_TEST_INTERPRETER=true

Bug: 33211261
Change-Id: I70b8863f40a25a26f278ac8ef0d57e083b663e0f

7 years agoRevert "Revert "Add basic implementation of IsModifiableClass""
Alex Light [Tue, 10 Jan 2017 15:41:24 +0000 (07:41 -0800)]
Revert "Revert "Add basic implementation of IsModifiableClass""

This reverts commit c66c077d40db58ec239f93a9c42b9939439c85c7.

Reason for revert: Problem with preceding CL fixed.

Test: mma -j40 test-art-host

7 years agoRevert "Revert "Add basic checks for redefinition.""
Alex Light [Tue, 10 Jan 2017 15:37:17 +0000 (15:37 +0000)]
Revert "Revert "Add basic checks for redefinition.""

This reverts commit f9d41c1d269f3031c0a89e34fc4a04303e186958.

Reason for revert: Fixed issue of missing target skip.

Test: mma -j40 test-art-host
Change-Id: Ibe632e1f3063373950fb873e1716d0439c561297

7 years agoRecognize getClass() in RTP.
Nicolas Geoffray [Mon, 19 Dec 2016 09:18:07 +0000 (09:18 +0000)]
Recognize getClass() in RTP.

Also always keep around the resolved field
in related HInstructions to avoid resolving it again
and again.

Test: test-art-host, 631-checker-get-class

Change-Id: I3bc6be11f3eb175c635e746006f39865947e0669

7 years agoMerge "The HBoundsCheck should be the index input of String.charAt." am: fac5c658f1...
Nicolas Geoffray [Tue, 10 Jan 2017 12:29:03 +0000 (12:29 +0000)]
Merge "The HBoundsCheck should be the index input of String.charAt." am: fac5c658f1 am: 2f7dd85bb6
am: daa1e0c6fd

Change-Id: Ic461c8f006bb0d13ed53d03e50b391b76f142882

7 years agoMerge "The HBoundsCheck should be the index input of String.charAt." am: fac5c658f1
Nicolas Geoffray [Tue, 10 Jan 2017 12:24:03 +0000 (12:24 +0000)]
Merge "The HBoundsCheck should be the index input of String.charAt." am: fac5c658f1
am: 2f7dd85bb6

Change-Id: I37eab674b55bce8009b94603b50eb07efa1f9e21

7 years agoMerge "The HBoundsCheck should be the index input of String.charAt."
Nicolas Geoffray [Tue, 10 Jan 2017 12:18:33 +0000 (12:18 +0000)]
Merge "The HBoundsCheck should be the index input of String.charAt."
am: fac5c658f1

Change-Id: I17b4f972c473d14726a9ab0371d637c860cdd6e9

7 years agoMerge "The HBoundsCheck should be the index input of String.charAt."
Nicolas Geoffray [Tue, 10 Jan 2017 12:10:09 +0000 (12:10 +0000)]
Merge "The HBoundsCheck should be the index input of String.charAt."

7 years agoMerge "Revert "Add basic checks for redefinition."" am: c38c429ef1 am: 520ebf2743
Nicolas Geoffray [Tue, 10 Jan 2017 09:15:09 +0000 (09:15 +0000)]
Merge "Revert "Add basic checks for redefinition."" am: c38c429ef1 am: 520ebf2743
am: e4d990e426

Change-Id: I6ef95f148b86a095f780b1035e04d7578eb90682

7 years agoMerge "Revert "Add basic implementation of IsModifiableClass"" am: a82de09e6d am...
Nicolas Geoffray [Tue, 10 Jan 2017 09:14:52 +0000 (09:14 +0000)]
Merge "Revert "Add basic implementation of IsModifiableClass"" am: a82de09e6d am: ee685df601
am: 75b7bd1528

Change-Id: I1981a7feb51d8c982b9925a170d08041a513e744

7 years agoMerge "Revert "Add basic checks for redefinition."" am: c38c429ef1
Nicolas Geoffray [Tue, 10 Jan 2017 09:09:59 +0000 (09:09 +0000)]
Merge "Revert "Add basic checks for redefinition."" am: c38c429ef1
am: 520ebf2743

Change-Id: Idc438bd959ab4e3125594d55902cbffad315e229

7 years agoMerge "Revert "Add basic implementation of IsModifiableClass"" am: a82de09e6d
Nicolas Geoffray [Tue, 10 Jan 2017 09:09:40 +0000 (09:09 +0000)]
Merge "Revert "Add basic implementation of IsModifiableClass"" am: a82de09e6d
am: ee685df601

Change-Id: I19becce9460d757fcf816ae6042f5aeea4338c4b

7 years agoMerge "Revert "Add basic checks for redefinition.""
Nicolas Geoffray [Tue, 10 Jan 2017 09:04:40 +0000 (09:04 +0000)]
Merge "Revert "Add basic checks for redefinition.""
am: c38c429ef1

Change-Id: Ic414583e30bd59a2a87aa9114660f61bb8f6e1bd

7 years agoMerge "Revert "Add basic implementation of IsModifiableClass""
Nicolas Geoffray [Tue, 10 Jan 2017 09:04:22 +0000 (09:04 +0000)]
Merge "Revert "Add basic implementation of IsModifiableClass""
am: a82de09e6d

Change-Id: If86f3647e524da59d5168dee62c518e21934193d

7 years agoMerge "Revert "Add basic checks for redefinition.""
Nicolas Geoffray [Tue, 10 Jan 2017 09:00:28 +0000 (09:00 +0000)]
Merge "Revert "Add basic checks for redefinition.""

7 years agoRevert "Add basic checks for redefinition."
Nicolas Geoffray [Tue, 10 Jan 2017 08:58:44 +0000 (08:58 +0000)]
Revert "Add basic checks for redefinition."

Test fails.

This reverts commit 10f02fb4f026c493c69b21d4ec7c3096970357e1.

Change-Id: I21abfff0d7cd4ec840447f19819b7859b90f45b2

7 years agoMerge "Revert "Add basic implementation of IsModifiableClass""
Nicolas Geoffray [Tue, 10 Jan 2017 08:59:54 +0000 (08:59 +0000)]
Merge "Revert "Add basic implementation of IsModifiableClass""

7 years agoRevert "Add basic implementation of IsModifiableClass"
Nicolas Geoffray [Tue, 10 Jan 2017 08:59:31 +0000 (08:59 +0000)]
Revert "Add basic implementation of IsModifiableClass"

Built on top of a failing change.

This reverts commit b4e51ebfa23a1cb175a6c317ac4a69228709e78f.

Change-Id: I7f4dbe22271a9c04e518bceabba12c95cad3c6f7

7 years agoMerge "Add basic implementation of IsModifiableClass" am: 888e66fdfb am: 7b8bb6661b
Alex Light [Tue, 10 Jan 2017 02:10:28 +0000 (02:10 +0000)]
Merge "Add basic implementation of IsModifiableClass" am: 888e66fdfb am: 7b8bb6661b
am: b5eb809135

Change-Id: I1b3c7919df4a12f0f1f0bb15beccb1c3dac048fe

7 years agoMerge "Add basic implementation of IsModifiableClass" am: 888e66fdfb
Alex Light [Tue, 10 Jan 2017 02:06:28 +0000 (02:06 +0000)]
Merge "Add basic implementation of IsModifiableClass" am: 888e66fdfb
am: 7b8bb6661b

Change-Id: Iab757988c47b5a61a38c2bf5dea6e477631ebb7e

7 years agoMerge "Add basic implementation of IsModifiableClass"
Alex Light [Tue, 10 Jan 2017 02:01:27 +0000 (02:01 +0000)]
Merge "Add basic implementation of IsModifiableClass"
am: 888e66fdfb

Change-Id: I3ce1d22ef8d9eb4b0bee782f4f6f0ed2d0336a40

7 years agoMerge "Add basic implementation of IsModifiableClass"
Treehugger Robot [Tue, 10 Jan 2017 01:52:42 +0000 (01:52 +0000)]
Merge "Add basic implementation of IsModifiableClass"

7 years agoMerge "Use relative futex timeout in SuspendAllInternal." am: 99cd29fa68 am: 5527801d94
Mathieu Chartier [Tue, 10 Jan 2017 01:23:23 +0000 (01:23 +0000)]
Merge "Use relative futex timeout in SuspendAllInternal." am: 99cd29fa68 am: 5527801d94
am: 12b6cf3d0b

Change-Id: Ib66bc98d431c29532e4296f2b6e7fc9b4ebae3ec

7 years agoMerge "Use relative futex timeout in SuspendAllInternal." am: 99cd29fa68
Mathieu Chartier [Tue, 10 Jan 2017 01:18:23 +0000 (01:18 +0000)]
Merge "Use relative futex timeout in SuspendAllInternal." am: 99cd29fa68
am: 5527801d94

Change-Id: Ic99000741bcd56172d3d6c42b8059b306e43573a

7 years agoMerge "Use relative futex timeout in SuspendAllInternal."
Mathieu Chartier [Tue, 10 Jan 2017 01:13:24 +0000 (01:13 +0000)]
Merge "Use relative futex timeout in SuspendAllInternal."
am: 99cd29fa68

Change-Id: Ib63fe3dc90863d23d0a95a9856915fd90108e95f

7 years agoMerge "Use relative futex timeout in SuspendAllInternal."
Mathieu Chartier [Tue, 10 Jan 2017 01:04:32 +0000 (01:04 +0000)]
Merge "Use relative futex timeout in SuspendAllInternal."

7 years agoMerge "ART: Add method modifiers functions" am: 6c0a92fd90 am: 18858f93ce
Andreas Gampe [Tue, 10 Jan 2017 00:38:52 +0000 (00:38 +0000)]
Merge "ART: Add method modifiers functions" am: 6c0a92fd90 am: 18858f93ce
am: 3d5a8e622e

Change-Id: Iece3790c3428a779217a9f22954dece7a29fa8ae

7 years agoMerge "ART: Add method modifiers functions" am: 6c0a92fd90
Andreas Gampe [Tue, 10 Jan 2017 00:33:52 +0000 (00:33 +0000)]
Merge "ART: Add method modifiers functions" am: 6c0a92fd90
am: 18858f93ce

Change-Id: Ie8c9be7c9706cd5f9ea6d6958f7f0a8a5d9d9384

7 years agoAdd basic implementation of IsModifiableClass
Alex Light [Tue, 10 Jan 2017 00:28:58 +0000 (16:28 -0800)]
Add basic implementation of IsModifiableClass

Currently we just flatly disallow some types of modifications that
might be allowed in the future.

Bug: 31684578
Test: mma -j40 test-art-host
Change-Id: Ica76d12276eb11b318da2f642591ea78766f36ad

7 years agoMerge "ART: Add method modifiers functions"
Andreas Gampe [Tue, 10 Jan 2017 00:28:51 +0000 (00:28 +0000)]
Merge "ART: Add method modifiers functions"
am: 6c0a92fd90

Change-Id: Ib753c915fbbeb1b68030da824eca6ea6b76a3899

7 years agoMerge "Add basic checks for redefinition." am: 5896957f4f am: 2cfc98bcd8
Alex Light [Tue, 10 Jan 2017 00:28:50 +0000 (00:28 +0000)]
Merge "Add basic checks for redefinition." am: 5896957f4f am: 2cfc98bcd8
am: 33558423b7

Change-Id: Ia4b78a6b5b6b03752e23ec93e161fde0a6e90911

7 years agoMerge "Add basic checks for redefinition." am: 5896957f4f
Alex Light [Tue, 10 Jan 2017 00:23:50 +0000 (00:23 +0000)]
Merge "Add basic checks for redefinition." am: 5896957f4f
am: 2cfc98bcd8

Change-Id: I423975e35eb73db49a8c9beef439f2942ecd652a

7 years agoMerge "ART: Add method modifiers functions"
Treehugger Robot [Tue, 10 Jan 2017 00:22:41 +0000 (00:22 +0000)]
Merge "ART: Add method modifiers functions"

7 years agoMerge "Add basic checks for redefinition."
Alex Light [Tue, 10 Jan 2017 00:18:22 +0000 (00:18 +0000)]
Merge "Add basic checks for redefinition."
am: 5896957f4f

Change-Id: Iae3793a6c2cb6e5718bf33bea70b381eae94f7e8

7 years agoMerge "Add basic checks for redefinition."
Treehugger Robot [Tue, 10 Jan 2017 00:13:40 +0000 (00:13 +0000)]
Merge "Add basic checks for redefinition."

7 years agoMerge "Remove oat-target* rules" am: 7399a7293b am: a5b74bae82
Dan Willemsen [Tue, 10 Jan 2017 00:13:20 +0000 (00:13 +0000)]
Merge "Remove oat-target* rules" am: 7399a7293b am: a5b74bae82
am: 0f02efb719

Change-Id: I4acbf9f6d5463f456b3c6698858a6e9cce19aa73

7 years agoMerge "Remove oat-target* rules" am: 7399a7293b
Dan Willemsen [Tue, 10 Jan 2017 00:08:20 +0000 (00:08 +0000)]
Merge "Remove oat-target* rules" am: 7399a7293b
am: a5b74bae82

Change-Id: I585b932fbba40d466761d757e953408468dcbe6d

7 years agoMerge "Remove oat-target* rules"
Dan Willemsen [Tue, 10 Jan 2017 00:03:19 +0000 (00:03 +0000)]
Merge "Remove oat-target* rules"
am: 7399a7293b

Change-Id: I3a2f26175b360e5de9f2ae06ae71e285febed3f3