OSDN Git Service

android-x86/art.git
7 years agoART: Add GetLoadedClasses support
Andreas Gampe [Sat, 15 Oct 2016 02:09:38 +0000 (02:09 +0000)]
ART: Add GetLoadedClasses support
am: aa8b60c23a

Change-Id: I550a10a4ad9d204dc3e1a54935c80b5a28eded7f

7 years agoMerge "ART: Make JNI global and weak global locks global"
Andreas Gampe [Sat, 15 Oct 2016 01:13:02 +0000 (01:13 +0000)]
Merge "ART: Make JNI global and weak global locks global"
am: 6021426926

Change-Id: I58b4fb90026fd56b4da04ff7d7ed3c713aef9e6d

7 years agoMerge "ART: Make JNI global and weak global locks global"
Treehugger Robot [Sat, 15 Oct 2016 01:08:46 +0000 (01:08 +0000)]
Merge "ART: Make JNI global and weak global locks global"

7 years agoMerge "Move reference processor and mirror::Reference to ObjPtr"
Mathieu Chartier [Fri, 14 Oct 2016 23:44:55 +0000 (23:44 +0000)]
Merge "Move reference processor and mirror::Reference to ObjPtr"
am: f434243775

Change-Id: I82bbb970414cae3d0a59d15e24b0114e08991eea

7 years agoMerge "Move reference processor and mirror::Reference to ObjPtr"
Mathieu Chartier [Fri, 14 Oct 2016 23:40:46 +0000 (23:40 +0000)]
Merge "Move reference processor and mirror::Reference to ObjPtr"

7 years agoMerge "Add a mark bit check in the read barrier jni entrypoint."
Hiroshi Yamauchi [Fri, 14 Oct 2016 21:54:47 +0000 (21:54 +0000)]
Merge "Add a mark bit check in the read barrier jni entrypoint."
am: 3cf26cfd67

Change-Id: Ibd9947e4868adebaac4116f9e091d22a487f49af

7 years agoART: Add GetLoadedClasses support
Andreas Gampe [Wed, 12 Oct 2016 19:51:25 +0000 (12:51 -0700)]
ART: Add GetLoadedClasses support

Add support to retrieve all loaded classes. Use the standard
ClassLoader callback infrastructure.

Bug: 31684578
Test: m test-art-host-run-test-907-get-loaded-classes
Change-Id: Ifb33cae27dc32602bcd8fd930d3c7eda02598c26

7 years agoART: Make JNI global and weak global locks global
Andreas Gampe [Fri, 14 Oct 2016 20:27:12 +0000 (13:27 -0700)]
ART: Make JNI global and weak global locks global

Add them to Locks. Give the JNI global table lock
a lock level, close to the weak global JNI references.

Bug: 31684578
Test: m test-art-host
Change-Id: I3857a3b0be69b16811d9999096b2c42e7a25d227

7 years agoMerge "Add a mark bit check in the read barrier jni entrypoint."
Hiroshi Yamauchi [Fri, 14 Oct 2016 21:46:31 +0000 (21:46 +0000)]
Merge "Add a mark bit check in the read barrier jni entrypoint."

7 years agoMove reference processor and mirror::Reference to ObjPtr
Mathieu Chartier [Fri, 14 Oct 2016 21:28:47 +0000 (14:28 -0700)]
Move reference processor and mirror::Reference to ObjPtr

Bug: 31113334

Test: test-art-host

Change-Id: I2c7c3dfd88ebf12a0de271436f8a7781f997e061

7 years agoAdd a mark bit check in the read barrier jni entrypoint.
Hiroshi Yamauchi [Fri, 14 Oct 2016 18:21:38 +0000 (11:21 -0700)]
Add a mark bit check in the read barrier jni entrypoint.

Bug: 30437917
Bug: 12687968
Test: test-art host/N9, N9 libartd boot, Ritz EAAC.
Change-Id: Ic5f8080959f243e80f00da73ba5f4b91a8d8b617

7 years agoMerge "Move mirror::ObjectArray to ObjPtr" am: cfdff144f1 am: 7d4463d8da
Mathieu Chartier [Fri, 14 Oct 2016 17:06:26 +0000 (17:06 +0000)]
Merge "Move mirror::ObjectArray to ObjPtr" am: cfdff144f1 am: 7d4463d8da
am: 2da0e9478a

Change-Id: I3d0ce0a5c1d28aec500efd0724748bde3377b60d

7 years agoMerge "Move mirror::ObjectArray to ObjPtr" am: cfdff144f1
Mathieu Chartier [Fri, 14 Oct 2016 17:02:26 +0000 (17:02 +0000)]
Merge "Move mirror::ObjectArray to ObjPtr" am: cfdff144f1
am: 7d4463d8da

Change-Id: I8ed919c07e97662ae55316b03ecae94ed23037f4

