OSDN Git Service
Andreas Gampe [Tue, 11 Oct 2016 00:59:20 +0000 (00:59 +0000)]
Merge "ART: Add allocation callback" am:
f24ddb28eb
am:
de967edf69
Change-Id: I158b0aec095950f4f4655b1b0a11791155bcb9b6
Andreas Gampe [Tue, 11 Oct 2016 00:53:50 +0000 (00:53 +0000)]
Merge "ART: Add allocation callback"
am:
f24ddb28eb
Change-Id: I1f565590fc884312c40b279ac9ea8d0798d2f396
Andreas Gampe [Tue, 11 Oct 2016 00:43:31 +0000 (00:43 +0000)]
Merge "ART: Add allocation callback"
Andreas Gampe [Mon, 10 Oct 2016 23:50:17 +0000 (23:50 +0000)]
Merge "ART: Switch to name-based IMT hashing" am:
a6bfd5f8e5
am:
3c1ddc541e
Change-Id: I95cef95c949f9629d912370ce10dd5a5022a8d0e
Andreas Gampe [Mon, 10 Oct 2016 23:44:46 +0000 (23:44 +0000)]
Merge "ART: Switch to name-based IMT hashing"
am:
a6bfd5f8e5
Change-Id: I5d3f934b8ffdd11a29a9f38710376169fb267b1a
Treehugger Robot [Mon, 10 Oct 2016 23:39:05 +0000 (23:39 +0000)]
Merge "ART: Switch to name-based IMT hashing"
Andreas Gampe [Tue, 27 Sep 2016 19:19:45 +0000 (12:19 -0700)]
ART: Switch to name-based IMT hashing
Use a hash scheme based on the name. This keeps IMT slots stable
when dex tables change.
This incurs a severe performance penalty for computing the slot.
Measurements on host degraded from 30ns to an average of 85mus.
However, calls in compiled code will not incur this overhead.
Added a test comparing similar interfaces in similar dex files.
Bug:
31594153
Test: test-art-host
Change-Id: Ibb86679ee94bec561984ea25826e56b1a7964cd0
Hiroshi Yamauchi [Mon, 10 Oct 2016 21:28:05 +0000 (21:28 +0000)]
Merge "Avoid ThreadStress timeout with art-read-barrier-table-lookup." am:
f95054f489
am:
54f60d6da7
Change-Id: Ib7e6ec12402a3644583e21fed23ecb2677891f61
Andreas Gampe [Mon, 10 Oct 2016 21:27:50 +0000 (21:27 +0000)]
Merge "ART: Add event callback support" am:
ed63aad1a7
am:
5119324986
Change-Id: I6d3e645e517b7bf479475a3565aef89df2bcb329
Bill Buzbee [Mon, 10 Oct 2016 21:27:37 +0000 (21:27 +0000)]
Merge "mterp: Placeholder support for invoke-polymorphic" am:
4404fb30fa
am:
c98a0c3e4f
Change-Id: Ibe077fadb214e9607f594034f758be838c871752
Hiroshi Yamauchi [Mon, 10 Oct 2016 21:12:40 +0000 (21:12 +0000)]
Merge "Avoid ThreadStress timeout with art-read-barrier-table-lookup."
am:
f95054f489
Change-Id: Icb8a5915b1649d2abe9b5ee7080842bf547859b2
Andreas Gampe [Mon, 10 Oct 2016 21:12:27 +0000 (21:12 +0000)]
Merge "ART: Add event callback support"
am:
ed63aad1a7
Change-Id: Ic8517b91e9e37001df5bb319130243f32e54eca3
Bill Buzbee [Mon, 10 Oct 2016 21:12:13 +0000 (21:12 +0000)]
Merge "mterp: Placeholder support for invoke-polymorphic"
am:
4404fb30fa
Change-Id: I8149023ef9a46c29f61710cacc7c99bef6e84f0d
Hiroshi Yamauchi [Mon, 10 Oct 2016 20:42:18 +0000 (20:42 +0000)]
Merge "Avoid ThreadStress timeout with art-read-barrier-table-lookup."
Treehugger Robot [Mon, 10 Oct 2016 20:37:52 +0000 (20:37 +0000)]
Merge "ART: Add event callback support"
Andreas Gampe [Fri, 7 Oct 2016 22:05:24 +0000 (15:05 -0700)]
ART: Add allocation callback
Bug:
31684277
Test: m test-art-host
Change-Id: I959f44e23ca5fe55ed678315708895faf0aadb04
Bill Buzbee [Mon, 10 Oct 2016 20:27:34 +0000 (20:27 +0000)]
Merge "mterp: Placeholder support for invoke-polymorphic"
Nicolas Geoffray [Mon, 10 Oct 2016 08:52:27 +0000 (08:52 +0000)]
Merge "MIPS64: Fix art_quick_aput_obj stubs" am:
5065b09332
am:
669a9b8491
Change-Id: Ic1e058322dca6dac1b24521f326af14fa37b5455
Nicolas Geoffray [Mon, 10 Oct 2016 08:46:55 +0000 (08:46 +0000)]
Merge "MIPS64: Fix art_quick_aput_obj stubs"
am:
5065b09332
Change-Id: Ieb5d20974275cfb5f48f2d76f92180f2b93351f2
Nicolas Geoffray [Mon, 10 Oct 2016 08:34:17 +0000 (08:34 +0000)]
Merge "MIPS64: Fix art_quick_aput_obj stubs"
Andreas Gampe [Fri, 7 Oct 2016 18:48:21 +0000 (11:48 -0700)]
ART: Add event callback support
Add basic event callback support infrastructure. Actual users will
follow.
Bug:
31684920
Test: m test-art-host
Change-Id: Ic496933ef3a94f9d27a2779b7f4fdc5b096eab22
Hiroshi Yamauchi [Sat, 8 Oct 2016 00:07:03 +0000 (17:07 -0700)]
Avoid ThreadStress timeout with art-read-barrier-table-lookup.
Disable MarkFromReadBarrierWithMeasurements for
art-read-barrier-table-lookup to avoid slowdown as it takes more read
barrier slow paths than art-read-barrier.
Increase the timeout.
Bug:
31679493
Bug:
12687968
Test: test-art-host with ART_READ_BARRIER_TYPE=TABLELOOKUP
Change-Id: I1a87864448e28099e522dc7fedce2208189248f2
buzbee [Fri, 7 Oct 2016 19:56:32 +0000 (12:56 -0700)]
mterp: Placeholder support for invoke-polymorphic
Force the mterp assembly interpreters to fall back to the
reference switch interpreter for invoke-polymorphic and
invoke-polymorphic-range while those new opcodes are under
development.
Test: test-art-host
Change-Id: I6167432164bd869c91d0804521d5edc9549f622e
Mathieu Chartier [Fri, 7 Oct 2016 19:54:10 +0000 (19:54 +0000)]
Merge "Use word copying for CopyObject" am:
f361a29848
am:
319739ce5c
Change-Id: Ib4232e4fcb247950ad2d42e3e7d475f7231defb6
Mathieu Chartier [Fri, 7 Oct 2016 19:50:11 +0000 (19:50 +0000)]
Merge "Use word copying for CopyObject"
am:
f361a29848
Change-Id: I1aa32d2e9102818da1ca14cb1f66f4781b76749a
Mathieu Chartier [Fri, 7 Oct 2016 19:45:02 +0000 (19:45 +0000)]
Merge "Use word copying for CopyObject"
Mathieu Chartier [Fri, 7 Oct 2016 17:51:53 +0000 (10:51 -0700)]
Use word copying for CopyObject
Prevent word tearing.
Bug:
32012820
Test: test-art-host
Change-Id: Ie3d5817f3bdf49e0d949caeccd7cd3512d61bdf7
Mathieu Chartier [Fri, 7 Oct 2016 17:08:01 +0000 (17:08 +0000)]
Merge "Move mirror::Object setters to ObjPtr" am:
0d7398fd54
am:
153b83e8da
Change-Id: I813b4b90b3ff65f9f0c9daa61cc3717972968c71
Mathieu Chartier [Fri, 7 Oct 2016 17:04:01 +0000 (17:04 +0000)]
Merge "Move mirror::Object setters to ObjPtr"
am:
0d7398fd54
Change-Id: I0b01e829b2653192c1c8f6839757c5c648ebc33f
Aart Bik [Fri, 7 Oct 2016 16:58:59 +0000 (16:58 +0000)]
Merge "Improved and simplified loop optimizations." am:
6ed8fc7a68
am:
c9550a70a4
Change-Id: Ia3e24acdd7fbc4c72e460c42c2f290e0608011a7
Mathieu Chartier [Fri, 7 Oct 2016 16:57:40 +0000 (16:57 +0000)]
Merge "Move mirror::Object setters to ObjPtr"
Aart Bik [Fri, 7 Oct 2016 16:55:00 +0000 (16:55 +0000)]
Merge "Improved and simplified loop optimizations."
am:
6ed8fc7a68
Change-Id: Ia0364c2b78ea63ba55e345fc0decdfdca8c35dcd
Treehugger Robot [Fri, 7 Oct 2016 16:51:06 +0000 (16:51 +0000)]
Merge "Improved and simplified loop optimizations."
Goran Jakovljevic [Fri, 7 Oct 2016 15:03:28 +0000 (17:03 +0200)]
MIPS64: Fix art_quick_aput_obj stubs
Prevent situations where $gp is calculated and saved twice in a row
without restoring it. When restored in the end, its value was wrong.
This fixes test failure in stub_test.APutObj.
Test: mma test-art-target-gtest-stub_test64 on QEMU
Change-Id: I63b37ecee8d3576c57c0f6862d00bc03965b042d
David Sehr [Fri, 7 Oct 2016 15:16:24 +0000 (15:16 +0000)]
Merge "Add "fixups" for ids referenced in code" am:
f13f84fd9f
am:
2ccb5bfecb
Change-Id: I66ffeeae10c6c6deb408a20a5bb5ad86e3bcf97d
Aart Bik [Thu, 6 Oct 2016 18:36:57 +0000 (11:36 -0700)]
Improved and simplified loop optimizations.
Rationale:
This CL merges some common cases into one, thereby simplifying
the code quite a bit. It also prepares for more general induction
cycles (rather than the simple phi-add currently used). Finally,
it generalizes the closed form elimination with empty loops.
As a result of the latter, elaborate but weird code like:
private static int waterFall() {
int i = 0;
for (; i < 10; i++);
for (; i < 20; i++);
for (; i < 30; i++);
for (; i < 40; i++);
for (; i < 50; i++);
return i;
}
now becomes just this (on x86)!
mov eax, 50
ret
Change-Id: I8d22ce63ce9696918f57bb90f64d9a9303a4791d
Test: m test-art-host
David Sehr [Fri, 7 Oct 2016 15:12:53 +0000 (15:12 +0000)]
Merge "Add "fixups" for ids referenced in code"
am:
f13f84fd9f
Change-Id: I252b79028d723ceff1d552c5758c969a6b68b7c3
David Sehr [Fri, 7 Oct 2016 15:10:06 +0000 (15:10 +0000)]
Merge "Add "fixups" for ids referenced in code"
Nicolas Geoffray [Fri, 7 Oct 2016 08:52:01 +0000 (08:52 +0000)]
Merge "Blacklist test 903." am:
2dacb1da03
am:
22ab7a89cb
Change-Id: Ifc41ca1855ef107525c51510d5eac76b201af836
Nicolas Geoffray [Fri, 7 Oct 2016 08:48:01 +0000 (08:48 +0000)]
Merge "Blacklist test 903."
am:
2dacb1da03
Change-Id: Iaac0e6471def2421dca5b77cb4d947389b8195cb
Nicolas Geoffray [Fri, 7 Oct 2016 08:41:37 +0000 (08:41 +0000)]
Merge "Blacklist test 903."
Nicolas Geoffray [Fri, 7 Oct 2016 08:29:20 +0000 (09:29 +0100)]
Blacklist test 903.
bug:
31681198
Change-Id: I2d5578242d594be791aedd99266263ec53182d77
Mathieu Chartier [Fri, 7 Oct 2016 00:41:06 +0000 (00:41 +0000)]
Merge "Move remaining jobject related functions to use ObjPtr" am:
81ca05d930
am:
9a160f64c9
Change-Id: I8a0fa5a09032d5dc701f294df3ceaff6751e095c
Mathieu Chartier [Fri, 7 Oct 2016 00:37:35 +0000 (00:37 +0000)]
Merge "Move remaining jobject related functions to use ObjPtr"
am:
81ca05d930
Change-Id: Ic7e25af0f020ab4d0a33aa9b06596602ed428908
Mathieu Chartier [Fri, 7 Oct 2016 00:31:27 +0000 (00:31 +0000)]
Merge "Move remaining jobject related functions to use ObjPtr"
David Sehr [Fri, 7 Oct 2016 00:09:32 +0000 (17:09 -0700)]
Add "fixups" for ids referenced in code
Allow better visualization by determining which type_id, string_id,
method_id, and field_id values are used by code_items.
Bug:
29921113
Change-Id: Ia6ff72064104cd5c0868e972ca65536dbeb37b09
Test: dexlayout -s {some favorite apks}
Mathieu Chartier [Thu, 6 Oct 2016 22:13:58 +0000 (15:13 -0700)]
Move mirror::Object setters to ObjPtr
Bug:
31113334
Test: test-art-host
Change-Id: I2c4c84645e194c3c435a4a6fd670176b0e98671f
Andreas Gampe [Thu, 6 Oct 2016 22:35:56 +0000 (22:35 +0000)]
Merge "ART: Register object tagging table" am:
a2dca22534
am:
adf7b717d6
Change-Id: I3db3bb0c55a88a8771342f4d21c145dc7cd22fec
Andreas Gampe [Thu, 6 Oct 2016 22:31:56 +0000 (22:31 +0000)]
Merge "ART: Register object tagging table"
am:
a2dca22534
Change-Id: Ia95c94f63a7f8468588d45951e08279cb2ecfef2
Andreas Gampe [Thu, 6 Oct 2016 22:26:42 +0000 (22:26 +0000)]
Merge "ART: Register object tagging table"
Mathieu Chartier [Thu, 6 Oct 2016 01:32:08 +0000 (18:32 -0700)]
Move remaining jobject related functions to use ObjPtr
Also added ObjPtr::DownCast.
Bug:
31113334
Test: test-art-host
Change-Id: I59c253211dc435579ffdfd49f856861ab13d262c
Andreas Gampe [Thu, 6 Oct 2016 20:13:30 +0000 (13:13 -0700)]
ART: Register object tagging table
Actually register object tagging table with the runtime so it
gets swept properly.
Bug:
31385027
Test: m test-art-host
Test: m ART_USE_READ_BARRIER=true test-art-host
Change-Id: I4364458ece2893e6a85fe7518df39fb838199f20
Igor Murashkin [Thu, 6 Oct 2016 19:33:44 +0000 (19:33 +0000)]
Merge "test: Fix jni_compiler_test for const correctness" am:
2b31c0ac03
am:
c64c485078
Change-Id: I1009714d699b3b4cba0ac2ade3085d3007d51d1d
Igor Murashkin [Thu, 6 Oct 2016 19:30:45 +0000 (19:30 +0000)]
Merge "test: Fix jni_compiler_test for const correctness"
am:
2b31c0ac03
Change-Id: Ib428bf1ad3bb99723caba8c932c6912bf4b5024a
Treehugger Robot [Thu, 6 Oct 2016 19:27:59 +0000 (19:27 +0000)]
Merge "test: Fix jni_compiler_test for const correctness"
Mathieu Chartier [Thu, 6 Oct 2016 18:31:09 +0000 (18:31 +0000)]
Merge "Allow early abort logging" am:
18f7de841f
am:
af1f4c92a4
Change-Id: I71139a1ef20b53b0cdb572cdb3feed114633c5b0
Andreas Gampe [Thu, 6 Oct 2016 18:30:55 +0000 (18:30 +0000)]
Merge "ART: Support object tagging" am:
83805a2c02
am:
ae54c0ed55
Change-Id: I811150e2a0817466f387d562b4f1292d63c3a7c1
Mathieu Chartier [Thu, 6 Oct 2016 18:30:42 +0000 (18:30 +0000)]
Merge "ObjPtr misc cleanup" am:
db8eed0fa5
am:
54fa4375d3
Change-Id: Idbf9406cbffa721294d45351ee6ab862a7917ad5
Mathieu Chartier [Thu, 6 Oct 2016 18:27:40 +0000 (18:27 +0000)]
Merge "Allow early abort logging"
am:
18f7de841f
Change-Id: I440edc8dcf2daa1a6eea1e9c2beb674d5d0160f7
Andreas Gampe [Thu, 6 Oct 2016 18:27:26 +0000 (18:27 +0000)]
Merge "ART: Support object tagging"
am:
83805a2c02
Change-Id: I9b5e8d52f20c97508e74642cc3f5fa2c5f0c42a2
Mathieu Chartier [Thu, 6 Oct 2016 18:27:11 +0000 (18:27 +0000)]
Merge "ObjPtr misc cleanup"
am:
db8eed0fa5
Change-Id: I819d4147416c486ae1b2e35585f72a798a29dfe4
Treehugger Robot [Thu, 6 Oct 2016 18:24:19 +0000 (18:24 +0000)]
Merge "Allow early abort logging"
Treehugger Robot [Thu, 6 Oct 2016 18:24:03 +0000 (18:24 +0000)]
Merge "ART: Support object tagging"
Treehugger Robot [Thu, 6 Oct 2016 18:22:32 +0000 (18:22 +0000)]
Merge "ObjPtr misc cleanup"
Igor Murashkin [Thu, 6 Oct 2016 17:51:11 +0000 (10:51 -0700)]
test: Fix jni_compiler_test for const correctness
Change-Id: Id0ea8f18f8fac3cf884a43a2ae6448bb0221209a
Hiroshi Yamauchi [Thu, 6 Oct 2016 17:32:08 +0000 (17:32 +0000)]
Merge "Temporarily add debug logging for b/
31357497" am:
54aaba2420
am:
75034cdde3
Change-Id: I0b5f925a90f986418c7b681b3e41bb433ebc6b38
Hiroshi Yamauchi [Thu, 6 Oct 2016 17:29:07 +0000 (17:29 +0000)]
Merge "Temporarily add debug logging for b/
31357497"
am:
54aaba2420
Change-Id: I3f2741c058832f413fa28f1ef342f1a8f13ce6df
Hiroshi Yamauchi [Thu, 6 Oct 2016 17:19:17 +0000 (17:19 +0000)]
Merge "Temporarily add debug logging for b/
31357497"
Neil Fuller [Thu, 6 Oct 2016 09:03:08 +0000 (09:03 +0000)]
Merge "Revert "Blacklist flaky test."" am:
6e9854e4df
am:
cea79bb3e8
Change-Id: I0e4f5181717a03de5316ff8859cd27a7efae6abf
Neil Fuller [Thu, 6 Oct 2016 08:59:37 +0000 (08:59 +0000)]
Merge "Revert "Blacklist flaky test.""
am:
6e9854e4df
Change-Id: I42572b4eb6f2fc4b33121896ae63b45b42d428db
Neil Fuller [Thu, 6 Oct 2016 08:55:03 +0000 (08:55 +0000)]
Merge "Revert "Blacklist flaky test.""
Neil Fuller [Thu, 6 Oct 2016 08:40:07 +0000 (08:40 +0000)]
Revert "Blacklist flaky test."
Reverts the blacklisting of NetworkSecurityPolicyTest
#testCleartextTrafficPolicyWithJarHttpURLConnection.
This reverts commit
71ceb721240d50d396ea1a61a2bf2832be345007.
Bug:
31944681
Change-Id: Ib0f13cfec021e258ceba480c43cced59c554b3f5
Hiroshi Yamauchi [Thu, 6 Oct 2016 03:06:14 +0000 (03:06 +0000)]
Merge "Fix a deadlock between thread flip and suspend request." am:
81c6c8e6de
am:
d33bd5f68c
Change-Id: I813558eff9ca2ac09507f80cc77e96d6d0e3f922
Hiroshi Yamauchi [Thu, 6 Oct 2016 03:03:15 +0000 (03:03 +0000)]
Merge "Fix a deadlock between thread flip and suspend request."
am:
81c6c8e6de
Change-Id: I828a59ecc430d1371355cdcb5e95b5eb4b5e8674
Treehugger Robot [Thu, 6 Oct 2016 02:57:57 +0000 (02:57 +0000)]
Merge "Fix a deadlock between thread flip and suspend request."
Mathieu Chartier [Wed, 5 Oct 2016 21:12:45 +0000 (14:12 -0700)]
Allow early abort logging
Print unattached threads with native stack traces for early abort.
Bug:
31855501
Test: test-art-host -j32
Test: thread_list_->Dump in Runtime::Start.
Change-Id: I5364625e798356c4fa1f88a8c646e374e59d93b0
Jeff Hao [Thu, 6 Oct 2016 01:21:10 +0000 (01:21 +0000)]
Merge "Revert "Revert "Add dex file writer to dexlayout tool.""" am:
765dee21f3
am:
6449dd7204
Change-Id: I25418a101bbb4fd15a03bbf8e27d08bc63da7e68
Jeff Hao [Thu, 6 Oct 2016 01:17:38 +0000 (01:17 +0000)]
Merge "Revert "Revert "Add dex file writer to dexlayout tool."""
am:
765dee21f3
Change-Id: I41b548c0ca1b1f1b412aafadf6dc5d9006d645da
Hiroshi Yamauchi [Thu, 6 Oct 2016 01:13:23 +0000 (18:13 -0700)]
Temporarily add debug logging for b/
31357497
Note the check can't be a DCHECK because 103-string-append runs with the
non-debug build (libart.so).
Bug:
31357497
Bug:
12687968
Test: run-test 103-string-append on N9.
Change-Id: I30ebe9111fa6c42796dcafa182ae066214805173
Treehugger Robot [Thu, 6 Oct 2016 01:12:23 +0000 (01:12 +0000)]
Merge "Revert "Revert "Add dex file writer to dexlayout tool."""
Hiroshi Yamauchi [Mon, 3 Oct 2016 22:32:01 +0000 (15:32 -0700)]
Fix a deadlock between thread flip and suspend request.
See
31683379#9 for the deadlock scenario.
Make ModifySuspendCount(+1) retry if the thread flip function is set.
Bug:
31683379
Bug:
12687968
Test: test-art, N9 libartd boot, Ritz EAAC with CC.
Test: 129-GetThreadId with gcstress and CC.
Change-Id: Id5cdfcd90a08a2ff497f9f0e2842fa4c613549bc
Igor Murashkin [Wed, 5 Oct 2016 23:49:02 +0000 (23:49 +0000)]
Merge "jni: Test that pushed handle scopes are popped after JNI transitions" am:
30267ea042
am:
15912e9d0c
Change-Id: Ib692e0f5b962cb3a14d1c6a0625288e84ef74510
Igor Murashkin [Wed, 5 Oct 2016 23:46:32 +0000 (23:46 +0000)]
Merge "jni: Test that pushed handle scopes are popped after JNI transitions"
am:
30267ea042
Change-Id: Ic422b92661e7fe4fee9e9c13ae450850c0744548
Treehugger Robot [Wed, 5 Oct 2016 23:41:27 +0000 (23:41 +0000)]
Merge "jni: Test that pushed handle scopes are popped after JNI transitions"
Mathieu Chartier [Wed, 5 Oct 2016 23:41:02 +0000 (23:41 +0000)]
Merge "Change java_lang_reflect_Field.cc to use ObjPtr" am:
6206a5d523
am:
d3b604f0c3
Change-Id: I643c6d38e2bf245cb0a6774db985e6ef334d20fc
Mathieu Chartier [Wed, 5 Oct 2016 23:38:01 +0000 (23:38 +0000)]
Merge "Change java_lang_reflect_Field.cc to use ObjPtr"
am:
6206a5d523
Change-Id: I83eac899d4bb2d8230312fdb073fc1779db82265
Treehugger Robot [Wed, 5 Oct 2016 23:32:05 +0000 (23:32 +0000)]
Merge "Change java_lang_reflect_Field.cc to use ObjPtr"
Mathieu Chartier [Wed, 5 Oct 2016 22:56:52 +0000 (15:56 -0700)]
ObjPtr misc cleanup
Check for subtypes in constructor.
Remove various calls to MakeObjPtr and ObjPtr::Ptr.
Bug:
31113334
Test: test-art-host
Change-Id: I8d680d514ea52cd64fc4f7c2e988926bc726174e
Mathieu Chartier [Wed, 5 Oct 2016 20:48:41 +0000 (13:48 -0700)]
Change java_lang_reflect_Field.cc to use ObjPtr
Also deleted some calls to ObjPtr::Ptr and fixed formatting.
Bug:
31113334
Test: test-art-host
Change-Id: I951b80886b723e1beff4783f28ee7c928cb10650
Mathieu Chartier [Wed, 5 Oct 2016 22:03:26 +0000 (22:03 +0000)]
Merge "Change indirect reference table to use ObjPtr" am:
463a67dd60
am:
22316a1570
Change-Id: I7c7b64fa33ff1805627408a821e2ed0c9c25e8b2
Mathieu Chartier [Wed, 5 Oct 2016 22:00:55 +0000 (22:00 +0000)]
Merge "Change indirect reference table to use ObjPtr"
am:
463a67dd60
Change-Id: Id1faabb203c6885d873acd0515a1dbaf68915334
Treehugger Robot [Wed, 5 Oct 2016 21:55:20 +0000 (21:55 +0000)]
Merge "Change indirect reference table to use ObjPtr"
Igor Murashkin [Wed, 5 Oct 2016 21:33:30 +0000 (14:33 -0700)]
jni: Test that pushed handle scopes are popped after JNI transitions
There was previously a bug in generic JNI for @CriticalNative where new
handle scopes were pushed, but then not popped after the native call
was done. This caused a bug with stale pointers being found by GC.
Bug:
31933313
Change-Id: I423f9e7a7d391ba3a4771c830691931f0025b354
Aart Bik [Wed, 5 Oct 2016 20:36:50 +0000 (20:36 +0000)]
Merge "Refactoring of graph linearization and linear order." am:
78c6fefdb9
am:
ac2065c9a3
Change-Id: Ic2fc38ace9dcb4c0ac0c1e27ba79f34611c98373
Aart Bik [Wed, 5 Oct 2016 20:34:20 +0000 (20:34 +0000)]
Merge "Refactoring of graph linearization and linear order."
am:
78c6fefdb9
Change-Id: I15ebff4861446000918e11a85972708b9a47ab09
Treehugger Robot [Wed, 5 Oct 2016 20:29:58 +0000 (20:29 +0000)]
Merge "Refactoring of graph linearization and linear order."
Mathieu Chartier [Wed, 5 Oct 2016 20:06:20 +0000 (20:06 +0000)]
Merge "Initialize dex cache while holding dex_lock" am:
7638651be2
am:
0a881d4341
Change-Id: I4c89b4d7c6db27dcb26d376609a7867e68fe8305
Mathieu Chartier [Wed, 5 Oct 2016 20:03:47 +0000 (20:03 +0000)]
Merge "Initialize dex cache while holding dex_lock"
am:
7638651be2
Change-Id: I067b023de98cc6d559437f01339ef814ca9fadde
Mathieu Chartier [Wed, 5 Oct 2016 02:06:30 +0000 (19:06 -0700)]
Change indirect reference table to use ObjPtr
Bug:
31113334
Test: test-art-host
Change-Id: I340fdf430897ebd790ea4e35f94bcee776e98445
Mathieu Chartier [Wed, 5 Oct 2016 19:59:08 +0000 (19:59 +0000)]
Merge "Initialize dex cache while holding dex_lock"