OSDN Git Service
Brian Carlstrom [Mon, 4 Aug 2014 18:27:30 +0000 (18:27 +0000)]
Merge "Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [art]"
Andreas Gampe [Mon, 4 Aug 2014 17:46:05 +0000 (17:46 +0000)]
Merge "AArch64: Remove unnecessary work around for sp."
Zheng Xu [Tue, 1 Jul 2014 01:53:22 +0000 (09:53 +0800)]
AArch64: Remove unnecessary work around for sp.
Use RegRegRegExtend to encode instruction for "sub/add sp, sp, Xm".
Change-Id: I13d3d2d386a7bd827e1396f291a7dcb9bffd5a29
Narayan Kamath [Mon, 4 Aug 2014 17:31:49 +0000 (17:31 +0000)]
Merge "Inform about System.exit() call in logcat"
Dmitry Petrochenko [Thu, 3 Jul 2014 10:07:45 +0000 (17:07 +0700)]
Inform about System.exit() call in logcat
This diagnostic message helps to filter out crashes during System.exit()
when thread's behaviour is undefined.
Change-Id: I772932a35b503b1efca695e7da7bf2e562c03a7c
Signed-off-by: Dmitry Petrochenko <dmitry.petrochenko@intel.com>
Andreas Gampe [Mon, 4 Aug 2014 16:32:25 +0000 (16:32 +0000)]
Merge "ART: Rework ARM64 entry sequence"
Andreas Gampe [Tue, 29 Jul 2014 07:35:00 +0000 (00:35 -0700)]
ART: Rework ARM64 entry sequence
Try to fold one sub of SP in the ARM64 entry sequence. When the
framesize is small, generate a sub over the full frame-size, and
adjust the spill offsets accordingly. If the framesize is too
large, use a pre-indexed store and fill upwards from there.
Change-Id: I1c15ac6276fb62b8164372de02fd92437f605938
Narayan Kamath [Mon, 4 Aug 2014 11:24:20 +0000 (11:24 +0000)]
Merge "Fix broken JNI IsAssignableFrom."
Narayan Kamath [Fri, 11 Jul 2014 18:15:11 +0000 (19:15 +0100)]
Fix broken JNI IsAssignableFrom.
The expected argument order was the opposite of what the spec
dictated.
Reported-By: Mikhail Naganov <mnaganov@google.com>
bug:
16531674
Change-Id: I1ebc6d5814ebb4feeb96f3ecdf1a4602da4ba7ce
Bill Buzbee [Thu, 31 Jul 2014 21:02:56 +0000 (21:02 +0000)]
Merge "Revert "Revert "Enable Load Store Elimination for ARM and ARM64"""
Brian Carlstrom [Tue, 29 Jul 2014 02:13:27 +0000 (19:13 -0700)]
Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [art]
This will allow us to conditionally change the compiler-filter based on other properties.
Bug:
15165413
Change-Id: I6877a6eab221ab142909b595fd28191b5d3a095b
Bill Buzbee [Thu, 31 Jul 2014 14:08:33 +0000 (14:08 +0000)]
Merge "ART: LoadConstWide should clobber temp reg"
Alexei Zavjalov [Wed, 30 Jul 2014 12:31:04 +0000 (19:31 +0700)]
ART: LoadConstWide should clobber temp reg
If we have 2+ LoadConstWide(FP) calls in one method it is possible
that LoadConstWide will load the method poiner only once. In some
cases, for example, if we have branches, initialization might not be
done and it may lead to a segmentation fault.
Change-Id: If45fc2d1109d7ce9bd272f5c56446b2a6884daac
Signed-off-by: Alexei Zavjalov <alexei.zavjalov@intel.com>
Hiroshi Yamauchi [Thu, 31 Jul 2014 18:32:43 +0000 (18:32 +0000)]
Merge "Add read barriers for the roots in the verifier."
Hiroshi Yamauchi [Wed, 30 Jul 2014 21:26:22 +0000 (14:26 -0700)]
Add read barriers for the roots in the verifier.
Note: Because the roots (the class references in RegType objects) can
be updated by the read barriers, a lot of uses of type "const RegType"
were replaced with "RegType".
Bug:
12687968
Change-Id: I6cf37a87f352938d43fb51560a8d927ada104f50
Narayan Kamath [Thu, 31 Jul 2014 18:06:57 +0000 (18:06 +0000)]
Merge "Make ImageSpace skip validation if we are using a relocated image"
Alex Light [Thu, 31 Jul 2014 17:48:46 +0000 (10:48 -0700)]
Make ImageSpace skip validation if we are using a relocated image
Change-Id: I0682d1870f5b3e27adb9c9de803fbb7d364ad00d
Narayan Kamath [Thu, 31 Jul 2014 16:56:26 +0000 (16:56 +0000)]
Merge "Fix image not regenerating on changes to bootclasspath"
Alex Light [Thu, 31 Jul 2014 16:32:13 +0000 (09:32 -0700)]
Fix image not regenerating on changes to bootclasspath
Bug:
16367410
Change-Id: I10e81d068ffc2ab712a287f88ef67f6a1be4df4c
Brian Carlstrom [Wed, 30 Jul 2014 17:41:27 +0000 (17:41 +0000)]
Merge "Make 32bit run-tests work correctly on 64bit default devices."
Alex Light [Wed, 30 Jul 2014 01:31:18 +0000 (18:31 -0700)]
Make 32bit run-tests work correctly on 64bit default devices.
Change-Id: I7a5ca303ab91dec0df95358435e4a56c18a7fce3
Vladimir Marko [Thu, 31 Jul 2014 09:31:40 +0000 (09:31 +0000)]
Merge "Reduce time and memory usage of GVN."
Vladimir Marko [Tue, 29 Jul 2014 11:04:10 +0000 (12:04 +0100)]
Reduce time and memory usage of GVN.
Filter out dead sregs in GVN. Reclaim memory after each LVN
in the GVN modification phase.
Bug:
16398693
Change-Id: I8c88c3009663754e1b66c0ef3f62c3b93276e385
Andreas Gampe [Thu, 31 Jul 2014 06:24:06 +0000 (06:24 +0000)]
Merge "ART: Build fix"
Andreas Gampe [Thu, 31 Jul 2014 06:21:36 +0000 (23:21 -0700)]
ART: Build fix
Make lint happy, as comments should be separated from code.
Change-Id: I4bfd88357302be9a6a104f1152e3b1fda386371e
Ian Rogers [Thu, 31 Jul 2014 04:21:44 +0000 (04:21 +0000)]
Merge "1. Fix CFI for quick compiled code in x86 & x86_64; 2. Emit CFI in .eh_frame instead of .debug_frame."
Tong Shen [Wed, 30 Jul 2014 16:31:22 +0000 (09:31 -0700)]
1. Fix CFI for quick compiled code in x86 & x86_64;
2. Emit CFI in .eh_frame instead of .debug_frame.
With CFI, we can correctly unwind past quick generated code.
Now gdb should unwind to main() for both x86 & x86_64 host-side ART.
Note that it does not work with relocation yet.
Testing:
1. art/test/run-test --host --gdb [--64] --no-relocate 005
2. In gdb, run 'b art_quick_invoke_stub', then 'r', then 'c' a few times
3. In gdb, run 'bt'. You should see stack frames down to main()
Change-Id: I5350d4097dc3d360a60cb17c94f1d02b99bc58bb
Ian Rogers [Thu, 31 Jul 2014 03:56:05 +0000 (03:56 +0000)]
Merge "Add --always-clean flag to run-test."
Andreas Gampe [Thu, 31 Jul 2014 03:39:34 +0000 (03:39 +0000)]
Merge "ART: Fix verifier mishandling erroneous array component types"
Andreas Gampe [Thu, 31 Jul 2014 01:59:05 +0000 (18:59 -0700)]
ART: Fix verifier mishandling erroneous array component types
The verifier must not assume that component types are not erroneous.
Bug:
16661259
Change-Id: I23b2f517259ca9c0b8a1aa38f6348fcd61e0b22e
Mathieu Chartier [Thu, 31 Jul 2014 00:15:37 +0000 (00:15 +0000)]
Merge "Add support for bump pointer spaces to DdmSendHeapSegments."
Mathieu Chartier [Wed, 30 Jul 2014 21:59:56 +0000 (14:59 -0700)]
Add support for bump pointer spaces to DdmSendHeapSegments.
Added support for bump pointer spaces as well as
differentiating between DlMallocSpaces and RosAllocSpaces.
Added logic to reset the start of next chunk to prevent
inbetween space regions counted as free.
Fixed a debug build bug where we were doing an mprotect after
creating a rosalloc space. In debug builds, this writes a magic
value in the page. This was faulting since it was set to PROT_NONE.
The fix moves the mprotect before the RosAlloc space creation.
Bug:
16408851
Change-Id: Ibe18198d05ff353fbb57d10b2f7719fdcbf1c5f0
Alex Light [Wed, 30 Jul 2014 16:41:21 +0000 (09:41 -0700)]
Add --always-clean flag to run-test.
This flag makes run-test remove the test-artifacts even if it fails. Also
enable this option by default when doing run-tests with make. Add
a ART_TEST_RUN_TEST_ALWAYS_CLEAN environment variable to control this
option.
Change-Id: I7867b400d570d8d679d9822d1fa65f49eb3522ae
Serban Constantinescu [Tue, 15 Jul 2014 16:44:21 +0000 (17:44 +0100)]
Revert "Revert "Enable Load Store Elimination for ARM and ARM64""
This patch refactors the implementation of the LoadStoreElimination
optimisation pass. Please note that this pass was disabled and not
functional for any of the backends.
The current implementation tracks aliases and handles DalvikRegs as well
as Heap memory regions. It has been tested and it is known to optimise
out the following:
* Load - Load
* Store - Load
* Store - Store
* Load Literals
Change-Id: I3aadb12a787164146a95bc314e85fa73ad91e12b
Andreas Gampe [Tue, 29 Jul 2014 23:07:05 +0000 (23:07 +0000)]
Merge "ART: Check for duplicate class definitions in dex file verifier"
Andreas Gampe [Tue, 29 Jul 2014 08:22:07 +0000 (01:22 -0700)]
ART: Check for duplicate class definitions in dex file verifier
Reject dex files that try to define two classes with the same type id.
Bug:
16016492
Change-Id: I82cc99c00b3e3cb2b3d537ec14beed9049fe900f
Jeff Hao [Tue, 29 Jul 2014 22:06:32 +0000 (22:06 +0000)]
Merge "Stop thread from reattaching during runtime shutdown while tracing."
Jeff Hao [Tue, 29 Jul 2014 01:35:38 +0000 (18:35 -0700)]
Stop thread from reattaching during runtime shutdown while tracing.
Bug:
16024763
Change-Id: Iad5ba180241ff74b15baf5c3a15ed2d2ed60fcf0
Hiroshi Yamauchi [Tue, 29 Jul 2014 22:00:56 +0000 (22:00 +0000)]
Merge "Add GcRoot to clean up and enforce read barriers."
Hiroshi Yamauchi [Wed, 23 Jul 2014 01:08:23 +0000 (18:08 -0700)]
Add GcRoot to clean up and enforce read barriers.
Introduce a value-type wrapper around Object* for GC roots so that 1)
we won't have to directly add the read barrier code in many places and
2) we can avoid accidentally bypassing/missing read barriers on GC
roots (the GcRoot interface ensures that the read barrier is executed
on a read).
The jdwp test passed.
Bug:
12687968
Change-Id: Ib167c7c325b3c7e3900133578815f04d219972a1
Andreas Gampe [Wed, 30 Jul 2014 15:25:03 +0000 (15:25 +0000)]
Merge "ART: Remove bogus dcheck"
Andreas Gampe [Wed, 30 Jul 2014 06:03:55 +0000 (23:03 -0700)]
ART: Remove bogus dcheck
Mea culpa.
Change-Id: I6fd3b678e30354c5ab5ec6da5b3619c26d486563
Andreas Gampe [Mon, 28 Jul 2014 16:41:14 +0000 (16:41 +0000)]
Merge "ART: Rework quick entrypoint code in Mir2Lir, cleanup"
Andreas Gampe [Mon, 28 Jul 2014 02:44:50 +0000 (19:44 -0700)]
ART: Rework quick entrypoint code in Mir2Lir, cleanup
To reduce the complexity of calling trampolines in generic code,
introduce an enumeration for entrypoints. Introduce a header that lists
the entrypoint enum and exposes a templatized method that translates an
enum value to the corresponding thread offset value.
Call helpers are rewritten to have an enum parameter instead of the
thread offset. Also rewrite LoadHelper and GenConversionCall this way.
It is now LoadHelper's duty to select the right thread offset size.
Introduce InvokeTrampoline virtual method to Mir2Lir. This allows to
further simplify the call helpers, as well as make OpThreadMem specific
to X86 only (removed from Mir2Lir).
Make GenInlinedCharAt virtual, move a copy to X86 backend, and simplify
both copies. Remove LoadBaseIndexedDisp and OpRegMem from Mir2Lir, as they
are now specific to X86 only.
Remove StoreBaseIndexedDisp from Mir2Lir, as it was only ever used in the
X86 backend.
Remove OpTlsCmp from Mir2Lir, as it was only ever used in the X86 backend.
Remove OpLea from Mir2Lir, as it was only ever defined in the X86 backend.
Remove GenImmedCheck from Mir2Lir as it was neither used nor implemented.
Change-Id: If0a6182288c5d57653e3979bf547840a4c47626e
Andreas Gampe [Sun, 27 Jul 2014 21:56:42 +0000 (21:56 +0000)]
Merge "ART: Fix target test paths"
Andreas Gampe [Sat, 12 Jul 2014 04:14:35 +0000 (21:14 -0700)]
ART: Fix target test paths
Nativetest is now nativetest64 on 64b targets.
Change-Id: I4c4c6bba1a56525df2993708caaae3e6f7f5f2f6
Ian Rogers [Sun, 27 Jul 2014 18:32:40 +0000 (18:32 +0000)]
Merge "Remove the per-project FDO support. Use the common FDO support from build/core. LOCAL_FDO_SUPPORT indicates if the module should enable FDO builds."
Dehao Chen [Thu, 24 Jul 2014 23:12:59 +0000 (16:12 -0700)]
Remove the per-project FDO support. Use the common FDO support from build/core.
LOCAL_FDO_SUPPORT indicates if the module should enable FDO builds.
Change-Id: I1eab8bf418b7ceb060eea18bdd304a06597af3d3
Bill Buzbee [Sun, 27 Jul 2014 17:49:57 +0000 (17:49 +0000)]
Merge "Revert "Enable Load Store Elimination for ARM and ARM64""
Bill Buzbee [Sun, 27 Jul 2014 17:49:42 +0000 (17:49 +0000)]
Revert "Enable Load Store Elimination for ARM and ARM64"
On extended testing, I'm seeing a CHECK failure at utility_arm.cc:1201.
This reverts commit
fcc36ba2a2b8fd10e6eebd21ecb6329606443ded.
Change-Id: Icae3d49cd7c8fcab09f2f989cbcb1d7e5c6d137a
Serban Constantinescu [Tue, 15 Jul 2014 16:44:21 +0000 (17:44 +0100)]
Enable Load Store Elimination for ARM and ARM64
This patch refactors the implementation of the LoadStoreElimination
optimisation pass. Please note that this pass was disabled and not
functional for any of the backends.
The current implementation tracks aliases and handles DalvikRegs as well
as Heap memory regions. It has been tested and it is known to optimise
out the following:
* Load - Load
* Store - Load
* Store - Store
* Load Literals
Change-Id: Iefae9b696f87f833ef35c451ed4d49c5a1b6fde0
Bill Buzbee [Sun, 27 Jul 2014 02:46:58 +0000 (02:46 +0000)]
Merge "SetConstantWide should mark both SSA regs as constant"
Bill Buzbee [Sun, 27 Jul 2014 17:30:43 +0000 (17:30 +0000)]
Merge "Enable Load Store Elimination for ARM and ARM64"
Bill Buzbee [Sun, 27 Jul 2014 02:46:40 +0000 (02:46 +0000)]
Merge "ART: ReEnable check for a gap between method's arg "in" vregs and rest of its vregs"
Andreas Gampe [Sun, 27 Jul 2014 01:36:55 +0000 (01:36 +0000)]
Merge "ART: Native bridge command-line parameter"
Andreas Gampe [Fri, 25 Jul 2014 09:32:19 +0000 (02:32 -0700)]
ART: Native bridge command-line parameter
Add a command-line parameter for the native bridge library, slight
refactor/cleanup.
Add run-test 115 to test the native bridge interface. Currently the
tests are black-listed for the target, as the setup for the test
is too complicated in the current infrastructure.
Change-Id: I6ccf19485e8c30b96e9f2fd5425278cb1ebd403f
Andreas Gampe [Sun, 27 Jul 2014 01:31:16 +0000 (01:31 +0000)]
Merge "ART: Allow arrays with erroneous component type"
Andreas Gampe [Thu, 24 Jul 2014 03:18:36 +0000 (20:18 -0700)]
ART: Allow arrays with erroneous component type
Array classes must tolerate having component type classes that are
erroneous. Change CreateArrayClass to use LookupClass when FindClass
failed.
Bug:
16019155
Change-Id: Id4868c5498431c85c199aa3cbecd23566dce3601
Andreas Gampe [Sat, 26 Jul 2014 19:57:14 +0000 (19:57 +0000)]
Merge "ART: Special-case cb(n)z even for in-reg constant"
Andreas Gampe [Sat, 26 Jul 2014 08:40:39 +0000 (01:40 -0700)]
ART: Special-case cb(n)z even for in-reg constant
Call out to OpCmpImmBranch in GenCompareAndBranch if the constant
is zero and we are testing == or !=, even when zero has been loaded
to a register already. This avoids a register size mismatch on 64b
architectures when basically doing a null check, and generally
squashes a cmp + branch to a cbz or cbnz on Arm and Mips. X86 is
not degraded.
Bug:
16562601
Change-Id: I1997760f43dc186a84247ad30ae91053f71d102d
Alexei Zavjalov [Tue, 15 Jul 2014 19:17:58 +0000 (02:17 +0700)]
ART: ReEnable check for a gap between method's arg "in" vregs and rest of its vregs
The Quick backend's runtime model includes a gap between a method's
argument ("in") vregs and the rest of its vregs. Handling a range instruction
which spans the gap is somewhat complicated, and should not happen
in normal usage of dx. Punt to the interpreter if it happened.
This issue relates to https://code.google.com/p/android/issues/detail?id=66371
Which was fixed, but the problem returned after some changes in the verify
flags set for the range bytecodes.
Change-Id: I214f32e7b4227a450257f30607135930d0adff53
Signed-off-by: Katkov, Serguei I <serguei.i.katkov@intel.com>
Signed-off-by: Alexei Zavjalov <alexei.zavjalov@intel.com>
Nicolas Geoffray [Tue, 29 Jul 2014 08:11:47 +0000 (08:11 +0000)]
Merge "Fix braino in Makefile."
Nicolas Geoffray [Tue, 29 Jul 2014 08:10:50 +0000 (09:10 +0100)]
Fix braino in Makefile.
Change-Id: I7cbf694f35db97946823de148ff6dd6053091de6
Nicolas Geoffray [Tue, 29 Jul 2014 08:06:39 +0000 (08:06 +0000)]
Merge "Add a variable to disable PREBUILD in run-tests."
Andreas Gampe [Tue, 29 Jul 2014 07:45:01 +0000 (07:45 +0000)]
Merge "AArch64: Clean up CalleeSaveMethod frame and the use of temp registers."
Zheng Xu [Fri, 25 Jul 2014 03:49:42 +0000 (11:49 +0800)]
AArch64: Clean up CalleeSaveMethod frame and the use of temp registers.
CalleeSaveMethod frame size changes :
SaveAll : 368 -> 176
RefOnly : 176 -> 96
RefsAndArgs : 304 -> 224
JNI register spill size changes :
160 -> 88
In the transition assembly, use registers following the rules:
1. x0-x7 as temp/argument registers.
2. IP0, IP1 as scratch registers.
3. After correct type of callee-save-frame has been setup, all registers
are scratch-able(probably except xSELF and xSUSPEND).
4. When restore callee-save-frame, IP0 and IP1 should be untouched.
5. From C to managed code, we assume all callee save register in AAPCS
will be restored by managed code except x19(SUSPEND).
In quick compiler:
1. Use IP0, IP1 as scratch register.
2. Use IP1 as hidden argument register(IP0 will be scratched by
trampoline.)
Change-Id: I05ed9d418b01b9e87218a7608536f57e7a286e4c
Jeff Hao [Tue, 29 Jul 2014 01:34:08 +0000 (01:34 +0000)]
Merge "Fix proxy tracing and enable tests that now work with tracing."
Jeff Hao [Thu, 24 Jul 2014 23:26:09 +0000 (16:26 -0700)]
Fix proxy tracing and enable tests that now work with tracing.
Bug:
16386215
Change-Id: Iec2a372c921caceb050c6baf72d48b3d822899a4
Nicolas Geoffray [Mon, 28 Jul 2014 21:56:07 +0000 (22:56 +0100)]
Add a variable to disable PREBUILD in run-tests.
Change-Id: I318d37a2d98972c689829258e129ec8973bdc038
Andreas Gampe [Mon, 28 Jul 2014 22:02:25 +0000 (22:02 +0000)]
Merge "ART: Fix missing initialization in stack_map_stream.h"
Andreas Gampe [Mon, 28 Jul 2014 21:53:22 +0000 (14:53 -0700)]
ART: Fix missing initialization in stack_map_stream.h
Fixes stack_map_test.
Change-Id: Ibd6659b589ec595a7af21ad3d727c0ab2dceb45c
Andreas Gampe [Mon, 28 Jul 2014 20:30:00 +0000 (20:30 +0000)]
Merge "ART: Reject array-length on non-reference register"
Andreas Gampe [Mon, 28 Jul 2014 20:14:34 +0000 (13:14 -0700)]
ART: Reject array-length on non-reference register
It should be a hard verifier failure if we detect an array-length
instruction over a non-reference-type register.
Bug:
16595896
Change-Id: I059510b15c846551b2f8ded86cfd8127543324f4
Nicolas Geoffray [Tue, 29 Jul 2014 08:36:21 +0000 (08:36 +0000)]
Merge "Revert "Fix proxy tracing and enable tests that now work with tracing.""
Nicolas Geoffray [Tue, 29 Jul 2014 08:33:44 +0000 (08:33 +0000)]
Revert "Fix proxy tracing and enable tests that now work with tracing."
This reverts commit
0398e171f206cd3b140a358ac31b0a3760380df1.
Change-Id: I1346ab01485cc7207be0ecb4d8788c500c0df903
Nicolas Geoffray [Mon, 28 Jul 2014 16:19:51 +0000 (16:19 +0000)]
Merge "Implement array get and array put in optimizing."
Nicolas Geoffray [Wed, 23 Jul 2014 15:04:16 +0000 (16:04 +0100)]
Implement array get and array put in optimizing.
Also fix a couple of assembler/disassembler issues.
Change-Id: I705c8572988c1a9c4df3172b304678529636d5f6
Sebastien Hertz [Thu, 24 Jul 2014 07:24:12 +0000 (07:24 +0000)]
Merge "Fix access to long/double stack values from debugger"
Stephen Hines [Thu, 24 Jul 2014 02:49:36 +0000 (02:49 +0000)]
Merge "Increase limit to 2600 on host clang builds for frame size."
Stephen Hines [Thu, 24 Jul 2014 02:47:35 +0000 (19:47 -0700)]
Increase limit to 2600 on host clang builds for frame size.
Change-Id: I573e1bcdc7a935145e88077def9c90a5573d2e90
Stephen Hines [Thu, 24 Jul 2014 02:14:06 +0000 (02:14 +0000)]
Merge "Update frame-larger-than limit to 2440 for new clang."
Stephen Hines [Thu, 17 Jul 2014 08:49:18 +0000 (01:49 -0700)]
Update frame-larger-than limit to 2440 for new clang.
Bug:
16362912
The latest version of clang is generating larger frames on elf_writer_quick.cc
and dex2oat.cc than we had previously encountered. This change unblocks the
LLVM rebase temporarily.
Change-Id: I20d9f88959b91e0509e58f01c22532720225f44d
Mathieu Chartier [Thu, 24 Jul 2014 01:30:03 +0000 (01:30 +0000)]
Merge "Reduce allocations in ParallelGC test."
Mathieu Chartier [Thu, 24 Jul 2014 00:25:41 +0000 (17:25 -0700)]
Reduce allocations in ParallelGC test.
Fixes GC stress test mode.
Bug:
16406852
Change-Id: I86c8fd7516c3f41075bca00c7d5b4dab2bb7b1d4
Nicolas Geoffray [Wed, 23 Jul 2014 23:49:26 +0000 (23:49 +0000)]
Merge "Use a (somewhat) more documented environment variable."
Nicolas Geoffray [Wed, 23 Jul 2014 23:36:48 +0000 (00:36 +0100)]
Use a (somewhat) more documented environment variable.
I believe OUT is not mandatory to define, whereas
ANDROID_PRODUCT_OUT is. Not sure our continuous tests define it.
Change-Id: I7cd23971384df265e59587b49760aba29133a59c
Andreas Gampe [Wed, 23 Jul 2014 22:07:30 +0000 (22:07 +0000)]
Merge "x86: GenSelect utility update"
Jeff Hao [Wed, 23 Jul 2014 20:41:11 +0000 (20:41 +0000)]
Merge "Fix run-test --trace option if --host is specified after."
Jeff Hao [Wed, 23 Jul 2014 18:52:52 +0000 (11:52 -0700)]
Fix run-test --trace option if --host is specified after.
Change-Id: I3911428ba762657c4433ab23e60f1771c9ddb2fe
Andreas Gampe [Fri, 25 Jul 2014 23:43:42 +0000 (23:43 +0000)]
Merge "ART: Fix run-test 114 ParallelGC to account for OOM"
Andreas Gampe [Fri, 25 Jul 2014 23:37:09 +0000 (16:37 -0700)]
ART: Fix run-test 114 ParallelGC to account for OOM
This catches any OOMs and doesn't pollute the log.
Bug:
16406852
Change-Id: I1bc95091ccae35a8cb5f2ef0a789f8c8ce5209d0
Mathieu Chartier [Fri, 25 Jul 2014 19:06:45 +0000 (19:06 +0000)]
Merge "Fix main space memory leak and add checks."
Mathieu Chartier [Fri, 25 Jul 2014 18:50:47 +0000 (11:50 -0700)]
Fix main space memory leak and add checks.
The hypothesis is that we were leaking the main space and its
bitmaps, then eventually we would run out of virtual address space,
which would cause a null bitmap (DCHECK). Finally when we tried
adding the space with a null bitmap to the heap bitmap it segfaulted.
Changed some non performance critical DCHECK -> CHECK.
Bug:
16563323
Change-Id: I08a1f873752e28ebcf63ebbd90f92d994d7ca96b
Mathieu Chartier [Fri, 25 Jul 2014 18:42:53 +0000 (18:42 +0000)]
Merge "Fix dangling pointer bug when transitioning to background."
Mathieu Chartier [Fri, 25 Jul 2014 17:13:51 +0000 (10:13 -0700)]
Fix dangling pointer bug when transitioning to background.
Dangling pointer left behind from the old rosalloc / dlmalloc
spaces. We now avoid using this pointer by using main_space_
and non_moving_space_ as well as clear the pointer when we remove
the space.
Bug:
16567203
Change-Id: Ida9ff30783e89cd4a4d86a4d0e912701692101f1
Andreas Gampe [Fri, 25 Jul 2014 22:37:09 +0000 (22:37 +0000)]
Merge "ART: Clean up API after change 102631"
Andreas Gampe [Fri, 25 Jul 2014 20:36:56 +0000 (13:36 -0700)]
ART: Clean up API after change 102631
This adds an abort_on_error parameter to GetCurrentMethod, which is
by default true. This restores all previous behavior, except for
monitor installation, where it follows 101639.
Bug:
16556938
Change-Id: I9a12b9a21ccb9f558c86236bb58d15ff2fafaec0
Vladimir Marko [Fri, 25 Jul 2014 14:55:49 +0000 (14:55 +0000)]
Merge "Fix JNI compiler frame size adjustments."
Vladimir Marko [Thu, 24 Jul 2014 16:01:58 +0000 (17:01 +0100)]
Fix JNI compiler frame size adjustments.
Bug:
16321952
Change-Id: I6f84a59c679e335e02a8e70944a5d0bc8d73f90b
Narayan Kamath [Fri, 25 Jul 2014 14:26:26 +0000 (14:26 +0000)]
Merge "Rename openDexFileNative to openDexFile."