7 years agoMerge "Move mirror::ObjectArray to ObjPtr"
Mathieu Chartier [Fri, 14 Oct 2016 16:58:56 +0000 (16:58 +0000)]
Merge "Move mirror::ObjectArray to ObjPtr"
am: cfdff144f1

Change-Id: Ib0982b1e17f5dda5bd49b6c6e585587aabe3f65a

7 years agoMerge "Move mirror::ObjectArray to ObjPtr"
Mathieu Chartier [Fri, 14 Oct 2016 16:54:05 +0000 (16:54 +0000)]
Merge "Move mirror::ObjectArray to ObjPtr"

7 years agoMerge "Revert "Revert "Temporarily blacklist 955-method-handles-smali.""" am: 4aed412...
Narayan Kamath [Fri, 14 Oct 2016 14:43:17 +0000 (14:43 +0000)]
Merge "Revert "Revert "Temporarily blacklist 955-method-handles-smali.""" am: 4aed412037 am: 2dddbcf8b5
am: fa191a12d8

Change-Id: I1ffb22319a41c41085f57db5f403401e8ebc6adb

7 years agoMerge "Revert "Revert "Temporarily blacklist 955-method-handles-smali.""" am: 4aed412037
Narayan Kamath [Fri, 14 Oct 2016 14:35:47 +0000 (14:35 +0000)]
Merge "Revert "Revert "Temporarily blacklist 955-method-handles-smali.""" am: 4aed412037
am: 2dddbcf8b5

Change-Id: I8a04b6c7550e687056dc0372526f22701c2c5102

7 years agoMerge "Revert "Revert "Temporarily blacklist 955-method-handles-smali."""
Narayan Kamath [Fri, 14 Oct 2016 14:32:47 +0000 (14:32 +0000)]
Merge "Revert "Revert "Temporarily blacklist 955-method-handles-smali."""
am: 4aed412037

Change-Id: I08a858845b437178fadbe9e7c0b08ec7361be43d

7 years agoMerge "Revert "Revert "Temporarily blacklist 955-method-handles-smali."""
Narayan Kamath [Fri, 14 Oct 2016 14:29:03 +0000 (14:29 +0000)]
Merge "Revert "Revert "Temporarily blacklist 955-method-handles-smali."""

7 years agoRevert "Revert "Temporarily blacklist 955-method-handles-smali.""
Narayan Kamath [Fri, 14 Oct 2016 14:27:33 +0000 (14:27 +0000)]
Revert "Revert "Temporarily blacklist 955-method-handles-smali.""

This reverts commit
f18d84699a7c18802f9774069143c173c6b927fb.

Tests are red on the bot. Blacklisting until this is investigated further.

Change-Id: Ibb9b4066abe28e8625c4eed5e0818e6a3fdd4f44

7 years agoMerge "Revert "Temporarily blacklist 955-method-handles-smali."" am: 5a290d7f61 am...
Narayan Kamath [Fri, 14 Oct 2016 13:35:13 +0000 (13:35 +0000)]
Merge "Revert "Temporarily blacklist 955-method-handles-smali."" am: 5a290d7f61 am: 386faccaa6
am: a0473bc89f

Change-Id: I17bb797184a224fe3e8469a2737e167d7acfaacd

7 years agoMerge "Revert "Temporarily blacklist 955-method-handles-smali."" am: 5a290d7f61
Narayan Kamath [Fri, 14 Oct 2016 13:31:43 +0000 (13:31 +0000)]
Merge "Revert "Temporarily blacklist 955-method-handles-smali."" am: 5a290d7f61
am: 386faccaa6

Change-Id: I0bdfd464e79e82a9dbdf4c34ec0aed36e439b7b2

7 years agoMerge "Revert "Temporarily blacklist 955-method-handles-smali.""
Narayan Kamath [Fri, 14 Oct 2016 13:28:13 +0000 (13:28 +0000)]
Merge "Revert "Temporarily blacklist 955-method-handles-smali.""
am: 5a290d7f61

Change-Id: Iaa8b45b3ec848bc4c8b9e6b31dfdff0bf3699fa0

7 years agoMerge "Revert "Temporarily blacklist 955-method-handles-smali.""
Treehugger Robot [Fri, 14 Oct 2016 13:23:03 +0000 (13:23 +0000)]
Merge "Revert "Temporarily blacklist 955-method-handles-smali.""

7 years agoMerge "Small clean up in art::x86_64::ReadBarrierMarkSlowPathX86_64." am: 8de327e68b...
Roland Levillain [Fri, 14 Oct 2016 11:57:37 +0000 (11:57 +0000)]
Merge "Small clean up in art::x86_64::ReadBarrierMarkSlowPathX86_64." am: 8de327e68b am: f8764661e3
am: edc68b3b92

Change-Id: I770c26334b0158a5eb8645ae5b24eb6619959d01

