OSDN Git Service
Brian Carlstrom [Mon, 17 Oct 2016 16:28:00 +0000 (16:28 +0000)]
Ensure OpenDexFilesFromImage closes file to prevent file descriptor leak am:
645e477c2c
am:
2a539ab099 -s ours
Change-Id: Id97767ca9a7bcff283b81f48cd196581f0bf474e
Brian Carlstrom [Mon, 17 Oct 2016 15:34:28 +0000 (15:34 +0000)]
Merge "Ensure OpenDexFilesFromImage closes file to prevent file descriptor leak" am:
498e122d91
am:
1db0494e79
Change-Id: Ibe4cfed96fdb096d631edfa98fe0d73c948be639
Brian Carlstrom [Mon, 17 Oct 2016 15:27:27 +0000 (15:27 +0000)]
Merge "Ensure OpenDexFilesFromImage closes file to prevent file descriptor leak"
am:
498e122d91
Change-Id: I81421af3d75d9febeaafbd9256fd30f64534b45b
Brian Carlstrom [Mon, 17 Oct 2016 15:27:26 +0000 (15:27 +0000)]
Ensure OpenDexFilesFromImage closes file to prevent file descriptor leak
am:
645e477c2c
Change-Id: I071d7c8a53641981673387295c51757e5e18e635
Vladimir Marko [Mon, 17 Oct 2016 15:20:26 +0000 (15:20 +0000)]
Merge "Add DCHECK() for class loader in artResolveStringFromCode()." am:
174d17b2f7
am:
f0a4206b65
Change-Id: I167010c532cc327a603f12508991f3cd08e4b925
Brian Carlstrom [Mon, 17 Oct 2016 15:18:09 +0000 (15:18 +0000)]
Merge "Ensure OpenDexFilesFromImage closes file to prevent file descriptor leak"
Vladimir Marko [Mon, 17 Oct 2016 15:14:26 +0000 (15:14 +0000)]
Merge "Add DCHECK() for class loader in artResolveStringFromCode()."
am:
174d17b2f7
Change-Id: Ia4c9dcf9ebdd048e4d94bbaef38b494307badecf
Vladimir Marko [Mon, 17 Oct 2016 15:08:21 +0000 (15:08 +0000)]
Merge "Add DCHECK() for class loader in artResolveStringFromCode()."
Vladimir Marko [Mon, 17 Oct 2016 12:42:17 +0000 (12:42 +0000)]
Merge "Do not write empty class table and intern table to image." am:
8c0fee9ca3
am:
421c04f1d9
Change-Id: I554535707c7ef85ae4a2882d4958fc68d55c3545
Vladimir Marko [Mon, 17 Oct 2016 12:35:45 +0000 (12:35 +0000)]
Merge "Do not write empty class table and intern table to image."
am:
8c0fee9ca3
Change-Id: I50675595a41193704e4387c0e069606960278ffd
Vladimir Marko [Mon, 17 Oct 2016 12:27:55 +0000 (12:27 +0000)]
Merge "Do not write empty class table and intern table to image."
Andreas Gampe [Sat, 15 Oct 2016 04:18:16 +0000 (04:18 +0000)]
Merge "ART: Blacklist test 907 for target" am:
a3344e8349
am:
254e06988b
Change-Id: Ifd65d421b157556c2d00ad90f6a2c8d8999260a7
Andreas Gampe [Sat, 15 Oct 2016 04:13:45 +0000 (04:13 +0000)]
Merge "ART: Blacklist test 907 for target"
am:
a3344e8349
Change-Id: I533f915a89e08baff2b3628eb0e0ff2824bcfecc
Treehugger Robot [Sat, 15 Oct 2016 04:06:52 +0000 (04:06 +0000)]
Merge "ART: Blacklist test 907 for target"
Andreas Gampe [Sat, 15 Oct 2016 02:14:24 +0000 (02:14 +0000)]
Merge changes If95ecaf4,Ifb33cae2 am:
06a421d7d2
am:
5d47b852dc
Change-Id: I080e9d702f0e6c9be73d09426b309641663e45d1
Andreas Gampe [Sat, 15 Oct 2016 02:14:15 +0000 (02:14 +0000)]
ART: Temporarily use global references for GetLoadedClasses am:
d2d0353de9
am:
1ea6716933
Change-Id: Ie1187afca733780440764edb6067c5c0a1c3964d
Andreas Gampe [Sat, 15 Oct 2016 02:14:07 +0000 (02:14 +0000)]
ART: Add GetLoadedClasses support am:
aa8b60c23a
am:
27537221f1
Change-Id: I012ff133e385d16f1a2de8c7496d6160dcebfc09
Andreas Gampe [Sat, 15 Oct 2016 02:09:47 +0000 (02:09 +0000)]
Merge changes If95ecaf4,Ifb33cae2
am:
06a421d7d2
Change-Id: I199a19e497d8172979bf6b11abc8d6728b236062
Andreas Gampe [Sat, 15 Oct 2016 02:09:46 +0000 (02:09 +0000)]
ART: Temporarily use global references for GetLoadedClasses
am:
d2d0353de9
Change-Id: Ibb4a91c0242c05403e34c6a831dd19dcf8657aa8
Andreas Gampe [Sat, 15 Oct 2016 02:09:38 +0000 (02:09 +0000)]
ART: Add GetLoadedClasses support
am:
aa8b60c23a
Change-Id: I550a10a4ad9d204dc3e1a54935c80b5a28eded7f
Andreas Gampe [Sat, 15 Oct 2016 02:05:06 +0000 (19:05 -0700)]
ART: Blacklist test 907 for target
Bug:
31684578
Test: m test-art-host
Change-Id: If2353bef8601ba16941a7b1df2befc215b493431
Treehugger Robot [Sat, 15 Oct 2016 02:02:37 +0000 (02:02 +0000)]
Merge changes If95ecaf4,Ifb33cae2
* changes:
ART: Temporarily use global references for GetLoadedClasses
ART: Add GetLoadedClasses support
Andreas Gampe [Sat, 15 Oct 2016 01:17:33 +0000 (01:17 +0000)]
Merge "ART: Make JNI global and weak global locks global" am:
6021426926
am:
dbee3034fa
Change-Id: I72fd14e9bbe005fea7a5115e0b6b05149b367a68
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
Treehugger Robot [Sat, 15 Oct 2016 01:08:46 +0000 (01:08 +0000)]
Merge "ART: Make JNI global and weak global locks global"
Brian Carlstrom [Fri, 14 Oct 2016 08:04:26 +0000 (01:04 -0700)]
Ensure OpenDexFilesFromImage closes file to prevent file descriptor leak
(cherry picked from commit
645e477c2ce7a59ac98bc86463826cf082a13ad8)
Test: m -j32 test-art-host
Bug:
32095919
Change-Id: I44541edeb403a508e1b9794ee09fb1f55e3f42bf
Brian Carlstrom [Fri, 14 Oct 2016 08:04:26 +0000 (01:04 -0700)]
Ensure OpenDexFilesFromImage closes file to prevent file descriptor leak
Test: m -j32 test-art-host
Bug:
32095919
Change-Id: I44541edeb403a508e1b9794ee09fb1f55e3f42bf
Mathieu Chartier [Fri, 14 Oct 2016 23:48:56 +0000 (23:48 +0000)]
Merge "Move reference processor and mirror::Reference to ObjPtr" am:
f434243775
am:
612e3e5f48
Change-Id: Ic89adfc9e5fd5f3e3960a84c4fe4337b32c97909
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
Mathieu Chartier [Fri, 14 Oct 2016 23:40:46 +0000 (23:40 +0000)]
Merge "Move reference processor and mirror::Reference to ObjPtr"
Hiroshi Yamauchi [Fri, 14 Oct 2016 21:58:48 +0000 (21:58 +0000)]
Merge "Add a mark bit check in the read barrier jni entrypoint." am:
3cf26cfd67
am:
2d619d42c5
Change-Id: I99b72c80877a558d14caa4e836bbc960e90eca7c
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
Andreas Gampe [Fri, 14 Oct 2016 20:30:56 +0000 (13:30 -0700)]
ART: Temporarily use global references for GetLoadedClasses
Until we have enough local references, use global references.
Bug:
31684578
Bug:
32125344
Test: m test-art-host
Change-Id: If95ecaf424cfc7e8a84c7f99b071ac5d6bfb7797
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
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
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."
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
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
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
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
Mathieu Chartier [Fri, 14 Oct 2016 16:58:56 +0000 (16:58 +0000)]
Merge "Move mirror::ObjectArray to ObjPtr"
am:
cfdff144f1
Change-Id: Ib0982b1e17f5dda5bd49b6c6e585587aabe3f65a
Mathieu Chartier [Fri, 14 Oct 2016 16:54:05 +0000 (16:54 +0000)]
Merge "Move mirror::ObjectArray to ObjPtr"
Vladimir Marko [Fri, 14 Oct 2016 15:28:52 +0000 (16:28 +0100)]
Add DCHECK() for class loader in artResolveStringFromCode().
Address late comment from
https://android-review.googlesource.com/281642
Test: m test-art-host
Bug:
20323084
Bug:
30627598
Change-Id: I3ba2617d2bc52ac8ba11307d206e6f5e6c017fb7
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
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
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
Narayan Kamath [Fri, 14 Oct 2016 14:29:03 +0000 (14:29 +0000)]
Merge "Revert "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
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
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
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
Treehugger Robot [Fri, 14 Oct 2016 13:23:03 +0000 (13:23 +0000)]
Merge "Revert "Temporarily blacklist 955-method-handles-smali.""
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
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
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
Roland Levillain [Fri, 14 Oct 2016 11:47:10 +0000 (11:47 +0000)]
Merge "Small clean up in art::x86_64::ReadBarrierMarkSlowPathX86_64."
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
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
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
Vladimir Marko [Thu, 13 Oct 2016 11:53:15 +0000 (12:53 +0100)]
Do not write empty class table and intern table to image.
And remove dead ClassLinker and InternTable code that would
be erroneously triggered by not writing the tables.
Test: m test-art-host
Change-Id: I2520daa8d1231e16112d44e364a72d782fa32527
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
Treehugger Robot [Fri, 14 Oct 2016 10:19:58 +0000 (10:19 +0000)]
Merge "interpreter: support for non-exact invokes."
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
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
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
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
Nicolas Geoffray [Fri, 14 Oct 2016 08:37:36 +0000 (08:37 +0000)]
Merge "MIPS32: Improve integer comparison with constants."
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
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
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
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
Treehugger Robot [Fri, 14 Oct 2016 00:37:37 +0000 (00:37 +0000)]
Merge "jni: Add read barrier fast path to jni compiler"
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
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
Mathieu Chartier [Thu, 13 Oct 2016 23:57:49 +0000 (23:57 +0000)]
Merge "Move common throws to ObjPtr"
am:
968c14bd6f
Change-Id: I1c8dcfa9b32ccb963d8b60d7859968f16cc0a4bc
Mathieu Chartier [Thu, 13 Oct 2016 23:52:45 +0000 (23:52 +0000)]
Merge "Move 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
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
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
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
Mathieu Chartier [Thu, 13 Oct 2016 20:08:36 +0000 (20:08 +0000)]
Merge "Move 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
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
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
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
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
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
Nicolas Geoffray [Thu, 13 Oct 2016 15:09:30 +0000 (15:09 +0000)]
Merge "Fix optimizing_cfi_test and arm64 code generation."
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
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
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
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
Vladimir Marko [Thu, 13 Oct 2016 13:31:18 +0000 (13:31 +0000)]
Merge "Fix missing symbols for multiple oat files case"
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
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
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
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)."
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
Nicolas Geoffray [Thu, 13 Oct 2016 10:36:22 +0000 (10:36 +0000)]
Merge "Update HInstruction::NeedsCurrentMethod." am:
68f1128b3f
am:
c44d516918
Change-Id: If5c28cb59f3de0405eaeab8069bac1959fb73b44
Nicolas Geoffray [Thu, 13 Oct 2016 10:28:51 +0000 (10:28 +0000)]
Merge "Update HInstruction::NeedsCurrentMethod."
am:
68f1128b3f
Change-Id: Ie5627b117e3ee11cb53f3781e9da6a7e7d327383
OSDN Git Service
