OSDN Git Service
Calin Juravle [Fri, 12 Jun 2015 20:05:26 +0000 (20:05 +0000)]
am
d2459fb0: am
ff924fb2: Merge "Revert "Revert "Revert "Bring ReferenceTypePropagation to HInvoke return types""""
* commit '
d2459fb0f742c4ffcc532d2f78191961b6f95511':
Revert "Revert "Revert "Bring ReferenceTypePropagation to HInvoke return types"""
Calin Juravle [Fri, 12 Jun 2015 20:05:25 +0000 (20:05 +0000)]
am
aa619635: am
2a023030: Merge "Revert "Revert "Revert "Fix a checker test""""
* commit '
aa6196354bdadf377e992a967c22cb127501b7a8':
Revert "Revert "Revert "Fix a checker test"""
Calin Juravle [Fri, 12 Jun 2015 20:05:23 +0000 (20:05 +0000)]
am
baa65d14: am
c0c2be30: Merge "Revert "Revert "Fix a checker test"""
* commit '
baa65d14b257e3b5f8ab1ec434e9a8fac621f969':
Revert "Revert "Fix a checker test""
Calin Juravle [Fri, 12 Jun 2015 20:05:22 +0000 (20:05 +0000)]
am
e766a43b: am
ec632a92: Merge "Revert "Revert "Bring ReferenceTypePropagation to HInvoke return types"""
* commit '
e766a43bb2b3f1e22cd9b122c2cf26f130f9b057':
Revert "Revert "Bring ReferenceTypePropagation to HInvoke return types""
Sergio Giro [Fri, 12 Jun 2015 20:05:21 +0000 (20:05 +0000)]
am
781ce146: am
93192e73: Merge "tools/buildbot-build.sh: Remove javalibcoretest from common targets"
* commit '
781ce146377119d189a72ebfef606013c783afd7':
tools/buildbot-build.sh: Remove javalibcoretest from common targets
Sebastien Hertz [Fri, 12 Jun 2015 19:29:08 +0000 (19:29 +0000)]
am
49983747: JDWP: update handling of 8-bit and 16-bit fields
* commit '
4998374789fc62c147027eef022c74a97949ac6e':
JDWP: update handling of 8-bit and 16-bit fields
Sebastien Hertz [Thu, 11 Jun 2015 16:42:58 +0000 (18:42 +0200)]
JDWP: update handling of 8-bit and 16-bit fields
We must use special getter/setter for types smaller than int:
boolean, byte, char and short. However, JDWP still requires to treat:
- int and float as 32-bit values
- long and double as 64-bit values
Bug:
21746739
(cherry picked from commit
05c26b30843dd8283c703356e75d51726e8b8e3a)
Change-Id: I2d667291974e191f2c9b10311ce02435b902dd0c
Calin Juravle [Fri, 12 Jun 2015 16:28:08 +0000 (16:28 +0000)]
am
ff924fb2: Merge "Revert "Revert "Revert "Bring ReferenceTypePropagation to HInvoke return types""""
* commit '
ff924fb2700decce131fb10dd28de1e251465792':
Revert "Revert "Revert "Bring ReferenceTypePropagation to HInvoke return types"""
Calin Juravle [Fri, 12 Jun 2015 16:28:04 +0000 (16:28 +0000)]
am
2a023030: Merge "Revert "Revert "Revert "Fix a checker test""""
* commit '
2a023030d5e7d6e580ab41d6623ae86c9e5a28b9':
Revert "Revert "Revert "Fix a checker test"""
Calin Juravle [Fri, 12 Jun 2015 16:28:00 +0000 (16:28 +0000)]
am
c0c2be30: Merge "Revert "Revert "Fix a checker test"""
* commit '
c0c2be30bfba0daed9e1a5ea7b67afb03253ae27':
Revert "Revert "Fix a checker test""
Calin Juravle [Fri, 12 Jun 2015 16:27:58 +0000 (16:27 +0000)]
am
ec632a92: Merge "Revert "Revert "Bring ReferenceTypePropagation to HInvoke return types"""
* commit '
ec632a921bc7b867574c36f3e2c57020da0a50c9':
Revert "Revert "Bring ReferenceTypePropagation to HInvoke return types""
Sergio Giro [Fri, 12 Jun 2015 16:27:54 +0000 (16:27 +0000)]
am
93192e73: Merge "tools/buildbot-build.sh: Remove javalibcoretest from common targets"
* commit '
93192e73ac80de28344699695712311a4d8627f2':
tools/buildbot-build.sh: Remove javalibcoretest from common targets
Calin Juravle [Fri, 12 Jun 2015 15:40:57 +0000 (15:40 +0000)]
Merge "Revert "Revert "Revert "Bring ReferenceTypePropagation to HInvoke return types""""
Calin Juravle [Fri, 12 Jun 2015 15:40:42 +0000 (15:40 +0000)]
Revert "Revert "Revert "Bring ReferenceTypePropagation to HInvoke return types"""
This reverts commit
a981f9d5cac9a479d3b5d16508d71cfe17d95117.
Change-Id: I69faf16d5ef0ecc234fb52e071b682e728a8bf97
Calin Juravle [Fri, 12 Jun 2015 15:40:13 +0000 (15:40 +0000)]
Merge "Revert "Revert "Revert "Fix a checker test""""
Calin Juravle [Fri, 12 Jun 2015 15:39:26 +0000 (15:39 +0000)]
Revert "Revert "Revert "Fix a checker test"""
This reverts commit
b9610e795b8df7b3ba8c6b2c38d6589c2a0e5321.
Change-Id: Id4550d578913a7eac02480b635b3c0a44dea2b4c
Calin Juravle [Fri, 12 Jun 2015 15:26:57 +0000 (15:26 +0000)]
Merge "Revert "Revert "Fix a checker test"""
Calin Juravle [Fri, 12 Jun 2015 15:26:45 +0000 (15:26 +0000)]
Revert "Revert "Fix a checker test""
This reverts commit
e27dd0ef36f225e9d52daa454b8030f3d485b982.
Change-Id: I7779ec9273cd9873828f31706ddaee3bc707be24
Calin Juravle [Fri, 12 Jun 2015 15:26:32 +0000 (15:26 +0000)]
Merge "Revert "Revert "Bring ReferenceTypePropagation to HInvoke return types"""
Calin Juravle [Fri, 12 Jun 2015 15:26:21 +0000 (15:26 +0000)]
Revert "Revert "Bring ReferenceTypePropagation to HInvoke return types""
This reverts commit
958857d0f9686770a3b1117166d5fa700b39704a.
Change-Id: I196ff2a4453489f0105efc54eee73a2a9321ac4e
Sergio Giro [Fri, 12 Jun 2015 14:30:08 +0000 (14:30 +0000)]
Merge "tools/buildbot-build.sh: Remove javalibcoretest from common targets"
Sergio Giro [Fri, 12 Jun 2015 14:25:30 +0000 (14:25 +0000)]
am
7198ba7a: am
d26d13c7: Merge "art/tools: add new tests in security packages to the build bot"
* commit '
7198ba7a0b0b3777cb8a1d32dba9e7cb748936c2':
art/tools: add new tests in security packages to the build bot
Vladimir Marko [Fri, 12 Jun 2015 14:25:29 +0000 (14:25 +0000)]
am
fe2ec8e9: am
b2ece2fe: Merge "Optimizing: Move optimization objects to Arena."
* commit '
fe2ec8e96706e8e03b9c1387d9d6169aa9b03422':
Optimizing: Move optimization objects to Arena.
Sergio Giro [Fri, 12 Jun 2015 14:18:48 +0000 (14:18 +0000)]
am
d26d13c7: Merge "art/tools: add new tests in security packages to the build bot"
* commit '
d26d13c79a2a974eb49ca77537e9107fef904c30':
art/tools: add new tests in security packages to the build bot
Sergio Giro [Fri, 12 Jun 2015 14:16:26 +0000 (15:16 +0100)]
tools/buildbot-build.sh: Remove javalibcoretest from common targets
It's built in the make command
Change-Id: I702d54c38dd4492e19688d3949c1e610865d9260
Vladimir Marko [Fri, 12 Jun 2015 14:13:05 +0000 (14:13 +0000)]
am
b2ece2fe: Merge "Optimizing: Move optimization objects to Arena."
* commit '
b2ece2fe386ed346a74824e2e47810b805a0c4cb':
Optimizing: Move optimization objects to Arena.
Sergio Giro [Fri, 12 Jun 2015 14:11:51 +0000 (14:11 +0000)]
Merge "art/tools: add new tests in security packages to the build bot"
Sergio Giro [Fri, 12 Jun 2015 11:35:51 +0000 (12:35 +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: Ifc641d06a9a0e6ba23fbcb11f49025b8213351fe
Vladimir Marko [Fri, 12 Jun 2015 14:02:47 +0000 (14:02 +0000)]
Merge "Optimizing: Move optimization objects to Arena."
Nicolas Geoffray [Fri, 12 Jun 2015 14:00:28 +0000 (14:00 +0000)]
am
112f76d6: am
67b9e9cd: Merge "Fix a typo in the directory name."
* commit '
112f76d6d7a3f56783d8fb509362cdf9195c7804':
Fix a typo in the directory name.
Vladimir Marko [Fri, 12 Jun 2015 13:30:53 +0000 (14:30 +0100)]
Optimizing: Move optimization objects to Arena.
This should reduce the stack size needed by the
OptimizingCompiler::CompileOptimized() which was very
close to our limits for clang builds, causing repeated
build breakages on otherwise healthy changes:
art/compiler/optimizing/optimizing_compiler.cc:395:37:
error: stack frame size of 1760 bytes in function
'art::OptimizingCompiler::CompileOptimized'
[-Werror,-Wframe-larger-than=]
Change-Id: I2f4ab0235f4eac61823a4a320bb4fe78942a23c2
Nicolas Geoffray [Fri, 12 Jun 2015 13:48:36 +0000 (13:48 +0000)]
am
67b9e9cd: Merge "Fix a typo in the directory name."
* commit '
67b9e9cd8d84f64ef89895b7af5a52f3d15bb1de':
Fix a typo in the directory name.
Nicolas Geoffray [Fri, 12 Jun 2015 13:40:12 +0000 (13:40 +0000)]
Merge "Fix a typo in the directory name."
Nicolas Geoffray [Fri, 12 Jun 2015 13:39:17 +0000 (14:39 +0100)]
Fix a typo in the directory name.
Change-Id: Ie059e61142f9b5c9c6b86550995db14d5706fc9a
Sebastien Hertz [Fri, 12 Jun 2015 13:32:27 +0000 (13:32 +0000)]
am
6ba35b50: JDWP: asynchronous invoke command handling
* commit '
6ba35b50347aa7418c66c7b046cd164987e95df3':
JDWP: asynchronous invoke command handling
Nicolas Geoffray [Fri, 12 Jun 2015 12:35:55 +0000 (12:35 +0000)]
am
9832cc2f: am
10176757: Merge "Preserve class loading semantics in optimizing."
* commit '
9832cc2fb77ab1c2a4709861c9572c0565f84461':
Preserve class loading semantics in optimizing.
Calin Juravle [Fri, 12 Jun 2015 12:35:54 +0000 (12:35 +0000)]
am
f26f89a3: am
ee1264bd: Merge "Revert "Bring ReferenceTypePropagation to HInvoke return types""
* commit '
f26f89a31c67c3eabff70901ca3e8dd9fd3bcb5a':
Revert "Bring ReferenceTypePropagation to HInvoke return types"
Calin Juravle [Fri, 12 Jun 2015 12:35:53 +0000 (12:35 +0000)]
am
78ff6462: am
f0bb3a6b: Merge "Revert "Fix a checker test""
* commit '
78ff646243bb8fa49a08fbe875970ecbd66f53ab':
Revert "Fix a checker test"
Nicolas Geoffray [Fri, 12 Jun 2015 12:25:27 +0000 (12:25 +0000)]
am
10176757: Merge "Preserve class loading semantics in optimizing."
* commit '
10176757836db987e11fb3723e4cb07bd9ea7e95':
Preserve class loading semantics in optimizing.
Calin Juravle [Fri, 12 Jun 2015 12:25:25 +0000 (12:25 +0000)]
am
ee1264bd: Merge "Revert "Bring ReferenceTypePropagation to HInvoke return types""
* commit '
ee1264bd21c76a2020693753d39f50765d84a2cf':
Revert "Bring ReferenceTypePropagation to HInvoke return types"
Calin Juravle [Fri, 12 Jun 2015 12:25:24 +0000 (12:25 +0000)]
am
f0bb3a6b: Merge "Revert "Fix a checker test""
* commit '
f0bb3a6ba464afd5cc00ebf699317a65aaa6e987':
Revert "Fix a checker test"
Nicolas Geoffray [Fri, 12 Jun 2015 12:15:30 +0000 (12:15 +0000)]
Merge "Preserve class loading semantics in optimizing."
Calin Juravle [Fri, 12 Jun 2015 12:14:12 +0000 (12:14 +0000)]
Merge "Revert "Bring ReferenceTypePropagation to HInvoke return types""
Calin Juravle [Fri, 12 Jun 2015 12:13:43 +0000 (12:13 +0000)]
Revert "Bring ReferenceTypePropagation to HInvoke return types"
We exceed stack frame size with Clang in art::OptimizingCompiler::CompileOptimized
This reverts commit
ddedddcedaae78fc6aa29940fdb1fbe40bb05774.
Change-Id: I6f992dda228acb9cae2087d1e6c78f2afdf30050
Calin Juravle [Fri, 12 Jun 2015 12:13:22 +0000 (12:13 +0000)]
Merge "Revert "Fix a checker test""
Calin Juravle [Fri, 12 Jun 2015 12:13:10 +0000 (12:13 +0000)]
Revert "Fix a checker test"
We exceed stack frame size with Clang in art::OptimizingCompiler::CompileOptimized
This reverts commit
240d84d5b8fbfedef5fee45b490042b9c66bd6f6.
Change-Id: I6a5717682cbc5e6345399da8c1503fd736764ac7
Nicolas Geoffray [Fri, 12 Jun 2015 12:07:05 +0000 (12:07 +0000)]
am
5bfbcfa3: am
b684aa93: Merge "Explicitly give the path of the library to build."
* commit '
5bfbcfa3e70083aeb656772994fc2d9b1e078ba2':
Explicitly give the path of the library to build.
Nicolas Geoffray [Fri, 12 Jun 2015 11:55:07 +0000 (11:55 +0000)]
am
b684aa93: Merge "Explicitly give the path of the library to build."
* commit '
b684aa939bd17cb43ef6ebdb7b89d175c38c79f0':
Explicitly give the path of the library to build.
Nicolas Geoffray [Fri, 12 Jun 2015 11:43:05 +0000 (11:43 +0000)]
Merge "Explicitly give the path of the library to build."
Nicolas Geoffray [Fri, 12 Jun 2015 11:41:42 +0000 (12:41 +0100)]
Explicitly give the path of the library to build.
Otherwise the build system would not build the 32bit version
for ART 32 bit.
Change-Id: Ie2b48bb94d4fc9ce1a9590c1e8bacd382db16d8c
Vladimir Marko [Fri, 12 Jun 2015 11:25:32 +0000 (11:25 +0000)]
am
00f89270: am
5dcdf94a: Merge "Optimizing: Remove PcInfo, use the StackMapStream instead."
* commit '
00f892702807bc02e54748badc6738200dcf84d1':
Optimizing: Remove PcInfo, use the StackMapStream instead.
Vladimir Marko [Fri, 12 Jun 2015 11:12:30 +0000 (11:12 +0000)]
am
5dcdf94a: Merge "Optimizing: Remove PcInfo, use the StackMapStream instead."
* commit '
5dcdf94a7f41cde71b5d15aab66be067ab8bee3f':
Optimizing: Remove PcInfo, use the StackMapStream instead.
Vladimir Marko [Fri, 12 Jun 2015 11:06:05 +0000 (11:06 +0000)]
Merge "Optimizing: Remove PcInfo, use the StackMapStream instead."
Sebastien Hertz [Fri, 12 Jun 2015 11:00:24 +0000 (11:00 +0000)]
am
a2e3a90a: am
42361f2e: Merge "JDWP: asynchronous invoke command handling"
* commit '
a2e3a90afd8010670fddc94fe4b9d79bfe4f8516':
JDWP: asynchronous invoke command handling
Sebastien Hertz [Fri, 12 Jun 2015 10:48:57 +0000 (10:48 +0000)]
am
42361f2e: Merge "JDWP: asynchronous invoke command handling"
* commit '
42361f2e8b3601813dc40d12e14c679df99a864b':
JDWP: asynchronous invoke command handling
Sebastien Hertz [Mon, 1 Jun 2015 15:33:12 +0000 (17:33 +0200)]
JDWP: asynchronous invoke command handling
The JDWP thread used to wait for the result of a method invocation
running in an event thread. But doing that prevents the JDWP thread
from processing incoming commands from the debugger if the event
thread gets suspended by a debug event occurring in another thread.
In Android Studio (or another IDE), this leads to the debugger being
blocked (with the famous message "Waiting until last debugger command
completes" of Android Studio / IntelliJ) because it is actually
waiting for the reply of its latest command while the JDWP thread
cannot process it.
This CL changes the way invoke commands (ClassType.InvokeCommand,
ClassType.NewInstance and ObjectReference.InvokeCommand) are handled
in the ART runtime.
The JDWP thread no longer waits for the event thread to complete the
method invocation. It now simply waits for the next JDWP command to
process. This means it does not send any reply for invoke commands,
except if the information given by the debugger is wrong. In this
case, it still sends a reply with the appropriate error code.
The event thread is now responsible for sending the reply (containing
the result and the exception object of the invoked method) before
going back to the suspended state.
In other words, we add special handling for invoke commands so they
are handled asynchronously while other commands remained handled
synchronously. In the future, we may want to handle all commands
asynchronously (using a queue of reply/event for instance) to remove
the special handling code this CL is adding.
Now the JDWP thread can process commands while a thread is invoking
a method, it is possible for the debugger to detach (by sending a
VirtualMachine.Dispose command) before the invocation completes. In
that situation, we must not suspend threads again (including the
event thread that executed the method) because they would all remain
suspended forever.
Also minor cleanup of the use of JDWP constants and update comments.
Bug:
21515842
Bug:
18899981
(cherry picked from commit
cbc5064ff05179b97b416f00ca579c55e38cd7d9)
Change-Id: I8d31006043468913ee8453212e6d16e11fcfe4ea
Sebastien Hertz [Fri, 12 Jun 2015 10:40:56 +0000 (10:40 +0000)]
Merge "JDWP: asynchronous invoke command handling"
Calin Juravle [Fri, 12 Jun 2015 10:18:54 +0000 (10:18 +0000)]
am
da2495c9: am
995f6e23: Merge "Fix a checker test"
* commit '
da2495c92de982988b296f9cc4fbeb30e1d0bfd6':
Fix a checker test
Calin Juravle [Fri, 12 Jun 2015 10:06:56 +0000 (10:06 +0000)]
am
995f6e23: Merge "Fix a checker test"
* commit '
995f6e23418a1b4058167e64bbe50fd9e5dc7f02':
Fix a checker test
Calin Juravle [Fri, 12 Jun 2015 10:01:17 +0000 (10:01 +0000)]
am
d24ce8af: am
6ab9edbc: Merge "Bring ReferenceTypePropagation to HInvoke return types"
* commit '
d24ce8af60b0a3e82a48307749ef4bc3542ebbd0':
Bring ReferenceTypePropagation to HInvoke return types
Calin Juravle [Fri, 12 Jun 2015 09:59:14 +0000 (09:59 +0000)]
Merge "Fix a checker test"
Calin Juravle [Fri, 12 Jun 2015 09:57:04 +0000 (10:57 +0100)]
Fix a checker test
Change-Id: I47a24352922ab32d4a07d6d32b5126d03c8f497f
Nicolas Geoffray [Fri, 12 Jun 2015 08:35:05 +0000 (09:35 +0100)]
Preserve class loading semantics in optimizing.
We were being too agressive in removing HLoadClass instructions.
A HInvokeStaticOrDirect can only remove it if it's directly before it.
bug:
21711097
Change-Id: Id63502d90e11da60eccfb46daca62e0d5d022119
Calin Juravle [Fri, 12 Jun 2015 09:48:47 +0000 (09:48 +0000)]
am
6ab9edbc: Merge "Bring ReferenceTypePropagation to HInvoke return types"
* commit '
6ab9edbc4e55fda54ad0c39d5606e2c145b56bf5':
Bring ReferenceTypePropagation to HInvoke return types
Nicolas Geoffray [Fri, 12 Jun 2015 09:48:27 +0000 (09:48 +0000)]
am
52a10894: am
3d4e3b93: Merge "Add libjavacoretests.so to the things to build."
* commit '
52a10894399d8df8c91acb80f8d96e0f580ce752':
Add libjavacoretests.so to the things to build.
Calin Juravle [Fri, 12 Jun 2015 09:38:51 +0000 (09:38 +0000)]
Merge "Bring ReferenceTypePropagation to HInvoke return types"
Nicolas Geoffray [Fri, 12 Jun 2015 09:37:06 +0000 (09:37 +0000)]
am
4b936956: am
edc0e4f3: Merge "Add dalvik.system to run-libcore-tests.sh"
* commit '
4b936956eeca2c01b732a503f2de5df22b83ad10':
Add dalvik.system to run-libcore-tests.sh
Nicolas Geoffray [Fri, 12 Jun 2015 09:36:43 +0000 (09:36 +0000)]
am
3d4e3b93: Merge "Add libjavacoretests.so to the things to build."
* commit '
3d4e3b93e11a8c8658a6498aed77e3b28b55bc86':
Add libjavacoretests.so to the things to build.
Vladimir Marko [Fri, 12 Jun 2015 09:06:32 +0000 (10:06 +0100)]
Optimizing: Remove PcInfo, use the StackMapStream instead.
Change-Id: I474f3a89f6c7ee5c7accd21791b1c1e311104158
Nicolas Geoffray [Fri, 12 Jun 2015 09:24:30 +0000 (09:24 +0000)]
Merge "Add libjavacoretests.so to the things to build."
Nicolas Geoffray [Fri, 12 Jun 2015 09:23:30 +0000 (10:23 +0100)]
Add libjavacoretests.so to the things to build.
Needed for runing dalvik.system tests.
Change-Id: I6bd08b436bd560bff946586802028ab386bc6ec8
Nicolas Geoffray [Fri, 12 Jun 2015 08:07:53 +0000 (08:07 +0000)]
am
1c18f34c: am
c19c9e8b: Merge "Don\'t run 098-ddmc, it\'s flaky."
* commit '
1c18f34c1e4b539d03d41ea67ad793f638450e93':
Don't run 098-ddmc, it's flaky.
Nicolas Geoffray [Fri, 12 Jun 2015 08:06:43 +0000 (08:06 +0000)]
am
edc0e4f3: Merge "Add dalvik.system to run-libcore-tests.sh"
* commit '
edc0e4f317bd110dfd774fd1c42d7455763820d9':
Add dalvik.system to run-libcore-tests.sh
Nicolas Geoffray [Fri, 12 Jun 2015 07:55:49 +0000 (07:55 +0000)]
Merge "Add dalvik.system to run-libcore-tests.sh"
Nicolas Geoffray [Fri, 12 Jun 2015 07:54:59 +0000 (07:54 +0000)]
am
c19c9e8b: Merge "Don\'t run 098-ddmc, it\'s flaky."
* commit '
c19c9e8b5719fe50eeace1ef185700ad3071e877':
Don't run 098-ddmc, it's flaky.
Nicolas Geoffray [Fri, 12 Jun 2015 07:46:30 +0000 (07:46 +0000)]
Merge "Don't run 098-ddmc, it's flaky."
Nicolas Geoffray [Fri, 12 Jun 2015 07:38:20 +0000 (08:38 +0100)]
Don't run 098-ddmc, it's flaky.
Change-Id: I3fa559f84b2c3a1ce9b07b8d3a27723dc84b3a3e
Brian Carlstrom [Thu, 11 Jun 2015 14:33:51 +0000 (07:33 -0700)]
Add dalvik.system to run-libcore-tests.sh
Change-Id: I64c5dfb7fbb0c337befb57e2d7bebc14b022cf85
Mathieu Chartier [Fri, 12 Jun 2015 01:34:44 +0000 (01:34 +0000)]
am
e36221ce: am
bb6a5557: Merge "Skip 098-ddmc for GC stress test"
* commit '
e36221ce244f838505facf18458caf32fbc7389c':
Skip 098-ddmc for GC stress test
Mathieu Chartier [Fri, 12 Jun 2015 01:10:57 +0000 (01:10 +0000)]
am
bb6a5557: Merge "Skip 098-ddmc for GC stress test"
* commit '
bb6a5557fc63283111b3145d36c09a97fc99fa4e':
Skip 098-ddmc for GC stress test
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
Dmitriy Ivanov [Fri, 12 Jun 2015 00:47:44 +0000 (00:47 +0000)]
Merge "Revert "Let classloader provide correct LD_LIBRARY_PATH"" into mnc-dev-plus-aosp
Chris Thornton [Fri, 12 Jun 2015 00:39:29 +0000 (00:39 +0000)]
Merge branch 'mnc-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/art into mnc-dev-plus-aosp
Tim Murray [Fri, 12 Jun 2015 00:39:21 +0000 (00:39 +0000)]
am
c72c5ac9: Merge "Add cortex-a53 as a valid instruction set variant for arm64." into mnc-dev
* commit '
c72c5ac9d9e16ebf262f0dd75e9686a3e1d67bd9':
Add cortex-a53 as a valid instruction set variant for arm64.
Mathieu Chartier [Fri, 12 Jun 2015 00:39:20 +0000 (00:39 +0000)]
am
b89a8c66: Fix compaction bug in Class_getDeclaredMethodsUnchecked
* commit '
b89a8c66e360575d2dc1ec1229235735c56968ff':
Fix compaction bug in Class_getDeclaredMethodsUnchecked
Mathieu Chartier [Fri, 12 Jun 2015 00:39:19 +0000 (00:39 +0000)]
am
7f20e178: am
f1b5a27e: Merge "Fix compaction bug in Class_getDeclaredMethodsUnchecked"
* commit '
7f20e178260d4bf7b8df75ea6781619eb42cdc19':
Fix compaction bug in Class_getDeclaredMethodsUnchecked
Mathieu Chartier [Fri, 12 Jun 2015 00:24:59 +0000 (00:24 +0000)]
am
f1b5a27e: Merge "Fix compaction bug in Class_getDeclaredMethodsUnchecked"
* commit '
f1b5a27e2619cea728fcf92fd7901c71ebd9ed28':
Fix compaction bug in Class_getDeclaredMethodsUnchecked
Tim Murray [Fri, 12 Jun 2015 00:21:24 +0000 (00:21 +0000)]
Merge "Add cortex-a53 as a valid instruction set variant for arm64." into mnc-dev
Tim Murray [Fri, 12 Jun 2015 00:09:18 +0000 (17:09 -0700)]
Add cortex-a53 as a valid instruction set variant for arm64.
Change-Id: I720e2cc4acd94e367dae4a21c13aa90a3e30b7cc
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 23:21:42 +0000 (16:21 -0700)]
Fix compaction bug in Class_getDeclaredMethodsUnchecked
Added handle to fix the bug.
Bug:
21638351
Change-Id: I1c3abea33aa825d3a28c1fc5cb415508686ad93e
Dmitriy Ivanov [Thu, 11 Jun 2015 22:42:34 +0000 (15:42 -0700)]
Revert "Let classloader provide correct LD_LIBRARY_PATH"
This reverts commit
8117250a0bb57bf2aa6b1ab0c7d4d4a7dd402c08.
Mathieu Chartier [Thu, 11 Jun 2015 22:41:36 +0000 (22:41 +0000)]
am
1130cdfc: am
8d73a91d: Merge "Move image intern table into image"
* commit '
1130cdfc143bbc27f7bad3ec7a256257f15b95d9':
Move image intern table into image
Mathieu Chartier [Thu, 11 Jun 2015 22:27:59 +0000 (22:27 +0000)]
am
8d73a91d: Merge "Move image intern table into image"
* commit '
8d73a91d8f4c89ac152d18081b07093f68c56a11':
Move image intern table into image
Mathieu Chartier [Thu, 11 Jun 2015 22:20:08 +0000 (22:20 +0000)]
Merge "Move image intern table into image"
Dmitriy Ivanov [Thu, 11 Jun 2015 22:16:29 +0000 (22:16 +0000)]
am
125d7324: Merge "Let classloader provide correct LD_LIBRARY_PATH" into mnc-dev
* commit '
125d7324f1f75698ed20b2f64c36345d7f0bcabf':
Let classloader provide correct LD_LIBRARY_PATH
Mathieu Chartier [Thu, 11 Jun 2015 22:16:28 +0000 (22:16 +0000)]
am
fa5fc150: (-s ours) Merge "Move image intern table into image" into mnc-dev
* commit '
fa5fc150aa80c7472c6c2199a5ee21136dc43d5d':
Move image intern table into image
Hiroshi Yamauchi [Thu, 11 Jun 2015 22:09:05 +0000 (22:09 +0000)]
am
b2b9c191: am
cff58550: Merge "Reset GC performance stats at zygote fork."
* commit '
b2b9c1912c57b3b5f0545801074ba0a1989de073':
Reset GC performance stats at zygote fork.