7 years agoMerge "Small clean up in art::x86_64::ReadBarrierMarkSlowPathX86_64." am: 8de327e68b
Roland Levillain [Fri, 14 Oct 2016 11:54:06 +0000 (11:54 +0000)]
Merge "Small clean up in art::x86_64::ReadBarrierMarkSlowPathX86_64." am: 8de327e68b
am: f8764661e3

Change-Id: I91102c53424ab23485080c6bd66d34a25c832483

7 years agoMerge "Small clean up in art::x86_64::ReadBarrierMarkSlowPathX86_64."
Roland Levillain [Fri, 14 Oct 2016 11:51:06 +0000 (11:51 +0000)]
Merge "Small clean up in art::x86_64::ReadBarrierMarkSlowPathX86_64."
am: 8de327e68b

Change-Id: I00bde2d69b25c9746c766e40fbad4ba2d5ca0d50

7 years agoMerge "Small clean up in art::x86_64::ReadBarrierMarkSlowPathX86_64."
Roland Levillain [Fri, 14 Oct 2016 11:47:10 +0000 (11:47 +0000)]
Merge "Small clean up in art::x86_64::ReadBarrierMarkSlowPathX86_64."

7 years agoRevert "Temporarily blacklist 955-method-handles-smali."
Narayan Kamath [Thu, 13 Oct 2016 15:09:33 +0000 (16:09 +0100)]
Revert "Temporarily blacklist 955-method-handles-smali."

This reverts commit adc2ef25244645a650111560d252e32b3e22f463.

The test is green, now that the required smali changes have been
merged into aosp/master.

Test: make test-art-host
Change-Id: I63eed37470d1def3bafccdd00116d7b49a4c9c78

7 years agoMerge "interpreter: support for non-exact invokes." am: a3031162de am: ea5a6645e2
Narayan Kamath [Fri, 14 Oct 2016 10:32:02 +0000 (10:32 +0000)]
Merge "interpreter: support for non-exact invokes." am: a3031162de am: ea5a6645e2
am: b6990b5cce

Change-Id: Id19b761ee899adf12b5d96596f0e8f19441fe073

7 years agoMerge "interpreter: support for non-exact invokes." am: a3031162de
Narayan Kamath [Fri, 14 Oct 2016 10:25:31 +0000 (10:25 +0000)]
Merge "interpreter: support for non-exact invokes." am: a3031162de
am: ea5a6645e2

Change-Id: I029e5ee2814d6ac2d01179b25a66e9a01afacf35

7 years agoMerge "interpreter: support for non-exact invokes."
Narayan Kamath [Fri, 14 Oct 2016 10:22:01 +0000 (10:22 +0000)]
Merge "interpreter: support for non-exact invokes."
am: a3031162de

Change-Id: Iac078ad07d493d416c41e342767f18f9cef4f795

7 years agoMerge "interpreter: support for non-exact invokes."
Treehugger Robot [Fri, 14 Oct 2016 10:19:58 +0000 (10:19 +0000)]
Merge "interpreter: support for non-exact invokes."

7 years agoMerge "MIPS32: Improve integer comparison with constants." am: a497095b67 am: 1d40ab56db
Nicolas Geoffray [Fri, 14 Oct 2016 08:49:55 +0000 (08:49 +0000)]
Merge "MIPS32: Improve integer comparison with constants." am: a497095b67 am: 1d40ab56db
am: 8741865eaf

Change-Id: I1701e56691633f137511ad3b17244293f771e19c

7 years agoMerge "MIPS32: Improve integer comparison with constants." am: a497095b67
Nicolas Geoffray [Fri, 14 Oct 2016 08:45:55 +0000 (08:45 +0000)]
Merge "MIPS32: Improve integer comparison with constants." am: a497095b67
am: 1d40ab56db

Change-Id: I1906f34c34f26475085c22255ca25e6b8a19909e

7 years agoMerge "MIPS32: Improve integer comparison with constants."
Nicolas Geoffray [Fri, 14 Oct 2016 08:42:54 +0000 (08:42 +0000)]
Merge "MIPS32: Improve integer comparison with constants."
am: a497095b67

Change-Id: I863019dd5133f70b4e380c8663e6b752b13cfa26

7 years agointerpreter: support for non-exact invokes.
Narayan Kamath [Wed, 3 Aug 2016 11:46:58 +0000 (12:46 +0100)]
interpreter: support for non-exact invokes.

Performs primitive argument conversions as well as boxing and unboxing
operations. Support for return value conversions will be added in a
follow up change.

Test: make test-art-host

Change-Id: I2e3348ff64a5826e477f87c12a7d5c390eb3a653

7 years agoMerge "MIPS32: Improve integer comparison with constants."
Nicolas Geoffray [Fri, 14 Oct 2016 08:37:36 +0000 (08:37 +0000)]
Merge "MIPS32: Improve integer comparison with constants."

