OSDN Git Service
Nicolas Geoffray [Fri, 12 Jun 2015 07:38:20 +0000 (08:38 +0100)]
Don't run 098-ddmc, it's flaky.
Change-Id: I3fa559f84b2c3a1ce9b07b8d3a27723dc84b3a3e
Mathieu Chartier [Fri, 12 Jun 2015 00:59:40 +0000 (00:59 +0000)]
Merge "Skip 098-ddmc for GC stress test"
Man Cao [Thu, 11 Jun 2015 22:55:43 +0000 (15:55 -0700)]
Skip 098-ddmc for GC stress test
And add comment about the temporary fix in 098-ddmc because of behavior
change for DDMS's getRecentAllocations().
Also fixed a buggy typo in Android.run-test.mk.
Bug:
20037135
Change-Id: Ia57e03f458d8570690616d2cc49f2ead42a96cb0
Mathieu Chartier [Fri, 12 Jun 2015 00:16:23 +0000 (00:16 +0000)]
Merge "Fix compaction bug in Class_getDeclaredMethodsUnchecked"
Mathieu Chartier [Thu, 11 Jun 2015 23:21:42 +0000 (16:21 -0700)]
Fix compaction bug in Class_getDeclaredMethodsUnchecked
Added handle to fix the bug.
(cherry picked from commit
b89a8c66e360575d2dc1ec1229235735c56968ff)
Bug:
21638351
Change-Id: I1c3abea33aa825d3a28c1fc5cb415508686ad93e
Mathieu Chartier [Thu, 11 Jun 2015 22:20:08 +0000 (22:20 +0000)]
Merge "Move image intern table into image"
Mathieu Chartier [Wed, 10 Jun 2015 00:50:29 +0000 (17:50 -0700)]
Move image intern table into image
Previously we recreated this intern table during runtime startup.
This added 50-100ms of boot time.
Fixed bug where we didn't copy over hashcodes into the image.
Deleted some stale code.
(cherry picked from commit
fac3a390a247fe33d4873773d742aad4cc100118)
Bug:
20727525
Bug:
19569780
Change-Id: I08959e9aa2a73cedb52f393033e2ffea3a26e76b
Hiroshi Yamauchi [Thu, 11 Jun 2015 21:46:50 +0000 (21:46 +0000)]
Merge "Reset GC performance stats at zygote fork."
Hiroshi Yamauchi [Thu, 11 Jun 2015 00:20:54 +0000 (17:20 -0700)]
Reset GC performance stats at zygote fork.
So GCs before a zygote fork won't be attributed to an app.
(cherry pick commit Ib37bc587e0f039ef8faeabe63dec19de49501863)
Bug:
21491908
Change-Id: Ib37bc587e0f039ef8faeabe63dec19de49501863
Mathieu Chartier [Thu, 11 Jun 2015 20:23:23 +0000 (20:23 +0000)]
Merge "Add hprof accounting for Class IMT, VTable"
Mathieu Chartier [Wed, 3 Jun 2015 23:51:09 +0000 (16:51 -0700)]
Add hprof accounting for Class IMT, VTable
These are now included in the classOverhead field which used to be
the staticOverhead field.
Bug:
20726205
Change-Id: I648db1bcaa393e3e907b1878f29631ad6b14a6e7
Igor Murashkin [Thu, 11 Jun 2015 18:46:20 +0000 (18:46 +0000)]
Merge "runtime: Minor cleanup and extra comments around interpreter"
Igor Murashkin [Wed, 10 Jun 2015 22:56:42 +0000 (15:56 -0700)]
runtime: Minor cleanup and extra comments around interpreter
Change-Id: I24c0b261de8cf737babd9d01bf679482d48c8bc9
Mathieu Chartier [Thu, 11 Jun 2015 17:12:07 +0000 (17:12 +0000)]
Merge "Fix buildbot failure for 098-ddmc test"
Sergio Giro [Thu, 11 Jun 2015 16:00:54 +0000 (16:00 +0000)]
Merge "Revert "art/tools: add new tests in security packages to the build bot""
Sergio Giro [Thu, 11 Jun 2015 16:00:11 +0000 (16:00 +0000)]
Revert "art/tools: add new tests in security packages to the build bot"
This reverts commit
7904aba5f8ab73c12e83f8e786556c0c77306810.
Change-Id: I06d81bbe415999933cc73d8431a1ceb72bbdc132
Sergio Giro [Thu, 11 Jun 2015 13:54:59 +0000 (13:54 +0000)]
Merge "art/tools: add new tests in security packages to the build bot"
Sergio Giro [Wed, 10 Jun 2015 12:32:07 +0000 (13:32 +0100)]
art/tools: add new tests in security packages to the build bot
Otherwise, it's difficult to know when they start to fail
Test packages added:
com.android.org.conscrypt
libcore.java.security
libcore.javax.net
Bug:
21722374
Change-Id: I45e91239c5f8633943c515cc39978e4ee652ec3c
Narayan Kamath [Thu, 11 Jun 2015 07:59:46 +0000 (07:59 +0000)]
Merge "Fix build breakage in dwarf_test."
Narayan Kamath [Thu, 11 Jun 2015 07:49:57 +0000 (08:49 +0100)]
Fix build breakage in dwarf_test.
Define a variable only if it's going to be used.
Change-Id: Id293f79bf986c79fb33daa3242388303c0fb1f08
Man Cao [Thu, 11 Jun 2015 03:02:42 +0000 (20:02 -0700)]
Fix buildbot failure for 098-ddmc test
The test only failed on buildbot but not on my local machine. It is
possibly caused by GC reclaiming dead objects and associated allocation
records.
More importantly, the CL 153435 changes the behavior of recent allocation
tracking for DDMS, so that it now reports allocation records of not-yet-
garbaged-collected objects. They are a superset of live objects, but not
a precise set of the most recent allocations.
Bug:
20037135
Change-Id: I200a6c8baaeb98207845049902d59efa2f4ea11e
Andreas Gampe [Thu, 11 Jun 2015 01:38:38 +0000 (01:38 +0000)]
Merge "ART: Fix BCE lint issue"
Andreas Gampe [Thu, 11 Jun 2015 01:33:26 +0000 (18:33 -0700)]
ART: Fix BCE lint issue
Change-Id: I7f382a3124955eff5c0b96ca39ec67fb658fa3d0
David Srbecky [Thu, 11 Jun 2015 00:50:29 +0000 (00:50 +0000)]
Merge "Generate debug info for core.oat files."
David Srbecky [Thu, 11 Jun 2015 00:27:56 +0000 (01:27 +0100)]
Generate debug info for core.oat files.
The debug info is needed for CFI unwinding tests.
I am adding this as part of investigating build bot failure,
I suspect the it might not be generating the debug info by default.
Change-Id: Ic0cdda345355161d44949308d6d70ff59542cc1e
Andreas Gampe [Thu, 11 Jun 2015 00:20:44 +0000 (00:20 +0000)]
Merge "[MIPS] Fix method tracing for mips64"
Mingyao Yang [Wed, 10 Jun 2015 23:53:07 +0000 (23:53 +0000)]
Merge "Fix premature deoptimization if the loop body isn't entered."
Mingyao Yang [Tue, 19 May 2015 23:01:59 +0000 (16:01 -0700)]
Fix premature deoptimization if the loop body isn't entered.
Add a test between initial_ and end_ to see if the loop body is entered.
If the loop body isn't entered at all, we jump to the loop header. Loop header is
still executed and is going to test the condition again and loop body won't be
entered. This makes sure no deoptimization is triggered if the loop body isn't
even entered.
Bug:
21034044
Change-Id: I2b6de1f22fbc4568ca419f76382ebd87806d9694
David Srbecky [Wed, 10 Jun 2015 23:12:32 +0000 (23:12 +0000)]
Merge "Revert "Revert "Test that we can unwind framework code."""
Igor Murashkin [Wed, 10 Jun 2015 23:10:56 +0000 (23:10 +0000)]
Merge "run-test: add --never-clean option"
Igor Murashkin [Wed, 10 Jun 2015 22:57:17 +0000 (15:57 -0700)]
run-test: add --never-clean option
The --never-clean option forces the temporary directory created for
running the test to be retained after run-test finishes execution.
This is useful to help with debugging problems in your run, build,
run-test-jar, etc scripts.
Change-Id: Idc6c767521581deaa80674b583834af05bf027da
David Srbecky [Wed, 10 Jun 2015 22:34:34 +0000 (22:34 +0000)]
Merge "Add more log output to the CFI test."
Mathieu Chartier [Wed, 10 Jun 2015 22:04:49 +0000 (22:04 +0000)]
Merge "Add allocation stack traces for HPROF dump."
Man Cao [Thu, 28 May 2015 00:25:30 +0000 (17:25 -0700)]
Add allocation stack traces for HPROF dump.
This feature is currently only enabled when DDMS's allocation tracking
is enabled. In the future there should be a way to enable this feature
before an application starts.
Also updates DDMS's recent allocation tracking to use a new backend
data structure that is shared with this feature.
The following system properties controls customizable parameters:
dalvik.vm.allocTrackerMax: max number of objects that have allocation
records, default 512K;
dalvik.vm.recentAllocMax: max number of records that are sent to DDMS
when clicking "Get allocation" button,
default 64K-1 (limit of the protocol);
dalvik.vm.allocStackDepth: max number of stack frames in an allocation
record, default 4.
Bug:
20037135
Change-Id: I26ed378a5613678bd3c43e846025f90470a8e059
David Srbecky [Wed, 10 Jun 2015 21:52:06 +0000 (21:52 +0000)]
Revert "Revert "Test that we can unwind framework code.""
This reverts commit
2c4733d647b24860e074aac4722d803da182adde.
Change-Id: I16a1eebe4b80363621edc1fcb55cdcf40fc3ac84
David Srbecky [Wed, 10 Jun 2015 21:43:11 +0000 (22:43 +0100)]
Add more log output to the CFI test.
Change-Id: Iff2674eb9c889db4bbed4bd8af85b6df2cdd1da3
Nicolas Geoffray [Wed, 10 Jun 2015 15:14:46 +0000 (15:14 +0000)]
Merge "Revert "Revert "Support for inlining virtual and interface calls."""
Nicolas Geoffray [Tue, 9 Jun 2015 09:37:32 +0000 (10:37 +0100)]
Revert "Revert "Support for inlining virtual and interface calls.""
It now works thanks to:
- https://android-review.googlesource.com/#/c/154016/ where
the invoke type is changed.
- The new FindMethodIndexIn method in this change, that
locates the right method index relative to the caller's
dex file.
This reverts commit
6e4758615308bb525b6350c30468e33a2e1f2274.
Change-Id: Iddba11664a9241e210fec211cd2aed9f4b90d118
Lazar Trsic [Wed, 10 Jun 2015 14:05:46 +0000 (16:05 +0200)]
[MIPS] Fix method tracing for mips64
Reg $v0 is being clobbered on using
SETUP_REFS_ONLY_CALLEE_SAVE_FRAME inside instrumentation_exit()
trampoline, when falling through from instrumentation_entry().
To fix, use $t1 for ArtMethod* fetching inside SETUP_ macros.
Also fix some unrelated comment errors.
Change-Id: I4ab169f75988c4f0d924416a30196f21c1a043a3
Sergio Giro [Wed, 10 Jun 2015 14:16:29 +0000 (14:16 +0000)]
Merge "Revert "art/tools: add new tests for the build bot""
Sergio Giro [Wed, 10 Jun 2015 14:16:13 +0000 (14:16 +0000)]
Revert "art/tools: add new tests for the build bot"
This reverts commit
10ec4f937e351bc21c0eebada30c6df3f8570406.
Was breaking many tests in the test environment.
Change-Id: I96cdbfe9620e4daff19ab448dc44e5315d89ebb7
Nicolas Geoffray [Wed, 10 Jun 2015 14:14:42 +0000 (14:14 +0000)]
Merge "Add optimizations for instanceof/checkcast."
Nicolas Geoffray [Wed, 10 Jun 2015 14:06:47 +0000 (14:06 +0000)]
Merge "Revert "art/tools: add new tests for the build bot""
Nicolas Geoffray [Wed, 10 Jun 2015 14:06:31 +0000 (14:06 +0000)]
Revert "art/tools: add new tests for the build bot"
Unfortunately too many "localhost" netd failures.
This reverts commit
10ec4f937e351bc21c0eebada30c6df3f8570406.
Change-Id: Ibe28977e1e9f207f00a24f4c3167d08aa36cce5f
Guillaume Sanchez [Tue, 9 Jun 2015 17:33:02 +0000 (18:33 +0100)]
Add optimizations for instanceof/checkcast.
The optimizations try to statically determine the outcome of the
type tests, replacing/removing the instructions when possible.
This required to fix the is_exact flag for ReferenceTypePropagation.
Change-Id: I6cea29b6c351d118b62060e8420333085e9383fb
Sergio Giro [Wed, 10 Jun 2015 11:40:08 +0000 (11:40 +0000)]
Merge "art/tools: add new tests for the build bot"
Sergio Giro [Fri, 5 Jun 2015 10:17:18 +0000 (11:17 +0100)]
art/tools: add new tests for the build bot
Otherwise, it's difficult to know when they start to fail
Bug:
21722374
Change-Id: I599e62ebafc28cf0dd60104c156f09ada8868bdc
Nicolas Geoffray [Wed, 10 Jun 2015 09:46:53 +0000 (09:46 +0000)]
Merge "Add boilerplate code for architecture-specific HInstructions."
Alexandre Rames [Tue, 9 Jun 2015 09:29:30 +0000 (10:29 +0100)]
Add boilerplate code for architecture-specific HInstructions.
Change-Id: I2723cd96e5f03012c840863dd38d7b2168117db8
David Srbecky [Wed, 10 Jun 2015 03:53:10 +0000 (03:53 +0000)]
Merge "Revert "Test that we can unwind framework code.""
David Srbecky [Wed, 10 Jun 2015 03:51:48 +0000 (03:51 +0000)]
Revert "Test that we can unwind framework code."
This reverts commit
5c40961dc2c7aa80a183e2eaa828580e0e89e2dd.
Change-Id: Ib4d827623fe76c9c3b639e7d1e205c7033fc2bc7
David Srbecky [Tue, 9 Jun 2015 23:16:19 +0000 (23:16 +0000)]
Merge "Test that we can unwind framework code."
Andreas Gampe [Tue, 9 Jun 2015 23:00:48 +0000 (23:00 +0000)]
Merge "ART: Check long and double register pairs in invokes"
Jeff Hao [Tue, 9 Jun 2015 21:12:19 +0000 (21:12 +0000)]
Merge "Make dex file verifier check for dups between direct and virtual methods."
Mathieu Chartier [Tue, 9 Jun 2015 20:23:40 +0000 (20:23 +0000)]
Merge "Increase ulimit to 64MB for --no-relocate"
Mathieu Chartier [Tue, 9 Jun 2015 20:02:50 +0000 (13:02 -0700)]
Increase ulimit to 64MB for --no-relocate
Fixes hprof test.
Bug:
21730274
Change-Id: I70e49ca4a5d66414715e8ad894e3b5b5322052ee
David Srbecky [Mon, 8 Jun 2015 22:41:25 +0000 (23:41 +0100)]
Test that we can unwind framework code.
Change-Id: I8c0c6c14f3b95ac1fea6ca6a969a1baea80d55fc
Jeff Hao [Fri, 5 Jun 2015 01:12:26 +0000 (18:12 -0700)]
Make dex file verifier check for dups between direct and virtual methods.
The dex file verifier now rejects classes that have the same method index
in both direct and virtual methods.
Bug:
17878919
Change-Id: I431b4715e39ca2cce4df3ebef020b7ec0661a4c0
Andreas Gampe [Sat, 6 Jun 2015 03:22:12 +0000 (20:22 -0700)]
ART: Check long and double register pairs in invokes
For invokes, ensure that long and double parameters are actually
in registers pairs. We were testing the pair, but skipping the
actual high parameter register.
Bug:
17410612
Change-Id: I8f4c3335ea8b7dc3cf252bee52a5a706ae8905f8
Nicolas Geoffray [Tue, 9 Jun 2015 16:19:14 +0000 (16:19 +0000)]
Merge "Add support for inlining already sharpened interface calls."
Sebastien Hertz [Tue, 9 Jun 2015 16:05:14 +0000 (16:05 +0000)]
Merge "Bring back verbosity override"
Sebastien Hertz [Tue, 9 Jun 2015 15:36:58 +0000 (15:36 +0000)]
Merge "Follow up on CL 151605"
Nicolas Geoffray [Tue, 9 Jun 2015 15:24:08 +0000 (15:24 +0000)]
Merge "Revert "Revert "Pass current method to HNewInstance and HNewArray."""
Sebastien Hertz [Tue, 9 Jun 2015 12:09:14 +0000 (14:09 +0200)]
Follow up on CL 151605
- Fixes return type of StackedShadowFrameRecord::GetType
- Makes StackedShadowFrameType an enum class (scoped enum)
- Moves DeoptimizationReturnValueRecord and StackedShadowFrameRecord
to thread.cc file and use forward declaration in thread.h header
- Fixes tools/generate-operator-out.py for scoped enum classes.
Bug:
20845490
Change-Id: I6b67e288b1db563699161e58ec2e2330d42dd8f5
Nicolas Geoffray [Tue, 9 Jun 2015 09:34:25 +0000 (10:34 +0100)]
Revert "Revert "Pass current method to HNewInstance and HNewArray.""
Problem exposed by this change was fixed in:
https://android-review.googlesource.com/#/c/154031/
This reverts commit
7b0e353b49ac3f464c662f20e20e240f0231afff.
Change-Id: I680c13dc9db9ba223ab11c7af255222860b4e6d2
Nicolas Geoffray [Tue, 9 Jun 2015 14:51:21 +0000 (14:51 +0000)]
Merge "Fix a crash in optimizing compiler with the current method."
Nicolas Geoffray [Tue, 9 Jun 2015 14:43:38 +0000 (15:43 +0100)]
Add support for inlining already sharpened interface calls.
Change-Id: Ia6b557c5e98e493b187b1f30da0c62449d9dd4d4
Nicolas Geoffray [Tue, 9 Jun 2015 13:12:28 +0000 (14:12 +0100)]
Fix a crash in optimizing compiler with the current method.
Crash was due to overwriting the location of the current method
in the slow path of an intrinsic.
Change-Id: I6ca58ef5b3cea19925e60b9500aef543bc5f71ef
Sebastien Hertz [Mon, 1 Jun 2015 06:28:18 +0000 (08:28 +0200)]
Bring back verbosity override
Brings back the possibility to override verbosity locally (after
command-line parser changes). Also adds a test for "-verbose:deopt"
command-line option.
Change-Id: I634d5226ef473ec4d965d620e973e9e677c0069d
Nicolas Geoffray [Tue, 9 Jun 2015 09:26:04 +0000 (09:26 +0000)]
Merge "Revert "Pass current method to HNewInstance and HNewArray.""
Nicolas Geoffray [Tue, 9 Jun 2015 09:25:50 +0000 (09:25 +0000)]
Revert "Pass current method to HNewInstance and HNewArray."
082-inline-execute fails on x86.
This reverts commit
e21aa42e1341d34250742abafdd83311ad9fa737.
Change-Id: Ib3fd25faee2e0128001e40d3d51a74f959bc4449
Vladimir Marko [Tue, 9 Jun 2015 09:05:36 +0000 (09:05 +0000)]
Merge "Quick: Fix LoopRepeatingTopologicalSortIterator."
Nicolas Geoffray [Tue, 9 Jun 2015 08:13:15 +0000 (08:13 +0000)]
Merge "Pass current method to HNewInstance and HNewArray."
Nicolas Geoffray [Tue, 9 Jun 2015 07:55:16 +0000 (07:55 +0000)]
Merge "Revert "Revert "Use HCurrentMethod in HInvokeStaticOrDirect."""
David Srbecky [Tue, 9 Jun 2015 01:41:11 +0000 (01:41 +0000)]
Merge "Enable 64-bit CFI tests."
David Srbecky [Tue, 9 Jun 2015 00:21:23 +0000 (01:21 +0100)]
Enable 64-bit CFI tests.
Those should work now since we have switched to ELF-64.
Change-Id: Id95b8b309843b30864a860c745d16b50d7f88bda
Mathieu Chartier [Mon, 8 Jun 2015 18:33:42 +0000 (18:33 +0000)]
Merge "More LOW_4G optimizations"
Mathieu Chartier [Thu, 4 Jun 2015 23:22:41 +0000 (16:22 -0700)]
More LOW_4G optimizations
Eagerly try to map at an address when it doesn't overlap with
the ART known maps.
Reduces time spent creating the heap on N9 from ~100ms to ~10ms.
(cherry picked from commit
3ae250c16bae3462e040b844dbc2e2fc732d67ba)
Bug:
20727525
Change-Id: Ie8982ca9d1f3158104b2b53b992c3a28841fc443
Mingyao Yang [Mon, 8 Jun 2015 17:41:30 +0000 (17:41 +0000)]
Merge "Fix nested deoptimization."
Vladimir Marko [Mon, 8 Jun 2015 15:39:02 +0000 (16:39 +0100)]
Quick: Fix LoopRepeatingTopologicalSortIterator.
Always push the loop head on the loop head stack. This fixes
a bug where we failed to return to an unnatural loop head to
recalculate its GVN data.
Bug:
17410955
Change-Id: I3a2c3225e5d16268c3f56f7f90228759c7da37a9
Nicolas Geoffray [Thu, 4 Jun 2015 17:21:04 +0000 (18:21 +0100)]
Revert "Revert "Use HCurrentMethod in HInvokeStaticOrDirect.""
Fix was to special case baseline for x86, which does not have enough
registers to allocate the current method.
This reverts commit
c345f141f11faad177aa9635a78088d00cf66086.
Change-Id: I5997aa52f8d4df373ae5ff4d4150dac0c44c4c10
Nicolas Geoffray [Mon, 8 Jun 2015 15:54:38 +0000 (15:54 +0000)]
Merge "Revert "Support for inlining virtual and interface calls.""
Nicolas Geoffray [Mon, 8 Jun 2015 15:52:23 +0000 (15:52 +0000)]
Revert "Support for inlining virtual and interface calls."
Fails for some apps.
bug:
21674542
This reverts commit
1d5006c34d75758752bf3499892e3d5beb11d5dc.
Change-Id: Ia74b5e54d59f8ffe9992591324a12f71efb67af4
Nicolas Geoffray [Mon, 8 Jun 2015 15:53:30 +0000 (15:53 +0000)]
Merge "Revert "Do a type check for knowing if we can inline.""
Nicolas Geoffray [Mon, 8 Jun 2015 15:53:16 +0000 (15:53 +0000)]
Revert "Do a type check for knowing if we can inline."
Fails for some apps.
bug:
21674542
This reverts commit
7ce4b3d4c1c562959a8a3640df764ab50f1cbdf1.
Change-Id: Ie25852c022391834858b2f5e34e8c7aeb1c3b3dd
Nicolas Geoffray [Mon, 8 Jun 2015 14:35:07 +0000 (15:35 +0100)]
Pass current method to HNewInstance and HNewArray.
Also remove unsed CodeGenerator::LoadCurrentMethod.
Change-Id: I4b8d3f2a30b8e2c76b6b329a72555483c993cb73
Mingyao Yang [Mon, 18 May 2015 19:12:50 +0000 (12:12 -0700)]
Fix nested deoptimization.
Handle nested deoptimization cases. Create a stacked shadow frame
records to keep track of deoptimization shadow frames. Shadow frames
under construction can be tracked in the same stack.
Bug:
20845490
Change-Id: I768285792c29e7c3cfcd21e7a2600802506024d8
Andreas Gampe [Sun, 7 Jun 2015 22:39:51 +0000 (22:39 +0000)]
Merge "ART: Reload class on miranda method in verifier"
Andreas Gampe [Sun, 7 Jun 2015 22:36:15 +0000 (22:36 +0000)]
Merge "Revert "Revert "Turn off duplicate-classes checking"""
Andreas Gampe [Sun, 7 Jun 2015 22:36:00 +0000 (22:36 +0000)]
Merge "Revert "DO NOT MERGE ART: Turn off duplicate-classes checking""
Andreas Gampe [Sun, 7 Jun 2015 22:35:42 +0000 (22:35 +0000)]
Merge "DO NOT MERGE ART: Turn off duplicate-classes checking"
Andreas Gampe [Fri, 5 Jun 2015 05:19:58 +0000 (22:19 -0700)]
ART: Reload class on miranda method in verifier
When checking the receiver of a call and we have a miranda method,
reload the class from the method index instead of using the declared
class - which is the interface class, not the abstract class.
Bug:
21646347
Change-Id: I5bceab75c3b76233cb42ea5cf0214d32c8149994
Andreas Gampe [Wed, 3 Jun 2015 22:43:16 +0000 (15:43 -0700)]
Revert "Revert "Turn off duplicate-classes checking""
This reverts commit
18a1827a159f1b235f3fcc934f428059185f550e.
Bug:
21333911
(cherry picked from commit
0fc16a09b4d2323f9c2b6aabc81ce120b278329b)
Change-Id: I8cb96efbf7151b238f3ee137a938b20ddfaf0ebc
Andreas Gampe [Thu, 21 May 2015 20:33:40 +0000 (20:33 +0000)]
Revert "DO NOT MERGE ART: Turn off duplicate-classes checking"
This reverts commit
aafcfca5fe545365ef377fff2897b8a908f03e71.
Bug:
21333911
(cherry picked from commit
18a1827a159f1b235f3fcc934f428059185f550e)
Change-Id: Ibbc6b1be8bebc1d0ab9c5955b34eb89f40577baa
Andreas Gampe [Wed, 20 May 2015 21:48:10 +0000 (14:48 -0700)]
DO NOT MERGE ART: Turn off duplicate-classes checking
Bug:
21333911
(cherry picked from commit
aafcfca5fe545365ef377fff2897b8a908f03e71)
Change-Id: I9832526a6d2996aadb459e3ec0930cbaf151478a
Andreas Gampe [Sat, 6 Jun 2015 03:52:31 +0000 (03:52 +0000)]
Merge "ART: Add SetSpecialSignalHandlerFn to version-script.txt"
Andreas Gampe [Sat, 6 Jun 2015 03:45:31 +0000 (20:45 -0700)]
ART: Add SetSpecialSignalHandlerFn to version-script.txt
Expose the new function from the sigchainlib implementation.
Bug:
20217701
Change-Id: I7d21025595775e057ea703236ca88ceb07173136
Mathieu Chartier [Fri, 5 Jun 2015 23:44:27 +0000 (23:44 +0000)]
Merge "Use runFinalizationWithTimeout for native allocations"
Mathieu Chartier [Fri, 5 Jun 2015 20:21:05 +0000 (13:21 -0700)]
Use runFinalizationWithTimeout for native allocations
Prevents deadlocks by not waiting longer than 250ms for finalizers
to complete.
(cherry picked from commit
3b532d744034b43ed329a3198f15846d80fec3f0)
Bug:
21544853
Change-Id: I57b2f7ae8b74185922eb3c15ba0ab71a4d2348aa
Mathieu Chartier [Thu, 4 Jun 2015 23:19:26 +0000 (23:19 +0000)]
Merge "Add atrace calls to runtime start and heap create"