OSDN Git Service
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.
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 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
Ian Rogers [Wed, 3 Dec 2014 00:17:08 +0000 (16:17 -0800)]
Remove MethodHelper::HasSameNameAndSignature.
Move sole use to a static method with art_method.cc.
Change-Id: I2e7994cc1c31b5ca74df5d7be5538003d4ed0150
Ian Rogers [Wed, 3 Dec 2014 00:16:31 +0000 (00:16 +0000)]
am
654f9466: am
384f729a: Merge "Move GetClassFromTypeIdx to ArtMethod."
* commit '
654f9466110f0b14561824523d439e9bc28ce519':
Move GetClassFromTypeIdx to ArtMethod.
Ian Rogers [Wed, 3 Dec 2014 00:12:12 +0000 (00:12 +0000)]
am
384f729a: Merge "Move GetClassFromTypeIdx to ArtMethod."
* commit '
384f729a465d0ab3a76faa7ec8fa05ced82b4a85':
Move GetClassFromTypeIdx to ArtMethod.
Ian Rogers [Wed, 3 Dec 2014 00:04:43 +0000 (00:04 +0000)]
Merge "Move GetClassFromTypeIdx to ArtMethod."
Ian Rogers [Tue, 2 Dec 2014 23:48:04 +0000 (15:48 -0800)]
Move GetClassFromTypeIdx to ArtMethod.
Move GetClassFromTypeIdx out of MethodHelper into ArtMethod in
preparation for the removal of MethodHelper.
Change-Id: I9c03dd8c821944c606ea08cdf92afc80c4275247
Ian Rogers [Tue, 2 Dec 2014 23:30:01 +0000 (23:30 +0000)]
am
51eda66b: am
c1f5f73d: Merge "Remove FieldHelper."
* commit '
51eda66b3bc450bc390ce442a2f9f6f354c3068b':
Remove FieldHelper.
Dan Albert [Tue, 2 Dec 2014 23:29:59 +0000 (23:29 +0000)]
am
df1b2f34: am
fc8b5020: Merge "Don\'t force color diagnostics."
* commit '
df1b2f349997c22bf3b8c6d1a9a81658cb3a80d3':
Don't force color diagnostics.
Ian Rogers [Tue, 2 Dec 2014 23:22:54 +0000 (23:22 +0000)]
am
c1f5f73d: Merge "Remove FieldHelper."
* commit '
c1f5f73d4790d8d72c6bebd8e31cc7f5a4bd0f84':
Remove FieldHelper.
Dan Albert [Tue, 2 Dec 2014 23:22:53 +0000 (23:22 +0000)]
am
fc8b5020: Merge "Don\'t force color diagnostics."
* commit '
fc8b50202d79afc12e188b5b5d3224425fb960c4':
Don't force color diagnostics.
Ian Rogers [Tue, 2 Dec 2014 23:19:26 +0000 (23:19 +0000)]
Merge "Remove FieldHelper."
Dan Albert [Tue, 2 Dec 2014 23:18:30 +0000 (23:18 +0000)]
Merge "Don't force color diagnostics."
Ian Rogers [Tue, 2 Dec 2014 23:04:37 +0000 (15:04 -0800)]
Remove FieldHelper.
Change-Id: I2d74e2d5b3c35a691c95339de0db9361847fca11
Dan Albert [Tue, 2 Dec 2014 22:58:06 +0000 (14:58 -0800)]
Don't force color diagnostics.
Clang does this automatically for you now, and forcing it causes ugly
(and difficult to parse) error diagnostics for non-color terminals.
Change-Id: I5ceb673ad50ad99cb78c733d18ac7dbfe8f978d3
Andreas Gampe [Tue, 2 Dec 2014 22:53:15 +0000 (22:53 +0000)]
am
26e0f752: am
8443637f: Merge "ART: Build fix."
* commit '
26e0f75282cb3fd6d1c2203588b2620c821b5769':
ART: Build fix.
Andreas Gampe [Tue, 2 Dec 2014 22:48:47 +0000 (22:48 +0000)]
am
8443637f: Merge "ART: Build fix."
* commit '
8443637f71a777a13317fe7635028d758a0adf97':
ART: Build fix.
Andreas Gampe [Tue, 2 Dec 2014 22:41:42 +0000 (22:41 +0000)]
Merge "ART: Build fix."
Andreas Gampe [Tue, 2 Dec 2014 22:39:52 +0000 (14:39 -0800)]
ART: Build fix.
Fix closure.
Change-Id: I6ab68f2e3fb210c3b644affe3410c67a28df3d8e
Ian Rogers [Tue, 2 Dec 2014 22:30:37 +0000 (22:30 +0000)]
am
d7bc7ba2: am
f8425713: Merge "Move FindDexMethodIndexInOtherDexFile into ArtMethod."
* commit '
d7bc7ba2dfa1df0c512ed5e5dd6ddb4dcbcb6278':
Move FindDexMethodIndexInOtherDexFile into ArtMethod.
Andreas Gampe [Tue, 2 Dec 2014 22:30:35 +0000 (22:30 +0000)]
am
7382504b: am
eb8a32f8: Merge "ART: Change boot image class update"
* commit '
7382504b0659b344a77d8dee203cf6c330f0dc60':
ART: Change boot image class update
Ian Rogers [Tue, 2 Dec 2014 22:27:13 +0000 (22:27 +0000)]
am
f8425713: Merge "Move FindDexMethodIndexInOtherDexFile into ArtMethod."
* commit '
f842571345749cc119363fdeb1dda549aafb49bb':
Move FindDexMethodIndexInOtherDexFile into ArtMethod.
Andreas Gampe [Tue, 2 Dec 2014 22:23:46 +0000 (22:23 +0000)]
am
eb8a32f8: Merge "ART: Change boot image class update"
* commit '
eb8a32f8fbc72d8f5e92dc4335f1e7428e7cba51':
ART: Change boot image class update
Ian Rogers [Tue, 2 Dec 2014 22:22:49 +0000 (22:22 +0000)]
Merge "Move FindDexMethodIndexInOtherDexFile into ArtMethod."
Ian Rogers [Tue, 2 Dec 2014 22:10:53 +0000 (14:10 -0800)]
Move FindDexMethodIndexInOtherDexFile into ArtMethod.
Move FindDexMethodIndexInOtherDexFile out of MethodHelper into ArtMethod in
preparation for the removal of MethodHelper.
Tidy ClassLinker::ResolveMethod so that all exception paths flow through the
exception pending assertion.
Tidy artQuickResolutionTrampoline to be more explicit about variable names and
only update the dex cache if necessary.
Change-Id: I3e48eb4f6c1291533067c1b53efe90c53bfcaea8
Andreas Gampe [Tue, 2 Dec 2014 22:16:51 +0000 (22:16 +0000)]
Merge "ART: Change boot image class update"
Calin Juravle [Tue, 2 Dec 2014 18:58:03 +0000 (18:58 +0000)]
Fix new-instance node.
new-instance may throw when called on:
- interfaces
- abstract/innaccessible/unknown classes
Change-Id: Id55dbb95b906a58c946b14adad934ee0e3498c0a
Andreas Gampe [Tue, 2 Dec 2014 19:39:04 +0000 (19:39 +0000)]
am
2d2aac9d: am
b67f965a: Merge "ART: Add some thread abort logging"
* commit '
2d2aac9dc6c081416cd662ba9101e9c39fa82acf':
ART: Add some thread abort logging
Andreas Gampe [Tue, 2 Dec 2014 19:39:02 +0000 (19:39 +0000)]
am
4533227b: am
5055c8e0: Merge "ART: Print initialization failures to file"
* commit '
4533227bb7f75dab455840b580b3b54c0c80111e':
ART: Print initialization failures to file
Ian Rogers [Tue, 2 Dec 2014 19:39:01 +0000 (19:39 +0000)]
am
abf64a7e: am
4256440d: Merge "Remove MethodHelper from the interpreter."
* commit '
abf64a7e8f0eba401d8570763af72f86d7d6c085':
Remove MethodHelper from the interpreter.
Andreas Gampe [Tue, 2 Dec 2014 19:31:27 +0000 (19:31 +0000)]
am
b67f965a: Merge "ART: Add some thread abort logging"
* commit '
b67f965a2c0af98867dcc75ce07ec94d943421ae':
ART: Add some thread abort logging
Andreas Gampe [Tue, 2 Dec 2014 19:31:26 +0000 (19:31 +0000)]
am
5055c8e0: Merge "ART: Print initialization failures to file"
* commit '
5055c8e008fef62b23e485504472cd215b1b5bfd':
ART: Print initialization failures to file
Mathieu Chartier [Tue, 2 Dec 2014 19:31:24 +0000 (19:31 +0000)]
am
ddfd2752: am
32750ae8: Merge "Add a way to pass GDB commands"
* commit '
ddfd275255a6e50a416ce56ea2dc1cb03234416b':
Add a way to pass GDB commands
Ian Rogers [Tue, 2 Dec 2014 19:31:24 +0000 (19:31 +0000)]
am
4256440d: Merge "Remove MethodHelper from the interpreter."
* commit '
4256440d7566510e13a796176c90841bad29d0e5':
Remove MethodHelper from the interpreter.
Andreas Gampe [Tue, 2 Dec 2014 19:25:48 +0000 (19:25 +0000)]
Merge "ART: Add some thread abort logging"
Andreas Gampe [Tue, 2 Dec 2014 19:25:07 +0000 (19:25 +0000)]
Merge "ART: Print initialization failures to file"
Ian Rogers [Tue, 2 Dec 2014 19:24:06 +0000 (19:24 +0000)]
Merge "Remove MethodHelper from the interpreter."
Mathieu Chartier [Tue, 2 Dec 2014 19:13:52 +0000 (19:13 +0000)]
am
32750ae8: Merge "Add a way to pass GDB commands"
* commit '
32750ae8290b12ebf388f110210bbb9de0ed6fb7':
Add a way to pass GDB commands
Ian Rogers [Tue, 2 Dec 2014 19:13:19 +0000 (11:13 -0800)]
Remove MethodHelper from the interpreter.
Use ShadowFrame to get the executing method to avoid a handle for the current
method.
Various associated bits of header file clean-up and removal of an unnecessary
use of MethodHelper in CompilerDriver.
Change-Id: I3b6f4413701e8fc6b0c58b0041a0dd15472bedaa
Mathieu Chartier [Tue, 2 Dec 2014 19:09:49 +0000 (19:09 +0000)]
Merge "Add a way to pass GDB commands"
Mathieu Chartier [Fri, 17 Oct 2014 22:58:01 +0000 (15:58 -0700)]
Add a way to pass GDB commands
Passing --gdb-arg to run-test sends the arg to GDB, example:
test/run-test --host --gdb --gdb-arg "--command=command.txt" 001-HelloWorld
Would run the test with the GDB script at command.txt on the host, this is
useful for running tests in GDB in a loop.
Bug:
17387969
Change-Id: I5ad455159a6d92783eacb17eecbb0f1e670cb4a3
Andreas Gampe [Tue, 2 Dec 2014 18:47:19 +0000 (18:47 +0000)]
am
360c81cb: am
e7106cbc: Merge "ART: Avoid a recursive abort"
* commit '
360c81cb114c86f48aba9acba6f2ea3b6694edc6':
ART: Avoid a recursive abort