7 years agoMerge "jni: Add read barrier fast path to jni compiler" am: c8b722b3ce am: 1c39502cd5
Igor Murashkin [Fri, 14 Oct 2016 00:51:53 +0000 (00:51 +0000)]
Merge "jni: Add read barrier fast path to jni compiler" am: c8b722b3ce am: 1c39502cd5
am: e407d82c2f

Change-Id: I8322b063cc6bba95616dcd017671d86c39596289

7 years agoMerge "jni: Add read barrier fast path to jni compiler" am: c8b722b3ce
Igor Murashkin [Fri, 14 Oct 2016 00:46:53 +0000 (00:46 +0000)]
Merge "jni: Add read barrier fast path to jni compiler" am: c8b722b3ce
am: 1c39502cd5

Change-Id: I0bee904cb33d251d79a9c8a95d064a090b69e265

7 years agoMerge "jni: Add read barrier fast path to jni compiler"
Igor Murashkin [Fri, 14 Oct 2016 00:44:22 +0000 (00:44 +0000)]
Merge "jni: Add read barrier fast path to jni compiler"
am: c8b722b3ce

Change-Id: Ifbce9d77c408db9bb2a9b56216ce9a0e09a0b556

7 years agoMove mirror::ObjectArray to ObjPtr
Mathieu Chartier [Thu, 13 Oct 2016 20:48:23 +0000 (13:48 -0700)]
Move mirror::ObjectArray to ObjPtr

Also reduce calls to ObjPtr::Ptr.

Bug: 31113334

Test: test-art-host -j32

Change-Id: I73e1b356972bb079b66332f00f7f07451601044e

7 years agoMerge "jni: Add read barrier fast path to jni compiler"
Treehugger Robot [Fri, 14 Oct 2016 00:37:37 +0000 (00:37 +0000)]
Merge "jni: Add read barrier fast path to jni compiler"

7 years agoMerge "Move common throws to ObjPtr" am: 968c14bd6f am: 88f5dbbd54
Mathieu Chartier [Fri, 14 Oct 2016 00:02:20 +0000 (00:02 +0000)]
Merge "Move common throws to ObjPtr" am: 968c14bd6f am: 88f5dbbd54
am: 4f4ea7ef27

Change-Id: I9be745838676fd95534048b5622783844d4c9b6a

7 years agoMerge "Move common throws to ObjPtr" am: 968c14bd6f
Mathieu Chartier [Fri, 14 Oct 2016 00:00:20 +0000 (00:00 +0000)]
Merge "Move common throws to ObjPtr" am: 968c14bd6f
am: 88f5dbbd54

Change-Id: I783538772670a939c4dccc16b73150008475ba49

7 years agoMerge "Move common throws to ObjPtr"
Mathieu Chartier [Thu, 13 Oct 2016 23:57:49 +0000 (23:57 +0000)]
Merge "Move common throws to ObjPtr"
am: 968c14bd6f

Change-Id: I1c8dcfa9b32ccb963d8b60d7859968f16cc0a4bc

7 years agoMerge "Move common throws to ObjPtr"
Mathieu Chartier [Thu, 13 Oct 2016 23:52:45 +0000 (23:52 +0000)]
Merge "Move common throws to ObjPtr"

7 years agoMove common throws to ObjPtr
Mathieu Chartier [Thu, 13 Oct 2016 20:59:58 +0000 (13:59 -0700)]
Move common throws to ObjPtr

Also a few other throws. Removed some calls to ObjPtr::Ptr.

Test: test-art-host

Bug: 31113334

Change-Id: I4082d64134a5a8961489f4309522c28a30968a18

7 years agoMerge "Move mirror::Class to use ObjPtr" am: b18bfac8e9 am: 4b3615d4aa
Mathieu Chartier [Thu, 13 Oct 2016 20:19:03 +0000 (20:19 +0000)]
Merge "Move mirror::Class to use ObjPtr" am: b18bfac8e9 am: 4b3615d4aa
am: fc2d37fe84

Change-Id: I8c7741899385af1706f8860829aa3c03c949dfe7

7 years agoMerge "Move mirror::Class to use ObjPtr" am: b18bfac8e9
Mathieu Chartier [Thu, 13 Oct 2016 20:16:33 +0000 (20:16 +0000)]
Merge "Move mirror::Class to use ObjPtr" am: b18bfac8e9
am: 4b3615d4aa

Change-Id: I1768cb1804cddd1c0bf8525fe566ec2bfec25d19

7 years agoMerge "Move mirror::Class to use ObjPtr"
Mathieu Chartier [Thu, 13 Oct 2016 20:14:33 +0000 (20:14 +0000)]
Merge "Move mirror::Class to use ObjPtr"
am: b18bfac8e9

