OSDN Git Service
Bill Buzbee [Fri, 27 Jun 2014 19:37:06 +0000 (19:37 +0000)]
am
8651a846: am
5703029d: Merge "AArch64: Enable GenSpecialCase."
* commit '
8651a84665e256faca38f2d080acdabb10c9c252':
AArch64: Enable GenSpecialCase.
Bill Buzbee [Fri, 27 Jun 2014 19:31:40 +0000 (19:31 +0000)]
am
5703029d: Merge "AArch64: Enable GenSpecialCase."
* commit '
5703029de6c56c6f85b3ecbd4e2eee80e025772d':
AArch64: Enable GenSpecialCase.
Andreas Gampe [Fri, 27 Jun 2014 19:01:08 +0000 (19:01 +0000)]
am
2ae395ce: am
5e2ccd4c: Merge "ART: Bump runtime version to 2.1.0"
* commit '
2ae395ce04f49a1da1e0325df1d0babc388bc447':
ART: Bump runtime version to 2.1.0
Andreas Gampe [Fri, 27 Jun 2014 18:56:08 +0000 (18:56 +0000)]
am
5e2ccd4c: Merge "ART: Bump runtime version to 2.1.0"
* commit '
5e2ccd4c739135e9a2c232fe647de7bdc5b77d9e':
ART: Bump runtime version to 2.1.0
Bill Buzbee [Fri, 27 Jun 2014 18:05:28 +0000 (18:05 +0000)]
am
8210866b: am
6bec6cb7: Merge "Fix quick mode bugs for Mips."
* commit '
8210866beb2f516555c3f0b17465c8618c7dabdd':
Fix quick mode bugs for Mips.
Bill Buzbee [Fri, 27 Jun 2014 18:05:27 +0000 (18:05 +0000)]
am
846bc1f4: am
a64d7288: Merge "AArch64: implement easy division and reminder."
* commit '
846bc1f448afd1201a6083d1b32297f50277bb88':
AArch64: implement easy division and reminder.
Mathieu Chartier [Fri, 27 Jun 2014 17:53:10 +0000 (17:53 +0000)]
am
47c8b6db: am
3084d78f: Merge "Don\'t allow negative GetFreeMemory."
* commit '
47c8b6db0ad9c6bf65ef263fb13db70a624156ec':
Don't allow negative GetFreeMemory.
Bill Buzbee [Fri, 27 Jun 2014 17:52:06 +0000 (17:52 +0000)]
am
6bec6cb7: Merge "Fix quick mode bugs for Mips."
* commit '
6bec6cb70460251c5230e23ec0393241e791d497':
Fix quick mode bugs for Mips.
Bill Buzbee [Fri, 27 Jun 2014 17:52:02 +0000 (17:52 +0000)]
am
a64d7288: Merge "AArch64: implement easy division and reminder."
* commit '
a64d728836712e9295ada7de44d8cc3165d595a8':
AArch64: implement easy division and reminder.
Mathieu Chartier [Fri, 27 Jun 2014 17:48:31 +0000 (17:48 +0000)]
am
3084d78f: Merge "Don\'t allow negative GetFreeMemory."
* commit '
3084d78fe86854d5105987ef9739e77e8399434c':
Don't allow negative GetFreeMemory.
Dave Allison [Fri, 27 Jun 2014 16:57:27 +0000 (16:57 +0000)]
am
dd2c7ff3: am
e313d165: Merge "Fix off-by-one errors in limit checking for ldr/str instructions."
* commit '
dd2c7ff355417d74c4b5753d8db94da049dcba38':
Fix off-by-one errors in limit checking for ldr/str instructions.
Dave Allison [Fri, 27 Jun 2014 16:52:33 +0000 (16:52 +0000)]
am
e313d165: Merge "Fix off-by-one errors in limit checking for ldr/str instructions."
* commit '
e313d1651fffe0d181473d2c8c385b7bc37a8829':
Fix off-by-one errors in limit checking for ldr/str instructions.
Andreas Gampe [Fri, 27 Jun 2014 16:28:16 +0000 (16:28 +0000)]
am
98703c5a: am
d5a4a2f9: Merge "ART: ARM64 fp return reg locations are FP"
* commit '
98703c5adf9fbeed64d9f6d9b4597246728957f9':
ART: ARM64 fp return reg locations are FP
Andreas Gampe [Fri, 27 Jun 2014 16:23:55 +0000 (16:23 +0000)]
am
d5a4a2f9: Merge "ART: ARM64 fp return reg locations are FP"
* commit '
d5a4a2f96e6f082eea299f52d3373d6573ca06ca':
ART: ARM64 fp return reg locations are FP
Calin Juravle [Fri, 27 Jun 2014 14:55:11 +0000 (14:55 +0000)]
am
8df24a31: am
aec31aae: Merge "Add a new type of profile data in ART profiler"
* commit '
8df24a31618cda75ffa4c63e1db0e27c312286cc':
Add a new type of profile data in ART profiler
Calin Juravle [Fri, 27 Jun 2014 14:50:25 +0000 (14:50 +0000)]
am
aec31aae: Merge "Add a new type of profile data in ART profiler"
* commit '
aec31aaef2750c620528a35491fd4d9a23f5be7c':
Add a new type of profile data in ART profiler
Vladimir Marko [Fri, 27 Jun 2014 14:27:11 +0000 (14:27 +0000)]
am
3212ca5c: am
a94d7fd1: Merge "Fix topological ordering and use it for optimizations."
* commit '
3212ca5cf24987beb596cc4539a489837359a7b8':
Fix topological ordering and use it for optimizations.
Vladimir Marko [Fri, 27 Jun 2014 14:22:51 +0000 (14:22 +0000)]
am
a94d7fd1: Merge "Fix topological ordering and use it for optimizations."
* commit '
a94d7fd18a11dc14fe43c5f814115b73d48846c2':
Fix topological ordering and use it for optimizations.
Sebastien Hertz [Fri, 27 Jun 2014 10:09:37 +0000 (10:09 +0000)]
am
cf0125a6: am
6c22b193: Merge "Fix JNI ToReflectedMethod for constructor"
* commit '
cf0125a633e1fc1f926f7cdc084fae4f02b503c1':
Fix JNI ToReflectedMethod for constructor
Sebastien Hertz [Fri, 27 Jun 2014 10:01:38 +0000 (10:01 +0000)]
am
6c22b193: Merge "Fix JNI ToReflectedMethod for constructor"
* commit '
6c22b193fb5fe71124846fa2c1d73f1670419476':
Fix JNI ToReflectedMethod for constructor
Bill Buzbee [Fri, 27 Jun 2014 17:44:58 +0000 (17:44 +0000)]
Merge "Fix quick mode bugs for Mips."
Douglas Leung [Wed, 25 Jun 2014 23:02:55 +0000 (16:02 -0700)]
Fix quick mode bugs for Mips.
This patch enable quick mode for Mips and allows the emulator to boot.
However the emulator is still not 100% functional. It still have problems
launching some apps.
Change-Id: Id46a39a649a2fd431a9f13b06ecf34cbd1d20930
Signed-off-by: Douglas Leung <douglas@mips.com>
Andreas Gampe [Fri, 27 Jun 2014 18:47:39 +0000 (18:47 +0000)]
Merge "ART: Bump runtime version to 2.1.0"
Andreas Gampe [Thu, 26 Jun 2014 15:09:17 +0000 (08:09 -0700)]
ART: Bump runtime version to 2.1.0
Bump the version of ART to 2.1.0 to reflect recent changes like
native MultiDex support.
Change-Id: Idcff71faac932c2b30359fbe13a975fb818ecb0e
Bill Buzbee [Fri, 27 Jun 2014 17:42:48 +0000 (17:42 +0000)]
Merge "AArch64: implement easy division and reminder."
Calin Juravle [Fri, 27 Jun 2014 14:41:59 +0000 (14:41 +0000)]
Merge "Add a new type of profile data in ART profiler"
Wei Jin [Fri, 20 Jun 2014 22:56:53 +0000 (15:56 -0700)]
Add a new type of profile data in ART profiler
This CL allows the ART profiler to collect bounded stack information
that contains only method signature and dex pc on the current stack
frames to a bounded depth. The type of the profile data is by
default disabled, and can be enabled by setting the option
"-Xprofile-type:stack". The bound is controlled by the option
"-Xprofile-max-stack-depth:integervalue".
Change-Id: Ieab789951018b2263c4d140b40b6c73bffc6a549
Sebastien Hertz [Fri, 27 Jun 2014 07:01:15 +0000 (07:01 +0000)]
Merge "Fix JNI ToReflectedMethod for constructor"
Andreas Gampe [Thu, 26 Jun 2014 21:22:41 +0000 (21:22 +0000)]
am
0a765541: am
cdda4e5b: Merge "ART: Change sprintf to snprintf"
* commit '
0a7655418cb41929ae93c478de3ddf037b86afbc':
ART: Change sprintf to snprintf
Vladimir Marko [Fri, 27 Jun 2014 14:12:03 +0000 (14:12 +0000)]
Merge "Fix topological ordering and use it for optimizations."
Andreas Gampe [Thu, 26 Jun 2014 21:14:46 +0000 (21:14 +0000)]
am
cdda4e5b: Merge "ART: Change sprintf to snprintf"
* commit '
cdda4e5b6616cc3f2b11c4539e208092f0e263a2':
ART: Change sprintf to snprintf
Jeff Hao [Thu, 26 Jun 2014 20:40:31 +0000 (20:40 +0000)]
am
42840d0f: am
b2c369f7: Merge "Expanded native code to use arraycopy for specific data types."
* commit '
42840d0f1cfa11ab73b94482210a8f8d448f9769':
Expanded native code to use arraycopy for specific data types.
Jeff Hao [Thu, 26 Jun 2014 20:37:06 +0000 (20:37 +0000)]
am
b2c369f7: Merge "Expanded native code to use arraycopy for specific data types."
* commit '
b2c369f74f5e4b3bae1cd4b0e251e17e26254f86':
Expanded native code to use arraycopy for specific data types.
Dave Allison [Thu, 26 Jun 2014 19:54:15 +0000 (19:54 +0000)]
am
21add57d: am
fee5586d: Merge "Support additional instructions in ARM and thumb assemblers"
* commit '
21add57dacbd1257b064836b3a82810b3e429a85':
Support additional instructions in ARM and thumb assemblers
Dave Allison [Thu, 26 Jun 2014 19:48:43 +0000 (19:48 +0000)]
am
fee5586d: Merge "Support additional instructions in ARM and thumb assemblers"
* commit '
fee5586dac3bf22a31dbbffe7b4ca7e978e53185':
Support additional instructions in ARM and thumb assemblers
Bill Buzbee [Fri, 27 Jun 2014 19:23:31 +0000 (19:23 +0000)]
Merge "AArch64: Enable GenSpecialCase."
Zheng Xu [Mon, 23 Jun 2014 10:33:08 +0000 (18:33 +0800)]
AArch64: Enable GenSpecialCase.
With the following fixes:
1. Map reference register to 64-bit argument register.
2. Set max_mapped_in_ to the index of last in. (Originally it was the
low part of the wide register)
Change-Id: If41de654a004a0561396e349d1f150517a72ab2f
Mathieu Chartier [Fri, 27 Jun 2014 17:37:18 +0000 (17:37 +0000)]
Merge "Don't allow negative GetFreeMemory."
Mathieu Chartier [Fri, 27 Jun 2014 16:57:12 +0000 (09:57 -0700)]
Don't allow negative GetFreeMemory.
The max allowed footprint is only updated after the GC. But we can
still allocate even if bytes_allocated > max_allowed_footprint_.
This means that we used to be able to get a negative value if
bytes_allocated > max_allowed_footprint_.
External bug:
https://code.google.com/p/android/issues/detail?id=72221
Change-Id: I4ef9a534e29211786e82cdcb2582c11ab37a348a
Andreas Gampe [Fri, 27 Jun 2014 16:15:37 +0000 (16:15 +0000)]
Merge "ART: ARM64 fp return reg locations are FP"
Andreas Gampe [Fri, 27 Jun 2014 15:43:05 +0000 (08:43 -0700)]
ART: ARM64 fp return reg locations are FP
Change-Id: Ica14b63ebde8efda113a146939309a6c37adc9aa
Andreas Gampe [Thu, 26 Jun 2014 21:06:47 +0000 (21:06 +0000)]
Merge "ART: Change sprintf to snprintf"
Andreas Gampe [Thu, 26 Jun 2014 20:49:36 +0000 (13:49 -0700)]
ART: Change sprintf to snprintf
Use of sprintf is discouraged. Change to snprintf in utils.cc. Avoids
a warning with GCC 4.9.
Change-Id: I03cc13a0f00dff07e8b775584ece9c4e4a64e590
Dave Allison [Thu, 26 Jun 2014 18:24:26 +0000 (18:24 +0000)]
Merge "Support additional instructions in ARM and thumb assemblers"
Dave Allison [Fri, 27 Jun 2014 16:44:15 +0000 (16:44 +0000)]
Merge "Fix off-by-one errors in limit checking for ldr/str instructions."
Dave Allison [Fri, 27 Jun 2014 00:57:36 +0000 (17:57 -0700)]
Fix off-by-one errors in limit checking for ldr/str instructions.
The LDR/STR encoder in the thumb assembler had an off-by-one
error for limit checking for immediates. This resulted in an
assertion failure for things like 'ldr rx,[ry,#128]'
Bug:
15876206
Change-Id: Ic866212e2feae94e0bd4c753724898d84f5cb944
Jeff Hao [Thu, 26 Jun 2014 20:27:27 +0000 (20:27 +0000)]
Merge "Expanded native code to use arraycopy for specific data types."
Dave Allison [Wed, 25 Jun 2014 19:37:10 +0000 (12:37 -0700)]
Support additional instructions in ARM and thumb assemblers
This adds the following support for the ARM and thumb assemblers:
1. Shifting by a register.
2. LDR/STR with a register offset, possibly shifted.
3. LDR(literal).
4. STR PC relative.
Also adds tests for them in the thumb assembler gtest.
Change-Id: Ie467e3c1d06b699cacbdef3482ed9a92e4f1809b
Nicolas Geoffray [Thu, 26 Jun 2014 12:53:02 +0000 (12:53 +0000)]
am
4edcf40e: am
57d99f67: Merge "Return "false" instead of "nullptr" in bool DexFile::Open."
* commit '
4edcf40e492f4c0404458826955740bc06500169':
Return "false" instead of "nullptr" in bool DexFile::Open.
Nicolas Geoffray [Thu, 26 Jun 2014 12:50:10 +0000 (12:50 +0000)]
am
57d99f67: Merge "Return "false" instead of "nullptr" in bool DexFile::Open."
* commit '
57d99f671a1c0b0889095fd6fd0e51dcd7f7696b':
Return "false" instead of "nullptr" in bool DexFile::Open.
Sebastien Hertz [Thu, 26 Jun 2014 12:45:07 +0000 (14:45 +0200)]
Fix JNI ToReflectedMethod for constructor
Returns java.lang.reflect.Constructor object for <init> and <clinit> methods.
Bug: https://code.google.com/p/android/issues/detail?id=72312
Bug:
15885285
Change-Id: I2f4a266b2d9574659673dc6966104860578d709e
Nicolas Geoffray [Thu, 26 Jun 2014 12:42:08 +0000 (12:42 +0000)]
am
e4be0f77: am
58fb36a8: Merge "Fix build rule."
* commit '
e4be0f77695e11cb015b64d1ed5ee00b0a44bdc0':
Fix build rule.
Nicolas Geoffray [Thu, 26 Jun 2014 12:37:24 +0000 (12:37 +0000)]
am
58fb36a8: Merge "Fix build rule."
* commit '
58fb36a876d2f8f646c7497514275344dd4e3b78':
Fix build rule.
Nicolas Geoffray [Thu, 26 Jun 2014 10:36:22 +0000 (10:36 +0000)]
am
039f6b70: am
b1cbf58b: Merge "Re-enable tests with the optimizing compiler."
* commit '
039f6b70b36a51d8f830405028ec2952496b9244':
Re-enable tests with the optimizing compiler.
Sebastien Hertz [Thu, 26 Jun 2014 10:36:21 +0000 (10:36 +0000)]
am
e5f8f78d: am
0c173466: Merge "Fix memory leak in JDWP object registry"
* commit '
e5f8f78d285fc723567bca1325d27f21ec600e16':
Fix memory leak in JDWP object registry
Andreas Gampe [Thu, 26 Jun 2014 10:36:20 +0000 (10:36 +0000)]
am
404283f0: am
8803c1cb: Merge "ART: Use ANDROID_HOST_OUT for ANDROID_ROOT in Runtime tests"
* commit '
404283f0390dcfea62695fd13177b5ffe7091f8c':
ART: Use ANDROID_HOST_OUT for ANDROID_ROOT in Runtime tests
Nicolas Geoffray [Thu, 26 Jun 2014 10:30:47 +0000 (10:30 +0000)]
am
b1cbf58b: Merge "Re-enable tests with the optimizing compiler."
* commit '
b1cbf58b4d0bfe58d1ac8716c1d5c4c646983478':
Re-enable tests with the optimizing compiler.
Sebastien Hertz [Thu, 26 Jun 2014 10:30:46 +0000 (10:30 +0000)]
am
0c173466: Merge "Fix memory leak in JDWP object registry"
* commit '
0c1734665c38b3116e38a90ad06c3f152d9316c5':
Fix memory leak in JDWP object registry
Andreas Gampe [Thu, 26 Jun 2014 10:30:45 +0000 (10:30 +0000)]
am
8803c1cb: Merge "ART: Use ANDROID_HOST_OUT for ANDROID_ROOT in Runtime tests"
* commit '
8803c1cb633de1b0e0a48ffea30ddd8fac201a0e':
ART: Use ANDROID_HOST_OUT for ANDROID_ROOT in Runtime tests
Andreas Gampe [Thu, 26 Jun 2014 03:10:27 +0000 (03:10 +0000)]
am
ff786b91: am
8a9f3ee5: Merge "ART: Native support for multidex"
* commit '
ff786b917dbb86989c888a5f1563f47457d7bff8':
ART: Native support for multidex
Andreas Gampe [Thu, 26 Jun 2014 03:05:50 +0000 (03:05 +0000)]
am
8a9f3ee5: Merge "ART: Native support for multidex"
* commit '
8a9f3ee5c955e4ff7cf9af6551fd432b454c4b13':
ART: Native support for multidex
Brian Carlstrom [Wed, 25 Jun 2014 21:39:07 +0000 (21:39 +0000)]
am
48e29b00: am
b849f6dd: Merge "Fix linux build."
* commit '
48e29b00b6dfcad2588f79fa67f6317d9d34008e':
Fix linux build.
Brian Carlstrom [Wed, 25 Jun 2014 21:35:38 +0000 (21:35 +0000)]
am
b849f6dd: Merge "Fix linux build."
* commit '
b849f6dd638fd1246724160cd5c01ab1a5ff33bd':
Fix linux build.
Brian Carlstrom [Wed, 25 Jun 2014 21:03:54 +0000 (21:03 +0000)]
am
663ab27f: am
e334cca5: Merge "Further refine gtest dependencies."
* commit '
663ab27f1598042dd266b196124c735e0c45882c':
Further refine gtest dependencies.
Andreas Gampe [Wed, 25 Jun 2014 20:58:42 +0000 (20:58 +0000)]
am
2ae11512: am
b0947fcc: Merge "Copyright assignment"
* commit '
2ae11512a5ce3db3275f824223262689efc80c84':
Copyright assignment
Brian Carlstrom [Wed, 25 Jun 2014 20:58:25 +0000 (20:58 +0000)]
am
e334cca5: Merge "Further refine gtest dependencies."
* commit '
e334cca5b9840a123a298efd1a00956f621341e4':
Further refine gtest dependencies.
Andreas Gampe [Wed, 25 Jun 2014 20:54:43 +0000 (20:54 +0000)]
am
b0947fcc: Merge "Copyright assignment"
* commit '
b0947fcc8257da852dafb6337bd41dab568c7ba5':
Copyright assignment
Ian Rogers [Wed, 25 Jun 2014 20:45:51 +0000 (20:45 +0000)]
am
21b3a87f: am
3ee7b367: Merge "Fix the Mac build on x86-64."
* commit '
21b3a87fd01c1925aec1d3184cc285be3e66473c':
Fix the Mac build on x86-64.
Ian Rogers [Wed, 25 Jun 2014 19:07:49 +0000 (19:07 +0000)]
am
3ee7b367: Merge "Fix the Mac build on x86-64."
* commit '
3ee7b36798d0f3042ca6198124186cb5e6b7f2bc':
Fix the Mac build on x86-64.
Sebastien Hertz [Wed, 25 Jun 2014 17:36:31 +0000 (17:36 +0000)]
am
e7248f2f: Merge "Really use GCC for ARM64"
* commit '
e7248f2f1835ed194296d4f989c56251d03b834b':
Really use GCC for ARM64
Brian Carlstrom [Wed, 25 Jun 2014 20:52:19 +0000 (20:52 +0000)]
Merge "Further refine gtest dependencies."
Brian Carlstrom [Wed, 25 Jun 2014 20:23:00 +0000 (13:23 -0700)]
Further refine gtest dependencies.
(cherry picked from commit
4ac5c69266a7deab188e65df0e528eadc66e1c06)
Change-Id: I3603776efbc697bae21e79f6976afbd21baf150d
Andreas Gampe [Thu, 26 Jun 2014 04:59:51 +0000 (04:59 +0000)]
Merge "ART: Use ANDROID_HOST_OUT for ANDROID_ROOT in Runtime tests"
Andreas Gampe [Thu, 26 Jun 2014 00:22:59 +0000 (17:22 -0700)]
ART: Use ANDROID_HOST_OUT for ANDROID_ROOT in Runtime tests
On the host, if ANDROID_ROOT is not set, first try ANDROID_HOST_OUT.
This will ensure that builds with OUT_DIR_COMMON_BASE will run the
gtests correctly, as icu will use ANDROID_ROOT to look for a file.
Change-Id: I8988901be32249c1c79f96b36947a647df5de041
Andreas Gampe [Thu, 26 Jun 2014 02:57:02 +0000 (02:57 +0000)]
Merge "ART: Native support for multidex"
Andreas Gampe [Thu, 22 May 2014 01:46:59 +0000 (18:46 -0700)]
ART: Native support for multidex
Native support for zip files with multiple classesX.dex.
Works by explicitly looking for those files in ascending order. As
these files have no file system representation for themselves,
introduce synthetic dex locations: the name of the originating file
plus a colon plus the name of the dex file, e.g., test.jar:classes2.dex.
Opening a zip dex file will return all dex files in this way. This
keeps the changes to dex2oat minimal.
To hide multidex/synthetic names from the Java layer, let the handle
of dalvik.system.DexFile refer to a vector of DexFile objects. When
opening a location, test possible synthetic names and add them to the
vector. Thus, the original multidex jar in the classpath will be
associated with all embedded dex files.
Change-Id: I0de107e1369cbc94416c544aca3b17525c9eac8b
Brian Carlstrom [Wed, 25 Jun 2014 21:23:35 +0000 (21:23 +0000)]
Merge "Fix linux build."
Brian Carlstrom [Wed, 25 Jun 2014 21:11:45 +0000 (14:11 -0700)]
Fix linux build.
Change-Id: Ic480b454fe7ecd435d1b2292971f2a59bd26d2bd
Andreas Gampe [Wed, 25 Jun 2014 20:39:13 +0000 (20:39 +0000)]
Merge "Copyright assignment"
Bernhard Rosenkraenzer [Wed, 25 Jun 2014 20:36:44 +0000 (22:36 +0200)]
Copyright assignment
Reassign the copyright on the Linaro-written file to the
Android Open Source Project
Change-Id: I0194056207567f51950c5a3acc46857409c66727
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
Brian Carlstrom [Wed, 25 Jun 2014 20:34:43 +0000 (20:34 +0000)]
Merge "Further refine gtest dependencies."
Brian Carlstrom [Wed, 25 Jun 2014 20:23:00 +0000 (13:23 -0700)]
Further refine gtest dependencies.
Change-Id: I9af90d2b7f5b499cfe6f8378cf5bac52ea1a7dad
Sebastien Hertz [Wed, 25 Jun 2014 18:47:00 +0000 (18:47 +0000)]
am
d5ee86ec: am
e7248f2f: Merge "Really use GCC for ARM64"
* commit '
d5ee86ecf38915abc5ec90204a9d7354f9828353':
Really use GCC for ARM64
Brian Carlstrom [Wed, 25 Jun 2014 18:46:59 +0000 (18:46 +0000)]
Brian Carlstrom [Wed, 25 Jun 2014 18:46:57 +0000 (18:46 +0000)]
am
54708050: am
ebeaf8f7: Merge "Treat larger than jint capacity in NewDirectByteBuffer as an error"
* commit '
547080500bc5eb6856254df077aaf4eadca471f4':
Treat larger than jint capacity in NewDirectByteBuffer as an error
Nicolas Geoffray [Wed, 25 Jun 2014 18:14:52 +0000 (18:14 +0000)]
am
1d61b33b: am
fe6bfba3: Merge "Revert "Re-enable tests with the optimizing compiler.""
* commit '
1d61b33b9a7d50e7f9910677beb897443d43e96e':
Revert "Re-enable tests with the optimizing compiler."
Nicolas Geoffray [Wed, 25 Jun 2014 18:14:51 +0000 (18:14 +0000)]
am
5da93ae1: am
84691ba2: Merge "Re-enable tests with the optimizing compiler."
* commit '
5da93ae1355ccedb47d90b33fe53c4b9fd36368a':
Re-enable tests with the optimizing compiler.
Nicolas Geoffray [Wed, 25 Jun 2014 18:14:50 +0000 (18:14 +0000)]
am
d5201be5: am
ae43e2b1: Merge "Fix test-art-target error"
* commit '
d5201be5e1990879ec3d839121a9e8d395aa55ce':
Fix test-art-target error
Nicolas Geoffray [Wed, 25 Jun 2014 18:14:49 +0000 (18:14 +0000)]
am
bd19364b: am
89522f4b: Merge "Fix a bug in LiveInterval::FirstRegisterUseAfter."
* commit '
bd19364b90c385a8989b80a1a0ace8ad47bc7c88':
Fix a bug in LiveInterval::FirstRegisterUseAfter.
Brian Carlstrom [Wed, 25 Jun 2014 18:14:47 +0000 (18:14 +0000)]
am
a2aa5cfb: am
b5dc9444: Merge "Fix names of TEST_ART_TIMING_SENSITIVE_RUN_TESTS"
* commit '
a2aa5cfb1ca3096ed8eccab1a746d357daac89f8':
Fix names of TEST_ART_TIMING_SENSITIVE_RUN_TESTS
Brian Carlstrom [Wed, 25 Jun 2014 18:14:46 +0000 (18:14 +0000)]
am
29282d82: am
e043deb5: Merge "Add libjavacore dependency for oat tests"
* commit '
29282d8291847f9e13a32194640fc5a488ab5fdc':
Add libjavacore dependency for oat tests
Ian Rogers [Wed, 25 Jun 2014 18:14:45 +0000 (18:14 +0000)]
am
64eaccb3: am
3153895d: Merge "Weaken condition to dump a thread\'s stack in a debug build."
* commit '
64eaccb3dbbc7523c1c070d33b0c3f1610f8cd35':
Weaken condition to dump a thread's stack in a debug build.
Ian Rogers [Wed, 25 Jun 2014 18:14:44 +0000 (18:14 +0000)]
am
90b19dab: am
ece10dbe: Merge "Define run-test targets."
* commit '
90b19dab1f94d1adfcd89217158ea382b2f7fdbe':
Define run-test targets.
Ian Rogers [Wed, 25 Jun 2014 18:14:43 +0000 (18:14 +0000)]
am
a4bce9e0: am
b9d11f7e: Merge "x86_64: Fix wide argument increment"
* commit '
a4bce9e0e61c66ded36c903a6f480922517772b9':
x86_64: Fix wide argument increment
Ian Rogers [Wed, 25 Jun 2014 18:14:42 +0000 (18:14 +0000)]
am
7896d11c: am
c6f0f60b: Merge "x86_64: int-to-long should ensure that int in kCoreReg"
* commit '
7896d11ce3fbadf3026fe6572513ee2682fa32bf':
x86_64: int-to-long should ensure that int in kCoreReg
Ian Rogers [Wed, 25 Jun 2014 18:10:23 +0000 (11:10 -0700)]
resolved conflicts for merge of
4153a39a to master
Change-Id: I7e2fa9d5a8ebaa653dd4f25b26d68e13e6abaa27
Andreas Gampe [Wed, 25 Jun 2014 20:22:43 +0000 (20:22 +0000)]
Merge "Revert "Quick compiler: remove temporary workaround.""
Andreas Gampe [Wed, 25 Jun 2014 20:20:36 +0000 (20:20 +0000)]
Revert "Quick compiler: remove temporary workaround."
This reverts commit
47d2fe6c3d6352e7dafd720865457e84c409591a.
Leads to errors in 32b zygote on 64b device.
Change-Id: I6f6c43274f095e15a28bc5617661ff69371f708e
Brian Carlstrom [Wed, 25 Jun 2014 17:04:06 +0000 (17:04 +0000)]
Brian Carlstrom [Wed, 25 Jun 2014 16:37:50 +0000 (16:37 +0000)]
am
ebeaf8f7: Merge "Treat larger than jint capacity in NewDirectByteBuffer as an error"
* commit '
ebeaf8f7c88af0917f4b7b1137dd78d56d66dd59':
Treat larger than jint capacity in NewDirectByteBuffer as an error