OSDN Git Service
Nicolas Geoffray [Thu, 4 Dec 2014 19:52:17 +0000 (19:52 +0000)]
am
d448808e: am
c1222615: Merge "Build core.oat without flags."
* commit '
d448808e52be42259bfcbbeee3b1f835636c4843':
Build core.oat without flags.
Vladimir Marko [Thu, 4 Dec 2014 19:51:06 +0000 (19:51 +0000)]
am
508dc7ad: am
875ca0fb: Merge "Revert "Rewrite ImageWriter\'s merging of String char[]s.""
* commit '
508dc7adbdd17fd758cdceb898d1d5bfa40f01a8':
Revert "Rewrite ImageWriter's merging of String char[]s."
Roland Levillain [Thu, 4 Dec 2014 19:51:04 +0000 (19:51 +0000)]
am
ec9d45db: am
0540330d: Merge "Add support for float-to-double & double-to-float in optimizing."
* commit '
ec9d45db729658d843ab1fa0533389c073fd7b00':
Add support for float-to-double & double-to-float in optimizing.
Roland Levillain [Thu, 4 Dec 2014 19:51:02 +0000 (19:51 +0000)]
am
bdedbbf7: am
833e903b: Merge "Add support for float-to-long in the optimizing compiler."
* commit '
bdedbbf7f25f172ca32b1ce55856f355a8f5232e':
Add support for float-to-long in the optimizing compiler.
Vladimir Marko [Thu, 4 Dec 2014 19:51:01 +0000 (19:51 +0000)]
am
bfbd2a31: am
3947000d: Merge "Rewrite ImageWriter\'s merging of String char[]s."
* commit '
bfbd2a31504438081215f41173449926180a887b':
Rewrite ImageWriter's merging of String char[]s.
Sebastien Hertz [Thu, 4 Dec 2014 19:50:59 +0000 (19:50 +0000)]
am
6bf2bde8: am
baede348: Merge "JDWP: fix breakpoint for method in the image"
* commit '
6bf2bde8fbc81d3f55d508a1bc7dc4bb7d660839':
JDWP: fix breakpoint for method in the image
Vladimir Marko [Thu, 4 Dec 2014 19:50:57 +0000 (19:50 +0000)]
am
a480ca73: am
989210eb: Merge "Quick: Use fewer insns for ARM LDR/STR with large offsets."
* commit '
a480ca73ec641c1af65b090253c4971873279ee8':
Quick: Use fewer insns for ARM LDR/STR with large offsets.
Vladimir Marko [Thu, 4 Dec 2014 19:50:56 +0000 (19:50 +0000)]
am
eb46bd8e: am
4334f957: Merge "Call ProcessStrings() in ImageWriter, fix prefix check."
* commit '
eb46bd8e4c31498e19d9ec0870a99fd6828181f5':
Call ProcessStrings() in ImageWriter, fix prefix check.
Mathieu Chartier [Thu, 4 Dec 2014 19:50:54 +0000 (19:50 +0000)]
am
bbf9c871: am
31bacb9d: Merge "Remove method verification results right after compiling a method"
* commit '
bbf9c871af300dfa03e8384cf1e82071aca3e184':
Remove method verification results right after compiling a method
Andreas Gampe [Thu, 4 Dec 2014 19:50:53 +0000 (19:50 +0000)]
am
00e5083d: am
8b9a97e8: Merge "ART: Fix unclosed files in dex2oat"
* commit '
00e5083d98810c2ca0cda5032b11c4559d03ad0a':
ART: Fix unclosed files in dex2oat
Nicolas Geoffray [Thu, 4 Dec 2014 15:24:43 +0000 (15:24 +0000)]
am
c1222615: Merge "Build core.oat without flags."
* commit '
c12226152c18536f2df6591821d5370fc1fb57fa':
Build core.oat without flags.
Vladimir Marko [Thu, 4 Dec 2014 15:11:28 +0000 (15:11 +0000)]
am
875ca0fb: Merge "Revert "Rewrite ImageWriter\'s merging of String char[]s.""
* commit '
875ca0fb97a8652920292ec0ecd5aaf54d2a3b2e':
Revert "Rewrite ImageWriter's merging of String char[]s."
Roland Levillain [Thu, 4 Dec 2014 15:11:27 +0000 (15:11 +0000)]
am
0540330d: Merge "Add support for float-to-double & double-to-float in optimizing."
* commit '
0540330d5d262770002a28f8d81588f7cc28d374':
Add support for float-to-double & double-to-float in optimizing.
Roland Levillain [Thu, 4 Dec 2014 15:11:25 +0000 (15:11 +0000)]
am
833e903b: Merge "Add support for float-to-long in the optimizing compiler."
* commit '
833e903b7a9063f37bea3c505cf134fc4a4e2084':
Add support for float-to-long in the optimizing compiler.
Vladimir Marko [Thu, 4 Dec 2014 15:11:24 +0000 (15:11 +0000)]
am
3947000d: Merge "Rewrite ImageWriter\'s merging of String char[]s."
* commit '
3947000d3c84e87558471fb703ed330f457804d7':
Rewrite ImageWriter's merging of String char[]s.
Sebastien Hertz [Thu, 4 Dec 2014 15:11:22 +0000 (15:11 +0000)]
am
baede348: Merge "JDWP: fix breakpoint for method in the image"
* commit '
baede348efa86600e64fb9db43cec1eef07c86d9':
JDWP: fix breakpoint for method in the image
Vladimir Marko [Thu, 4 Dec 2014 15:11:21 +0000 (15:11 +0000)]
am
989210eb: Merge "Quick: Use fewer insns for ARM LDR/STR with large offsets."
* commit '
989210eb453898bd94bf3527f18f6146b07aa4bb':
Quick: Use fewer insns for ARM LDR/STR with large offsets.
Vladimir Marko [Thu, 4 Dec 2014 15:11:19 +0000 (15:11 +0000)]
am
4334f957: Merge "Call ProcessStrings() in ImageWriter, fix prefix check."
* commit '
4334f95705d8efcbb34ffc5165c3f866eaa8086f':
Call ProcessStrings() in ImageWriter, fix prefix check.
Mathieu Chartier [Thu, 4 Dec 2014 15:11:18 +0000 (15:11 +0000)]
am
31bacb9d: Merge "Remove method verification results right after compiling a method"
* commit '
31bacb9da9c931aa04489b0701172c4a35a20e31':
Remove method verification results right after compiling a method
Andreas Gampe [Thu, 4 Dec 2014 15:11:16 +0000 (15:11 +0000)]
am
8b9a97e8: Merge "ART: Fix unclosed files in dex2oat"
* commit '
8b9a97e8b6ed97ff1991596cbd0f7ce78f004766':
ART: Fix unclosed files in dex2oat
Nicolas Geoffray [Thu, 4 Dec 2014 15:11:10 +0000 (15:11 +0000)]
Merge "Build core.oat without flags."
Nicolas Geoffray [Thu, 4 Dec 2014 14:39:31 +0000 (14:39 +0000)]
Build core.oat without flags.
Existing tools (like vogar) assume only one boot image, so to test the
boot image compiled with the optimizing compiler, we have to compile
core.oat with it.
Change-Id: I4b55236163333709b05c80eea18778ecd2b58a91
Vladimir Marko [Thu, 4 Dec 2014 12:31:16 +0000 (12:31 +0000)]
Merge "Revert "Rewrite ImageWriter's merging of String char[]s.""
Roland Levillain [Thu, 4 Dec 2014 12:30:06 +0000 (12:30 +0000)]
Merge "Add support for float-to-double & double-to-float in optimizing."
Vladimir Marko [Thu, 4 Dec 2014 12:29:32 +0000 (12:29 +0000)]
Revert "Rewrite ImageWriter's merging of String char[]s."
This reverts commit
c73743cfd9718a8e1eeb9c9220c182a475935a1c.
Change-Id: Id7ee22ff0ebcd2df0f8c2f4432977dbcd81b0b56
Roland Levillain [Thu, 4 Dec 2014 12:10:50 +0000 (12:10 +0000)]
Add support for float-to-double & double-to-float in optimizing.
Change-Id: I41b0fee5a28c83757697c8d000b7e224cf5a4534
Roland Levillain [Thu, 4 Dec 2014 12:01:55 +0000 (12:01 +0000)]
Merge "Add support for float-to-long in the optimizing compiler."
Roland Levillain [Thu, 4 Dec 2014 11:54:28 +0000 (11:54 +0000)]
Add support for float-to-long in the optimizing compiler.
- Add support for the float-to-long Dex instruction in the
optimizing compiler.
- Add a Dex PC field to art::HTypeConversion to allow the
x86 and ARM code generators to produce runtime calls.
- Instruct art::CodeGenerator::RecordPcInfo not to record
PC information for HTypeConversion instructions.
- Add S0 to the list of ARM FPU parameter registers.
- Have art::x86_64::X86_64Assembler::cvttss2si work with
64-bit operands.
- Generate x86, x86-64 and ARM (but not ARM64) code for
float to long HTypeConversion nodes.
- Add related tests to test/422-type-conversion.
Change-Id: I954214f0d537187883f83f7a83a1bb2dd8a21fd4
Vladimir Marko [Thu, 4 Dec 2014 11:31:34 +0000 (11:31 +0000)]
Merge "Rewrite ImageWriter's merging of String char[]s."
Vladimir Marko [Wed, 3 Dec 2014 15:28:15 +0000 (15:28 +0000)]
Rewrite ImageWriter's merging of String char[]s.
Simply sort the Strings and then look at two consecutive
Strings to find prefixes and duplicates. Avoid unnecessary
memory allocations.
Change-Id: I996306ed4b31e61f9f0def8f3bcce71eb01c9265
Sebastien Hertz [Thu, 4 Dec 2014 10:21:02 +0000 (10:21 +0000)]
Merge "JDWP: fix breakpoint for method in the image"
Vladimir Marko [Thu, 4 Dec 2014 10:12:23 +0000 (10:12 +0000)]
Merge "Quick: Use fewer insns for ARM LDR/STR with large offsets."
Vladimir Marko [Wed, 3 Dec 2014 12:16:56 +0000 (12:16 +0000)]
Quick: Use fewer insns for ARM LDR/STR with large offsets.
LDR with large offset is frequently used for reading from
DexCache arrays, for example for static and direct invokes.
STR with large offset is rarely used but it's updated for
consistency.
Change-Id: I75871416cecbfd7fe7de590922cea0376a2f4019
Vladimir Marko [Thu, 4 Dec 2014 10:08:07 +0000 (10:08 +0000)]
Merge "Call ProcessStrings() in ImageWriter, fix prefix check."
Nicolas Geoffray [Thu, 4 Dec 2014 09:21:59 +0000 (09:21 +0000)]
am
5e8db040: am
27478e62: Merge "Don\'t re-use arttest when calling loadLibrary."
* commit '
5e8db0407ec5bf282ddc40e24aa48fc6b6358a89':
Don't re-use arttest when calling loadLibrary.
David 'Digit' Turner [Thu, 4 Dec 2014 09:21:50 +0000 (09:21 +0000)]
am
dc689a99: am
acb23cf9: Merge "Fix VM-less builds."
* commit '
dc689a99e2a6f28bd2f4b5ced4ec1967a1dfde22':
Fix VM-less builds.
Sebastien Hertz [Wed, 26 Nov 2014 21:11:27 +0000 (22:11 +0100)]
JDWP: fix breakpoint for method in the image
When we set a breakpoint in a compiled method, we deoptimize it by
changing its entrypoint so it is executed with the interpreter.
However, methods in the image can be called with their direct code
pointer, ignoring the updated entrypoint. In that case, the method
is not executed with the interpreter and we miss the breakpoint.
This CL avoids that situation by forcing a full deoptimization so
everything runs with the interpreter. However, if the image has been
compiled in PIC mode, we keep using selective deoptimization because
direct code pointer is not used in this mode.
Bug:
17965285
Change-Id: Icaf8cbb7fe9ad01d36f7378c59d50d9ce42ae57f
Mathieu Chartier [Thu, 4 Dec 2014 02:28:28 +0000 (02:28 +0000)]
Merge "Remove method verification results right after compiling a method"
Mathieu Chartier [Thu, 4 Dec 2014 01:38:22 +0000 (17:38 -0800)]
Remove method verification results right after compiling a method
This saves memory since it allows the code arrays from methods
compiled in future methods to use the ram we just freed from the
verification results.
GmsCore.apk:
Before: dex2oat took 77.383s (threads: 2) arena alloc=6MB java alloc=30MB native alloc=77MB free=13KB
After: dex2oat took 72.180s (threads: 2) arena alloc=6MB java alloc=30MB native alloc=60MB free=13KB
Bug:
18596910
Change-Id: I5d6df380e4fe58751a2b304202083f4d30b33b7c
(cherry picked from commit
25fda92083d5b93b38cc1f6b12ac6a44d992d6a4)
Andreas Gampe [Wed, 3 Dec 2014 23:26:47 +0000 (23:26 +0000)]
Merge "ART: Fix unclosed files in dex2oat"
Andreas Gampe [Wed, 3 Dec 2014 22:28:02 +0000 (14:28 -0800)]
ART: Fix unclosed files in dex2oat
Under some error conditions files are not closed, and the close guard
will complain.
Bug:
18603475
(cherry picked from commit
d97465c3742cc3c82843665f2678b881de29854b)
Change-Id: I7155e3f4f6231844edd375b9302ecf1ba8079950
Mathieu Chartier [Wed, 3 Dec 2014 20:40:47 +0000 (20:40 +0000)]
Nicolas Geoffray [Wed, 3 Dec 2014 18:28:44 +0000 (18:28 +0000)]
am
27478e62: Merge "Don\'t re-use arttest when calling loadLibrary."
* commit '
27478e627e08ab42c43d5d934da9ea336ccaf628':
Don't re-use arttest when calling loadLibrary.
Nicolas Geoffray [Wed, 3 Dec 2014 18:24:18 +0000 (18:24 +0000)]
Merge "Don't re-use arttest when calling loadLibrary."
Nicolas Geoffray [Wed, 3 Dec 2014 18:10:39 +0000 (18:10 +0000)]
Don't re-use arttest when calling loadLibrary.
When Android's build environment variables are set with envsetup.sh,
the test "works" ok, by getting a LinkageError because two class loaders
try to load the same library. I guess that is the reason for the
if (ExceptionCheck()) after the loading.
However, if the environment variables are set manually, there are
cases where the paths provided between a Java loadLibrary, and a
native loadLibrary are different, so we end up loading the library twice.
This makes the assertion line 32 fail on the second JNI_OnLoad call.
In my particular environment, ANDROID_BUILD_TOP was something lie
/foo/bar/..//.
This change stops re-using the same library, and makes the expected
outcome constant: the native call of loadLibrary with a non exist
library must throw a LinkageError.
Change-Id: I8721a03715e099c55fb8b2b87813f1e772c8e83d
David 'Digit' Turner [Wed, 3 Dec 2014 18:03:22 +0000 (18:03 +0000)]
am
acb23cf9: Merge "Fix VM-less builds."
* commit '
acb23cf959e7198566df161567292a824eaa8b27':
Fix VM-less builds.
David 'Digit' Turner [Wed, 3 Dec 2014 17:59:13 +0000 (17:59 +0000)]
Merge "Fix VM-less builds."
Vladimir Marko [Wed, 3 Dec 2014 14:35:54 +0000 (14:35 +0000)]
Call ProcessStrings() in ImageWriter, fix prefix check.
ProcessStrings was missing due to bad conflict resolution
in cherry-pick
https://android-review.googlesource.com/114971
The prefix check was broken by the "cherry-pick"
https://android-review.googlesource.com/115445
where in addition to a simple cherry-pick, an additional
comment was addressed and an error slipped in.
Change-Id: I130d1d1a2995fd4a4c27c918c2a0dc38724ce68f
Vladimir Marko [Wed, 3 Dec 2014 17:24:29 +0000 (17:24 +0000)]
am
050eff73: am
ccce1c02: Merge "Implement InexpensiveConstantInt(., opcode) for ARM."
* commit '
050eff73c0f544a37912489252dcde79245c5c24':
Implement InexpensiveConstantInt(., opcode) for ARM.
Roland Levillain [Wed, 3 Dec 2014 17:24:28 +0000 (17:24 +0000)]
am
75ba18b9: am
9a64a46e: Merge "Add support for float-to-int in the optimizing compiler."
* commit '
75ba18b9c6ac2adff9ccf695db5985b88a447c84':
Add support for float-to-int in the optimizing compiler.
Roland Levillain [Wed, 3 Dec 2014 17:24:26 +0000 (17:24 +0000)]
am
51dc2ae1: am
add2f944: Merge "Fix a compiler bug related to a catch-less try-finally statement."
* commit '
51dc2ae149c170feb7de2b7c033e65153b0e8dd9':
Fix a compiler bug related to a catch-less try-finally statement.
Nicolas Geoffray [Wed, 3 Dec 2014 17:24:25 +0000 (17:24 +0000)]
am
65c6d81a: am
1a3960aa: Merge "Explicitly give compiler options to test scripts"
* commit '
65c6d81ab8eb81552c57cb69a0db021ca267c5a1':
Explicitly give compiler options to test scripts
Calin Juravle [Wed, 3 Dec 2014 17:24:24 +0000 (17:24 +0000)]
am
97b77476: am
bbba809a: Merge "Fix new-instance node."
* commit '
97b774766ddaa10939ba9758cf6cae4358d3ae64':
Fix new-instance node.
Nicolas Geoffray [Wed, 3 Dec 2014 17:24:22 +0000 (17:24 +0000)]
am
cef26c5d: am
5ae0d29c: Merge "Update libcore script and add a new expectation file."
* commit '
cef26c5de14816dc637d04f15e8175c62e50633e':
Update libcore script and add a new expectation file.
Vladimir Marko [Wed, 3 Dec 2014 17:19:21 +0000 (17:19 +0000)]
am
ccce1c02: Merge "Implement InexpensiveConstantInt(., opcode) for ARM."
* commit '
ccce1c02b162b667139eaef563460b1e1f330891':
Implement InexpensiveConstantInt(., opcode) for ARM.
Roland Levillain [Wed, 3 Dec 2014 17:19:20 +0000 (17:19 +0000)]
am
9a64a46e: Merge "Add support for float-to-int in the optimizing compiler."
* commit '
9a64a46e8edfa89402598d8650b8ebb337ba3d52':
Add support for float-to-int in the optimizing compiler.
Roland Levillain [Wed, 3 Dec 2014 17:19:18 +0000 (17:19 +0000)]
am
add2f944: Merge "Fix a compiler bug related to a catch-less try-finally statement."
* commit '
add2f944284992106cd9a1f1df93a17d666eaaf6':
Fix a compiler bug related to a catch-less try-finally statement.
Nicolas Geoffray [Wed, 3 Dec 2014 17:19:17 +0000 (17:19 +0000)]
am
1a3960aa: Merge "Explicitly give compiler options to test scripts"
* commit '
1a3960aae50ee8f6967b7ff2d094dbcf5b6b5be4':
Explicitly give compiler options to test scripts
Calin Juravle [Wed, 3 Dec 2014 17:19:16 +0000 (17:19 +0000)]
am
bbba809a: Merge "Fix new-instance node."
* commit '
bbba809a680fa7ad030da351e92786848d63b9bf':
Fix new-instance node.
Nicolas Geoffray [Wed, 3 Dec 2014 17:19:14 +0000 (17:19 +0000)]
am
5ae0d29c: Merge "Update libcore script and add a new expectation file."
* commit '
5ae0d29cce8c3959b981e6b25ce17bff6f44062f':
Update libcore script and add a new expectation file.
Vladimir Marko [Wed, 3 Dec 2014 17:13:44 +0000 (17:13 +0000)]
Merge "Implement InexpensiveConstantInt(., opcode) for ARM."
Roland Levillain [Wed, 3 Dec 2014 16:04:28 +0000 (16:04 +0000)]
Merge "Add support for float-to-int in the optimizing compiler."
Roland Levillain [Wed, 3 Dec 2014 14:52:52 +0000 (14:52 +0000)]
Merge "Fix a compiler bug related to a catch-less try-finally statement."
Nicolas Geoffray [Wed, 3 Dec 2014 14:02:39 +0000 (14:02 +0000)]
Merge "Explicitly give compiler options to test scripts"
Nicolas Geoffray [Wed, 3 Dec 2014 13:36:10 +0000 (13:36 +0000)]
Explicitly give compiler options to test scripts
This makes tests pass when ART_USE_OPTIMIZING_COMPILER=true.
Change-Id: I579c0371033435ead6b06830f15c00dbf7e98005
Vladimir Marko [Tue, 25 Nov 2014 16:32:34 +0000 (16:32 +0000)]
Implement InexpensiveConstantInt(., opcode) for ARM.
Fix kThumb2{Add,Sub}RRI12 to be used for their full range.
Add ORN for completeness.
Change-Id: I49a51541fa9ea085d4674b9131d8dd94da5337f3
Roland Levillain [Tue, 2 Dec 2014 17:45:01 +0000 (17:45 +0000)]
Add support for float-to-int in the optimizing compiler.
- Add support for the float-to-int Dex instruction in the
optimizing compiler.
- Factor type conversion related lines in
compiler/optimizing/builder.cc.
- Generate x86, x86-64 and ARM (but not ARM64) code for
float to int HTypeConversion nodes.
- Add related tests to test/422-type-conversion.
Change-Id: I2382dfc04bf394ed75f675148cfcf98216d65bc6
Roland Levillain [Tue, 2 Dec 2014 17:16:31 +0000 (17:16 +0000)]
Fix a compiler bug related to a catch-less try-finally statement.
Ensure a dead basic block produced in this case is properly
removed.
Change-Id: I7c88e26aaa6c6378892f7c7c299494fa42312db2
Calin Juravle [Wed, 3 Dec 2014 11:48:51 +0000 (11:48 +0000)]
Merge "Fix new-instance node."
Nicolas Geoffray [Wed, 3 Dec 2014 11:48:08 +0000 (11:48 +0000)]
Merge "Update libcore script and add a new expectation file."
Nicolas Geoffray [Wed, 3 Dec 2014 11:30:26 +0000 (11:30 +0000)]
Update libcore script and add a new expectation file.
Change-Id: I3ff7784d4b43615f1d70a62c6b8595870f0afe4c
David 'Digit' Turner [Tue, 2 Dec 2014 12:28:21 +0000 (13:28 +0100)]
Fix VM-less builds.
This patch modifies Android.common_build.mk to avoid breaking the build
when trying to generate a system image that doesn't include a VM (which
is useful for low-level emulator feature testing, not general Android
development).
BUG=
18581643
Change-Id: Ib75ebf14d3e9c8fc2ac591c7edd2ab4d6ff2ca89
Mathieu Chartier [Wed, 3 Dec 2014 07:55:53 +0000 (07:55 +0000)]
am
f953f5f4: (-s ours) am
3029df6d: Print memory usage in dex2oat shutdown
* commit '
f953f5f4375cf0e9e022bea7d111511a62388233':
Print memory usage in dex2oat shutdown
Mathieu Chartier [Wed, 3 Dec 2014 02:59:58 +0000 (02:59 +0000)]
am
b6468461: am
6045c9ab: Merge "Fix mac build"
* commit '
b6468461bb7ef0b587fb21f7b52d026757f0c522':
Fix mac build
Mathieu Chartier [Wed, 3 Dec 2014 02:51:58 +0000 (02:51 +0000)]
am
6045c9ab: Merge "Fix mac build"
* commit '
6045c9ab329d69773f27498568b7bed8bbf08ff8':
Fix mac build
Mathieu Chartier [Wed, 3 Dec 2014 02:48:40 +0000 (02:48 +0000)]
Mathieu Chartier [Wed, 3 Dec 2014 02:44:46 +0000 (02:44 +0000)]
Merge "Fix mac build"
Mathieu Chartier [Wed, 3 Dec 2014 02:23:21 +0000 (18:23 -0800)]
Fix mac build
Macs don't have malloc.h, hopefully this fixes the build.
(cherry picked from commit
6cc5076a1248582cf16bd9a6a1719e0a4c1a1de2)
Change-Id: I94d10d2c3d16893625df210bdd5587eea4a1247f
Ian Rogers [Wed, 3 Dec 2014 02:44:09 +0000 (02:44 +0000)]
am
d92cc130: am
62070ac9: Merge "Remove MethodHelper."
* commit '
d92cc1307f1ae2773b18427672cb9e8f9edd92cb':
Remove MethodHelper.
Ian Rogers [Wed, 3 Dec 2014 02:44:08 +0000 (02:44 +0000)]
am
9fcfe2d9: am
a4b47a19: Merge "Remove MethodHelper::HasSameSignatureWithDifferentClassLoaders."
* commit '
9fcfe2d9e219f5d5784c4fd07fb60e27b8cd63d3':
Remove MethodHelper::HasSameSignatureWithDifferentClassLoaders.
Mathieu Chartier [Wed, 3 Dec 2014 02:44:06 +0000 (02:44 +0000)]
am
bf51fe8e: am
539f9384: Merge "Print memory usage in dex2oat shutdown"
* commit '
bf51fe8eb3ad982563f299422e9453cbc7b69388':
Print memory usage in dex2oat shutdown
Ian Rogers [Wed, 3 Dec 2014 02:44:05 +0000 (02:44 +0000)]
am
ab1f3e98: am
b5af2641: Merge "Fix artQuickResolutionTrampoline."
* commit '
ab1f3e980f25a549f893d251946c95b6db4ad21f':
Fix artQuickResolutionTrampoline.
Ian Rogers [Wed, 3 Dec 2014 02:44:03 +0000 (02:44 +0000)]
am
a511d010: am
81087210: Merge "Remove MethodHelper::HasSameNameAndSignature."
* commit '
a511d010cf536042bc28da79c02fc08319e36961':
Remove MethodHelper::HasSameNameAndSignature.
Ian Rogers [Wed, 3 Dec 2014 02:32:57 +0000 (02:32 +0000)]
am
62070ac9: Merge "Remove MethodHelper."
* commit '
62070ac9a1c2671a38e37122b4407b9d5a7ce1a6':
Remove MethodHelper.
Ian Rogers [Wed, 3 Dec 2014 02:32:56 +0000 (02:32 +0000)]
am
a4b47a19: Merge "Remove MethodHelper::HasSameSignatureWithDifferentClassLoaders."
* commit '
a4b47a196c5630d2be6ab5ee8b321e17bcc5a4a7':
Remove MethodHelper::HasSameSignatureWithDifferentClassLoaders.
Mathieu Chartier [Wed, 3 Dec 2014 02:32:55 +0000 (02:32 +0000)]
am
539f9384: Merge "Print memory usage in dex2oat shutdown"
* commit '
539f93847d78525b30666658643a8e21e41f16d8':
Print memory usage in dex2oat shutdown
Ian Rogers [Wed, 3 Dec 2014 02:32:53 +0000 (02:32 +0000)]
am
b5af2641: Merge "Fix artQuickResolutionTrampoline."
* commit '
b5af2641acf9d2e247baaa2ac7674f91b801878d':
Fix artQuickResolutionTrampoline.
Ian Rogers [Wed, 3 Dec 2014 02:32:51 +0000 (02:32 +0000)]
am
81087210: Merge "Remove MethodHelper::HasSameNameAndSignature."
* commit '
810872102513fd19836a9458d850567146ea1964':
Remove MethodHelper::HasSameNameAndSignature.
Mathieu Chartier [Wed, 3 Dec 2014 02:23:21 +0000 (18:23 -0800)]
Fix mac build
Macs don't have malloc.h, hopefully this fixes the build.
Change-Id: Id7600ea79197f36d3dfb5e7d589ac2f6ee325f85
Mathieu Chartier [Wed, 3 Dec 2014 02:17:20 +0000 (02:17 +0000)]
am
3029df6d: Print memory usage in dex2oat shutdown
* commit '
3029df6d212894647ba0e5c23443c40912c6ecc8':
Print memory usage in dex2oat shutdown
Ian Rogers [Wed, 3 Dec 2014 02:03:08 +0000 (02:03 +0000)]
Merge "Remove MethodHelper."
Ian Rogers [Wed, 3 Dec 2014 01:49:19 +0000 (17:49 -0800)]
Remove MethodHelper.
Move use as a shorty processor to only use in portable.
Move GetNumberOfReferenceArgsWithoutReceiver to mirror::ArtMethod.
Change-Id: I7ded3d05315c84bce4ab19cb330ef74289da4bb3
Ian Rogers [Wed, 3 Dec 2014 01:32:33 +0000 (01:32 +0000)]
Merge "Remove MethodHelper::HasSameSignatureWithDifferentClassLoaders."
Mathieu Chartier [Wed, 3 Dec 2014 01:31:39 +0000 (01:31 +0000)]
Merge "Print memory usage in dex2oat shutdown"
Ian Rogers [Wed, 3 Dec 2014 01:22:02 +0000 (17:22 -0800)]
Remove MethodHelper::HasSameSignatureWithDifferentClassLoaders.
Move sole use to a static function within class_linker.cc.
Remove unused MutableMethodHelper and empty method_helper.cc.
Change-Id: Ia26bc76674ed2ee7c9c546de820cc181005fed77
Mathieu Chartier [Tue, 2 Dec 2014 23:43:48 +0000 (15:43 -0800)]
Print memory usage in dex2oat shutdown
Example on mako:
I/dex2oat (31071): dex2oat took 31.195s (threads: 2) arena alloc=1013KB java alloc=13MB native alloc=32MB free=1490KB
Bug:
18069309
Change-Id: I08eac00842be35d4e659bddc8513f2062be725c9
(cherry picked from commit
3029df6d212894647ba0e5c23443c40912c6ecc8)
Ian Rogers [Wed, 3 Dec 2014 00:58:52 +0000 (00:58 +0000)]
Merge "Fix artQuickResolutionTrampoline."
Ian Rogers [Wed, 3 Dec 2014 00:55:46 +0000 (16:55 -0800)]
Fix artQuickResolutionTrampoline.
Mistakenly updating dex method index of the non-receiver method.
Change-Id: I42296e344a53e001bf37414852cd9f23f629ca40
Ian Rogers [Wed, 3 Dec 2014 00:55:27 +0000 (00:55 +0000)]
Merge "Remove MethodHelper::HasSameNameAndSignature."
Mathieu Chartier [Tue, 2 Dec 2014 23:43:48 +0000 (15:43 -0800)]
Print memory usage in dex2oat shutdown
Example on mako:
I/dex2oat (31071): dex2oat took 31.195s (threads: 2) arena alloc=1013KB java alloc=13MB native alloc=32MB free=1490KB
Bug:
18069309
Change-Id: I08eac00842be35d4e659bddc8513f2062be725c9