Change-Id: Id5e1457f2927301478b4e3efb0caafd21aa179bd

7 years agoMerge "Move mirror::Class to use ObjPtr"
Mathieu Chartier [Thu, 13 Oct 2016 20:08:36 +0000 (20:08 +0000)]
Merge "Move mirror::Class to use ObjPtr"

7 years agoMove mirror::Class to use ObjPtr
Mathieu Chartier [Tue, 4 Oct 2016 20:54:57 +0000 (13:54 -0700)]
Move mirror::Class to use ObjPtr

Leave the return types as non ObjPtr for now. Fixed moving GC bugs
in tests.

Test: test-art-host

Bug: 31113334

Change-Id: I5da1b5ac55dfbc5cc97a64be2c870ba9f512d9b0

7 years agojni: Add read barrier fast path to jni compiler
Igor Murashkin [Thu, 6 Oct 2016 21:59:19 +0000 (14:59 -0700)]
jni: Add read barrier fast path to jni compiler

Static method dispatch via JNI requires a read barrier
for the ArtMethod::GetDeclaringClass() load before adding it to the
JNI StackHandleScope.

We used to call ReadBarrierJni unconditionally but add a branch
to skip calling it if the GC is not currently in the marking phase.

Test: ART_USE_READ_BARRIER=true make test-art-host test-art-target
Bug: 30437917
Change-Id: I4f505ebde17c0a67209c7bb51b3f39e37a06373a

7 years agoSmall clean up in art::x86_64::ReadBarrierMarkSlowPathX86_64.
Roland Levillain [Thu, 13 Oct 2016 15:51:08 +0000 (16:51 +0100)]
Small clean up in art::x86_64::ReadBarrierMarkSlowPathX86_64.

Clearly separate art::x86_64::CpuRegister (register object
used by the x86-64 assembler) from art::x86_64::Register
(register number) in
art::x86_64::ReadBarrierMarkSlowPathX86_64::EmitNativeCode.

Test: ART_USE_READ_BARRIER=true make test-art-host
Bug: 12687968
Change-Id: I4300e9b9c16b18119d4e399092aa1c9543518ab5

7 years agoMerge "Fix optimizing_cfi_test and arm64 code generation." am: 6e5fa09510 am: 5e35ad4904
Nicolas Geoffray [Thu, 13 Oct 2016 15:34:40 +0000 (15:34 +0000)]
Merge "Fix optimizing_cfi_test and arm64 code generation." am: 6e5fa09510 am: 5e35ad4904
am: 8e8a855e28

Change-Id: I81a0f2f4664a194f3ad424d7852f47a1099057b8

7 years agoMerge "Fix optimizing_cfi_test and arm64 code generation." am: 6e5fa09510
Nicolas Geoffray [Thu, 13 Oct 2016 15:27:40 +0000 (15:27 +0000)]
Merge "Fix optimizing_cfi_test and arm64 code generation." am: 6e5fa09510
am: 5e35ad4904

Change-Id: Ic64b846efb2f47507c0ff5220b6cdbad30b3ddbd

7 years agoMerge "Fix optimizing_cfi_test and arm64 code generation."
Nicolas Geoffray [Thu, 13 Oct 2016 15:20:08 +0000 (15:20 +0000)]
Merge "Fix optimizing_cfi_test and arm64 code generation."
am: 6e5fa09510

Change-Id: I990f0d71c02fd5d66b4071d5ea0c6b0fb9527408

7 years agoMerge "Fix optimizing_cfi_test and arm64 code generation."
Nicolas Geoffray [Thu, 13 Oct 2016 15:09:30 +0000 (15:09 +0000)]
Merge "Fix optimizing_cfi_test and arm64 code generation."

7 years agoMerge "Fix missing symbols for multiple oat files case" am: ac4804fb36 am: 4c070c579f
Vladimir Marko [Thu, 13 Oct 2016 13:52:33 +0000 (13:52 +0000)]
Merge "Fix missing symbols for multiple oat files case" am: ac4804fb36 am: 4c070c579f
am: 49e7d8fb3b

Change-Id: Ibe444a67accab35656157cf314d60b26843b5a38

7 years agoMerge "Fix missing symbols for multiple oat files case" am: ac4804fb36
Vladimir Marko [Thu, 13 Oct 2016 13:45:03 +0000 (13:45 +0000)]
Merge "Fix missing symbols for multiple oat files case" am: ac4804fb36
am: 4c070c579f

Change-Id: I61f0292348da4f3f5b6d3e933cafd8de8cfc8195

7 years agoFix optimizing_cfi_test and arm64 code generation.
Nicolas Geoffray [Thu, 13 Oct 2016 12:42:30 +0000 (13:42 +0100)]
Fix optimizing_cfi_test and arm64 code generation.

Change https://android-review.googlesource.com/#/c/287582/ broke it.

test: m test-art-host-gtest-optimizing_cfi_test
test: m test-art-target on angler
Change-Id: I7fc74a87ffa0b26b8e103b87a2ac1179bea2145a

7 years agoMerge "Fix missing symbols for multiple oat files case"
Vladimir Marko [Thu, 13 Oct 2016 13:38:03 +0000 (13:38 +0000)]
Merge "Fix missing symbols for multiple oat files case"
am: ac4804fb36

Change-Id: Ic20dc84b90ed0964d12b63d6327c8487a19c4ce3

7 years agoMerge "Fix missing symbols for multiple oat files case"
Vladimir Marko [Thu, 13 Oct 2016 13:31:18 +0000 (13:31 +0000)]
Merge "Fix missing symbols for multiple oat files case"

7 years agoMerge "Generate SHA-1 build ID for host-generated *.oat files (1/2)." am: d82d4252f6...
David Srbecky [Thu, 13 Oct 2016 13:16:34 +0000 (13:16 +0000)]
Merge "Generate SHA-1 build ID for host-generated *.oat files (1/2)." am: d82d4252f6 am: 15a53292ca
am: 526674adfb

Change-Id: I0fe18b8e4a3db3898e8eb65d4f665ae2f5b91c3f

7 years agoMerge "Generate SHA-1 build ID for host-generated *.oat files (1/2)." am: d82d4252f6
David Srbecky [Thu, 13 Oct 2016 13:09:33 +0000 (13:09 +0000)]
Merge "Generate SHA-1 build ID for host-generated *.oat files (1/2)." am: d82d4252f6
am: 15a53292ca

Change-Id: Ieeaa15f8fc0262ff452ffff865e643524b8e034a

7 years agoMerge "Generate SHA-1 build ID for host-generated *.oat files (1/2)."
David Srbecky [Thu, 13 Oct 2016 13:02:34 +0000 (13:02 +0000)]
Merge "Generate SHA-1 build ID for host-generated *.oat files (1/2)."
am: d82d4252f6

Change-Id: I6ba51ae64bc6b732e70faedc1996b8687f5d2029

7 years agoMerge "Generate SHA-1 build ID for host-generated *.oat files (1/2)."
David Srbecky [Thu, 13 Oct 2016 12:52:31 +0000 (12:52 +0000)]
Merge "Generate SHA-1 build ID for host-generated *.oat files (1/2)."

7 years agoMerge "Update HInstruction::NeedsCurrentMethod." am: 68f1128b3f am: c44d516918
Nicolas Geoffray [Thu, 13 Oct 2016 10:43:53 +0000 (10:43 +0000)]
Merge "Update HInstruction::NeedsCurrentMethod." am: 68f1128b3f am: c44d516918
am: a206d58a06

Change-Id: I661a885a671cee7bdcfec06286c486331efe4e3b

7 years agoMerge "Update HInstruction::NeedsCurrentMethod." am: 68f1128b3f
Nicolas Geoffray [Thu, 13 Oct 2016 10:36:22 +0000 (10:36 +0000)]
Merge "Update HInstruction::NeedsCurrentMethod." am: 68f1128b3f
am: c44d516918

Change-Id: If5c28cb59f3de0405eaeab8069bac1959fb73b44

7 years agoMerge "Update HInstruction::NeedsCurrentMethod."
Nicolas Geoffray [Thu, 13 Oct 2016 10:28:51 +0000 (10:28 +0000)]
Merge "Update HInstruction::NeedsCurrentMethod."
am: 68f1128b3f

Change-Id: Ie5627b117e3ee11cb53f3781e9da6a7e7d327383

7 years agoMerge "ART: Disable test 906 for JIT" am: 7c750a2032 am: c67136c302
Nicolas Geoffray [Thu, 13 Oct 2016 10:21:51 +0000 (10:21 +0000)]
Merge "ART: Disable test 906 for JIT" am: 7c750a2032 am: c67136c302
am: 8dfb0bdcd7

Change-Id: I645f60042050ce33042fee7a150ade541c4e98b2

7 years agoMerge "Update HInstruction::NeedsCurrentMethod."
Nicolas Geoffray [Thu, 13 Oct 2016 10:15:52 +0000 (10:15 +0000)]
Merge "Update HInstruction::NeedsCurrentMethod."

7 years agoMerge "ART: Disable test 906 for JIT" am: 7c750a2032
Nicolas Geoffray [Thu, 13 Oct 2016 10:14:19 +0000 (10:14 +0000)]
Merge "ART: Disable test 906 for JIT" am: 7c750a2032
am: c67136c302

Change-Id: Ifa719009da93990525cb9238449070955f3bd714

7 years agoMerge "ART: Disable test 906 for JIT"
Nicolas Geoffray [Thu, 13 Oct 2016 10:07:20 +0000 (10:07 +0000)]
Merge "ART: Disable test 906 for JIT"
am: 7c750a2032

Change-Id: Ie6e7d0ff345a3d13ce917f5321006499952833b9

7 years agoMerge "ART: Disable test 906 for JIT"
Nicolas Geoffray [Thu, 13 Oct 2016 10:04:00 +0000 (10:04 +0000)]
Merge "ART: Disable test 906 for JIT"

7 years agoMerge "Revert "Revert "Remove dead code from compiler driver.""" am: dd58cb7451 am...
Nicolas Geoffray [Thu, 13 Oct 2016 08:41:15 +0000 (08:41 +0000)]
Merge "Revert "Revert "Remove dead code from compiler driver.""" am: dd58cb7451 am: 9fe4969138
am: 5c12632559

Change-Id: I52e70e8c606c6f7055655699acd68a64d3d448da

7 years agoMerge "Revert "Revert "Remove dead code from compiler driver.""" am: dd58cb7451
Nicolas Geoffray [Thu, 13 Oct 2016 08:34:16 +0000 (08:34 +0000)]
Merge "Revert "Revert "Remove dead code from compiler driver.""" am: dd58cb7451
am: 9fe4969138

Change-Id: I17375152b9e0157dca08e392ba634cfe7ee12b17

7 years agoMerge "Revert "Revert "Remove dead code from compiler driver."""
Nicolas Geoffray [Thu, 13 Oct 2016 08:27:15 +0000 (08:27 +0000)]
Merge "Revert "Revert "Remove dead code from compiler driver."""
am: dd58cb7451

Change-Id: I877d6316fe9fdf418f657d7a08b0e48c58e2b0ba

7 years agoMerge "Revert "Revert "Remove dead code from compiler driver."""
Nicolas Geoffray [Thu, 13 Oct 2016 08:13:49 +0000 (08:13 +0000)]
Merge "Revert "Revert "Remove dead code from compiler driver."""

7 years agoMerge "Move Heap::GetInstances to use Handles" am: 4c91f05a9a am: 7c01c29e32
Mathieu Chartier [Thu, 13 Oct 2016 04:32:32 +0000 (04:32 +0000)]
Merge "Move Heap::GetInstances to use Handles" am: 4c91f05a9a am: 7c01c29e32
am: 042f5ff1cf

Change-Id: Ib25610850522bcdc9389b6a7fdbecaa151ce964f

7 years agoMerge "Move Heap::GetInstances to use Handles" am: 4c91f05a9a
Mathieu Chartier [Thu, 13 Oct 2016 04:25:32 +0000 (04:25 +0000)]
Merge "Move Heap::GetInstances to use Handles" am: 4c91f05a9a
am: 7c01c29e32

Change-Id: If38a8bc5fdb71cf6124550c6a098e8fbed755cbe

7 years agoMerge "Move Heap::GetInstances to use Handles"
Mathieu Chartier [Thu, 13 Oct 2016 04:18:30 +0000 (04:18 +0000)]
Merge "Move Heap::GetInstances to use Handles"
am: 4c91f05a9a

Change-Id: I5d59078d3877b12d9def1a6fe3ad85118e5e7f06

7 years agoMerge "Move Heap::GetInstances to use Handles"
Mathieu Chartier [Thu, 13 Oct 2016 04:09:27 +0000 (04:09 +0000)]
Merge "Move Heap::GetInstances to use Handles"

7 years agoMove Heap::GetInstances to use Handles
Mathieu Chartier [Thu, 13 Oct 2016 02:37:59 +0000 (19:37 -0700)]
Move Heap::GetInstances to use Handles

Prevent moving GC bugs from VisitObjects. Fix JDWP tests.

Test: art/tools/run-jdwp-tests.sh '--mode=host' '--variant=X32' --debug

Bug: 31113334
Change-Id: Ie7f51f1980ec0c1eddc3b59c3e49564eacb3be85

7 years agoFix missing symbols for multiple oat files case
bowen_lai [Wed, 12 Oct 2016 05:28:55 +0000 (13:28 +0800)]
Fix missing symbols for multiple oat files case

Generate the missing symbols when enabling "--multi-image"

Test: m test-art-host-gtest-dex2oat_test
Change-Id: I0ae2fb552ecd741f0b06414bc4a37c2f93ce5389

7 years agoMIPS32: Improve integer comparison with constants.
Alexey Frunze [Fri, 16 Sep 2016 04:37:49 +0000 (21:37 -0700)]
MIPS32: Improve integer comparison with constants.

Test: booted MIPS32 in QEMU
Test: test-art-target-run-test-optimizing on CI20
Test: test-art-target-gtest on CI20

Change-Id: Icbe74099fdebc29a38055ef70d7f14eed770b0a7

7 years agoMerge "Use handles for GetReferringObjects" am: 000432d9a4 am: 40bf3da1d7
Mathieu Chartier [Thu, 13 Oct 2016 02:54:27 +0000 (02:54 +0000)]
Merge "Use handles for GetReferringObjects" am: 000432d9a4 am: 40bf3da1d7
am: b87e458fdd

Change-Id: I2963e1077f94f5020833ab4978583cdd582e15d9

7 years agoMerge "Use handles for GetReferringObjects" am: 000432d9a4
Mathieu Chartier [Thu, 13 Oct 2016 02:46:56 +0000 (02:46 +0000)]
Merge "Use handles for GetReferringObjects" am: 000432d9a4
am: 40bf3da1d7

Change-Id: Iae64d759c1fb74c6562cce6668ee6053f1bd58f9

7 years agoMerge "Use handles for GetReferringObjects"
Mathieu Chartier [Thu, 13 Oct 2016 02:40:25 +0000 (02:40 +0000)]
Merge "Use handles for GetReferringObjects"
am: 000432d9a4

Change-Id: I1d778b91f0964b562e06d9e898dcb68e8dedb3fc

7 years agoMerge "Use handles for GetReferringObjects"
Mathieu Chartier [Thu, 13 Oct 2016 02:30:43 +0000 (02:30 +0000)]
Merge "Use handles for GetReferringObjects"

7 years agoUse handles for GetReferringObjects
Mathieu Chartier [Thu, 13 Oct 2016 02:19:56 +0000 (19:19 -0700)]
Use handles for GetReferringObjects

Required since VisitObjects may cause thread suspension. Fixes
failing jdwp tests.

Test: test-art-host
Test: art/tools/run-jdwp-tests.sh '--mode=host' '--variant=X32' --debug

Bug: 31113334
Change-Id: Ic11780b3778c83e7812bc90c0723a293537f376c

7 years agoMerge "Fix moving GC bug in cloning finalizable objects" am: a9daa3a269 am: 928fbad217
Mathieu Chartier [Thu, 13 Oct 2016 01:54:51 +0000 (01:54 +0000)]
Merge "Fix moving GC bug in cloning finalizable objects" am: a9daa3a269 am: 928fbad217
am: c598ac6e01

Change-Id: I129ed7b3f664024292d38d6cc86bff8054486205

7 years agoMerge "Fix moving GC bug in cloning finalizable objects" am: a9daa3a269
Mathieu Chartier [Thu, 13 Oct 2016 01:47:51 +0000 (01:47 +0000)]
Merge "Fix moving GC bug in cloning finalizable objects" am: a9daa3a269
am: 928fbad217

Change-Id: Id91a7286e3be53009bebad4424060a39b19f5a88

7 years agoMerge "Fix moving GC bug in cloning finalizable objects"
Mathieu Chartier [Thu, 13 Oct 2016 01:40:50 +0000 (01:40 +0000)]
Merge "Fix moving GC bug in cloning finalizable objects"
am: a9daa3a269

Change-Id: Ie20377da6944a47e54e61b9074263ad683425d97

7 years agoMerge "Fix moving GC bug in cloning finalizable objects"
Mathieu Chartier [Thu, 13 Oct 2016 01:31:19 +0000 (01:31 +0000)]
Merge "Fix moving GC bug in cloning finalizable objects"

7 years agoART: Disable test 906 for JIT
Andreas Gampe [Thu, 13 Oct 2016 01:21:41 +0000 (18:21 -0700)]
ART: Disable test 906 for JIT

Suppress test which has potential allocations at inopportune
moments.

Bug: 31385354
Test: m ART_TEST_JIT=true test-art-host-run-test-906-iterate-heap
Change-Id: I137d5d2ba20b95ee4c4421e9da7526bee0c57d20

7 years agoMerge "Move registration into android package" am: 834a448aa9 am: 1ff03d7a77
Colin Cross [Thu, 13 Oct 2016 00:27:24 +0000 (00:27 +0000)]
Merge "Move registration into android package" am: 834a448aa9 am: 1ff03d7a77
am: 934173815f

Change-Id: I44e8a1e98fe6418597768c8da810d29cdeac5379

7 years agoMove registration into android package am: 96548c9ee0 am: 35d3a30a29
Colin Cross [Thu, 13 Oct 2016 00:27:15 +0000 (00:27 +0000)]
Move registration into android package am: 96548c9ee0 am: 35d3a30a29
am: cc484fb676

Change-Id: I13b0fee8920c0d4a83b284f0b2e1a14b78f74d9f

7 years agoMerge "Move registration into android package" am: 834a448aa9
Colin Cross [Thu, 13 Oct 2016 00:19:54 +0000 (00:19 +0000)]
Merge "Move registration into android package" am: 834a448aa9
am: 1ff03d7a77

Change-Id: I88e6f6e79a4af9dc619d05416583cc6564f0546c