OSDN Git Service
The Android Automerger [Wed, 5 Sep 2012 13:33:29 +0000 (06:33 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Jean-Philippe Lesot [Wed, 5 Sep 2012 07:59:27 +0000 (00:59 -0700)]
am
86e036a8: am
e6516a53: Merge "Fix an ugly bug where try/catch offsets weren\'t being mapped properly."
* commit '
86e036a83d596ebacb20c87c8f7bd8a8dfa98d9c':
Fix an ugly bug where try/catch offsets weren't being mapped properly.
Jean-Philippe Lesot [Wed, 5 Sep 2012 07:51:54 +0000 (00:51 -0700)]
am
e6516a53: Merge "Fix an ugly bug where try/catch offsets weren\'t being mapped properly."
* commit '
e6516a5395a20f2bf923753e4dd87ffd304074fb':
Fix an ugly bug where try/catch offsets weren't being mapped properly.
Jean-Philippe Lesot [Wed, 5 Sep 2012 07:47:38 +0000 (00:47 -0700)]
Merge "Fix an ugly bug where try/catch offsets weren't being mapped properly."
Jean-Philippe Lesot [Wed, 5 Sep 2012 07:39:22 +0000 (00:39 -0700)]
am
93ee4913: am
f3b60d2f: Merge "Fix a bug where the max blowup of annotations was incorrect."
* commit '
93ee4913aa3d9a6b23f303fe0d03a0d07a8ae4d2':
Fix a bug where the max blowup of annotations was incorrect.
Jean-Philippe Lesot [Wed, 5 Sep 2012 07:35:15 +0000 (00:35 -0700)]
am
f3b60d2f: Merge "Fix a bug where the max blowup of annotations was incorrect."
* commit '
f3b60d2f07280dd6b0753223d4590e11e18a3985':
Fix a bug where the max blowup of annotations was incorrect.
Jean-Philippe Lesot [Wed, 5 Sep 2012 07:30:46 +0000 (00:30 -0700)]
Merge "Fix a bug where the max blowup of annotations was incorrect."
The Android Automerger [Mon, 3 Sep 2012 13:33:25 +0000 (06:33 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Jesse Wilson [Sat, 1 Sep 2012 05:01:05 +0000 (01:01 -0400)]
Fix a bug where the max blowup of annotations was incorrect.
I'm not sure where the 1.34 number comes from but it's incorrect.
From the spec, the encoded_annotation is made up of a single byte
plus an unlimited number of uleb128 values. Each of these values
can double in width in the worst case. I received (personal) email
from one user who'd run into a case worse than the incorrect 1.34
limit.
Change-Id: I3b676e6d2b274aaa538ca61ce23945b3d49aff04
Jesse Wilson [Sat, 1 Sep 2012 04:37:56 +0000 (00:37 -0400)]
Fix an ugly bug where try/catch offsets weren't being mapped properly.
In dex files, there are several places where one object refers
to another object by its position in the file. The dex merger
is generally very careful to adjust these mappings when combining
dex files.
Unfortunately one of these cases was broken. Each try_item refers
to a corresponding encoded_catch_handler by its byte offset in a
list. Most of the time this byte offset is the same in the input
dex file and the output dex file. But encoded_catch_handlers are
variable-length because they use a variable-length uleb128 encoding
to address the type_idx being caught. When dex files are merged,
some exception types may go from having a small index to having
a large index, increasing the number of bytes required to encode
that index. This breaks our ability to directly copy over offsets
as we were doing previously.
Bug: http://code.google.com/p/android/issues/detail?id=36490
Change-Id: I3bdadf20899fdb5d4d074e69103b33c0404a31f8
Jeff Sharkey [Thu, 30 Aug 2012 17:38:52 +0000 (10:38 -0700)]
Merge "Access to all users' external storage." into jb-mr1-dev
Jeff Sharkey [Thu, 30 Aug 2012 17:28:52 +0000 (10:28 -0700)]
Merge "Shared OBB storage across users." into jb-mr1-dev
The Android Automerger [Thu, 30 Aug 2012 13:33:23 +0000 (06:33 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Elliott Hughes [Wed, 29 Aug 2012 23:35:42 +0000 (16:35 -0700)]
am
8e98f776: am
3e46814d: Merge "Don\'t crash in dvmQuasiAtomicsShutdown if we never ran dvmQuasiAtomicsStartup."
* commit '
8e98f7761d88d0230305d1855e4f418fe3554398':
Don't crash in dvmQuasiAtomicsShutdown if we never ran dvmQuasiAtomicsStartup.
Elliott Hughes [Wed, 29 Aug 2012 23:31:07 +0000 (16:31 -0700)]
am
3e46814d: Merge "Don\'t crash in dvmQuasiAtomicsShutdown if we never ran dvmQuasiAtomicsStartup."
* commit '
3e46814d8984243612176c9b15d8d012dcca2143':
Don't crash in dvmQuasiAtomicsShutdown if we never ran dvmQuasiAtomicsStartup.
Elliott Hughes [Wed, 29 Aug 2012 23:24:47 +0000 (16:24 -0700)]
Merge "Don't crash in dvmQuasiAtomicsShutdown if we never ran dvmQuasiAtomicsStartup."
Elliott Hughes [Wed, 29 Aug 2012 22:46:18 +0000 (15:46 -0700)]
Don't crash in dvmQuasiAtomicsShutdown if we never ran dvmQuasiAtomicsStartup.
dalvikvm --help would fail here:
#0 __pthread_mutex_destroy (mutex=0x0) at pthread_mutex_destroy.c:28
#1 0xf7b36e13 in dvmDestroyMutex (pMutex=0x0) at dalvik/vm/Thread.h:465
#2 dvmQuasiAtomicsShutdown () at dalvik/vm/Atomic.cpp:188
#3 0xf7b65781 in dvmShutdown () at dalvik/vm/Init.cpp:1889
#4 0xf7b65f31 in ~ScopedShutdown (this=<synthetic pointer>, __in_chrg=<optimized out>) at dalvik/vm/Init.cpp:1317
#5 dvmStartup (argc=11, argv=0x804b360, ignoreUnrecognized=false, pEnv=0x804b398) at dalvik/vm/Init.cpp:1548
#6 0xf7b790e2 in JNI_CreateJavaVM (p_vm=0xffffc758, p_env=0xffffc75c, vm_args=0xffffc760) at dalvik/vm/Jni.cpp:3502
#7 0x08048958 in main (argc=13, argv=0xffffc8b8) at dalvik/dalvikvm/Main.cpp:212
Change-Id: I8c833ca5ea454d9b2d1714a569fb728562088659
The Android Automerger [Wed, 29 Aug 2012 13:33:22 +0000 (06:33 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Jeff Sharkey [Tue, 28 Aug 2012 23:23:22 +0000 (16:23 -0700)]
Access to all users' external storage.
System services holding this permission have external storage bound
one level higher, giving them access to all users' files.
Bug:
7003520
Change-Id: Id95d6d5b2fa2ff75c0c94f18f81cb118f837f665
Ian Rogers [Tue, 28 Aug 2012 22:54:19 +0000 (15:54 -0700)]
Revert "Revert "Trim pre-Zygote fork, fix under-estimate of heap limit.""
This reverts commit
4c7e27186d87ccd40646fd4f514dc982ff5b40b1.
Ian Rogers [Tue, 28 Aug 2012 22:54:09 +0000 (15:54 -0700)]
Revert "Revert "Upgrade to dlmalloc 2.8.5.""
This reverts commit
729eebbb4e4ec5b826b7230b4c02267da341b70b.
Jeff Sharkey [Mon, 27 Aug 2012 22:47:24 +0000 (15:47 -0700)]
Shared OBB storage across users.
To avoid downloading large OBB files separately for each user,
provide a shared view of /sdcard/Android/obb to all apps. This new
shared view is read-only by default, but it's mounted writable if
an app requests the WRITE_EXTERNAL_OBB_STORAGE permission.
Bug:
7008879
Change-Id: Ibc6a3dbf360bf1b9d356bf52595201d155ff73b8
Jean-Philippe Lesot [Tue, 28 Aug 2012 17:06:20 +0000 (10:06 -0700)]
am
4014e152: am
a5731795: Merge "Correctly handle switches on values in a high register"
* commit '
4014e152c86a0a6929382f8ac767d572ada21042':
Correctly handle switches on values in a high register
Jean-Philippe Lesot [Tue, 28 Aug 2012 17:01:52 +0000 (10:01 -0700)]
am
a5731795: Merge "Correctly handle switches on values in a high register"
* commit '
a57317952de3fc37876f97e8655cc773b97df891':
Correctly handle switches on values in a high register
Jean-Philippe Lesot [Tue, 28 Aug 2012 16:58:20 +0000 (09:58 -0700)]
Merge "Correctly handle switches on values in a high register"
The Android Automerger [Tue, 28 Aug 2012 13:33:23 +0000 (06:33 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Elliott Hughes [Mon, 27 Aug 2012 22:17:33 +0000 (15:17 -0700)]
am
cc686898: am
f6104618: Merge "Fix a bug where debugInfos\' size wasn\'t being computed."
* commit '
cc68689852b84b244ca393d748836f54cae5b5a7':
Fix a bug where debugInfos' size wasn't being computed.
Elliott Hughes [Mon, 27 Aug 2012 22:13:56 +0000 (15:13 -0700)]
am
f6104618: Merge "Fix a bug where debugInfos\' size wasn\'t being computed."
* commit '
f610461867348df0c5a624d75f39b34071044fb2':
Fix a bug where debugInfos' size wasn't being computed.
Elliott Hughes [Mon, 27 Aug 2012 21:57:24 +0000 (14:57 -0700)]
Merge "Fix a bug where debugInfos' size wasn't being computed."
The Android Automerger [Mon, 27 Aug 2012 13:33:29 +0000 (06:33 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Ian Rogers [Fri, 24 Aug 2012 17:35:51 +0000 (10:35 -0700)]
am
f76ab40f: am
ecda5d85: Merge "Fix for
6994917 GC is slower since JOO33B per FrameworkPerf test"
* commit '
f76ab40f7065b4e0202b83b8a7a0c4175d695801':
Fix for
6994917 GC is slower since JOO33B per FrameworkPerf test
Ian Rogers [Fri, 24 Aug 2012 17:33:41 +0000 (10:33 -0700)]
am
ecda5d85: Merge "Fix for
6994917 GC is slower since JOO33B per FrameworkPerf test"
* commit '
ecda5d8585466d63f185ff09047643e9bd9cb261':
Fix for
6994917 GC is slower since JOO33B per FrameworkPerf test
Ian Rogers [Fri, 24 Aug 2012 17:15:37 +0000 (10:15 -0700)]
Merge "Fix for
6994917 GC is slower since JOO33B per FrameworkPerf test"
Ian Rogers [Fri, 24 Aug 2012 16:40:26 +0000 (09:40 -0700)]
Revert "Trim pre-Zygote fork, fix under-estimate of heap limit."
This reverts commit
2f8d5e11f735e9ee8e235c31b3f113f6c90ad63c.
Brian Carlstrom [Fri, 24 Aug 2012 14:30:34 +0000 (07:30 -0700)]
am
6464661f: am
b48569ac: Merge "Fix build warning."
* commit '
6464661ff5ca7dd83f60f68e7b40af0ed3ec8760':
Fix build warning.
Ian Rogers [Fri, 24 Aug 2012 14:29:48 +0000 (07:29 -0700)]
am
bd561cbf: am
a9dd9337: Merge "Trim pre-Zygote fork, fix under-estimate of heap limit."
* commit '
bd561cbffebbff1a8b17e031841ab2fcd2777cff':
Trim pre-Zygote fork, fix under-estimate of heap limit.
Brian Carlstrom [Fri, 24 Aug 2012 03:35:43 +0000 (20:35 -0700)]
am
b48569ac: Merge "Fix build warning."
* commit '
b48569acbb7b3702f1071befa5ebfeae7a46303b':
Fix build warning.
Brian Carlstrom [Fri, 24 Aug 2012 03:20:47 +0000 (20:20 -0700)]
Merge "Fix build warning."
Ying Wang [Thu, 23 Aug 2012 18:12:12 +0000 (11:12 -0700)]
Fix build warning.
Change-Id: I1f9813c9dc1dfc388f82f37584fe60256b6a8b12
Jeff Sharkey [Thu, 23 Aug 2012 17:32:20 +0000 (10:32 -0700)]
One more errno for encrypted devices.
Bug:
7017585
Change-Id: I4c2cc95a5c3a44bab4a93f3a1f8907869f0ce8e6
Ian Rogers [Thu, 23 Aug 2012 20:48:25 +0000 (13:48 -0700)]
am
a9dd9337: Merge "Trim pre-Zygote fork, fix under-estimate of heap limit."
* commit '
a9dd9337605a610841c86fe1bd90a8fa9b8d28c9':
Trim pre-Zygote fork, fix under-estimate of heap limit.
Ian Rogers [Thu, 23 Aug 2012 20:35:23 +0000 (13:35 -0700)]
Merge "Trim pre-Zygote fork, fix under-estimate of heap limit."
Mathieu Chartier [Wed, 22 Aug 2012 01:14:19 +0000 (18:14 -0700)]
Fix for
6994917 GC is slower since JOO33B per FrameworkPerf test
Fixes the GC aspect of the regression in FrameworkTest for Gc.
Large bitmap test seems to be unaffected.
Changes are:
We now have minimum sleep of 1ms instead of 10ms in dvmSuspendAll.
Some heuristics to avoid doing extra GCs if an allocation waited for a concurrent Gc.
Change-Id: I3797c7dc813e26bd1f7bb0a9dbe55eb70dd1c9c9
Ying Wang [Thu, 23 Aug 2012 18:27:01 +0000 (11:27 -0700)]
Merge "Fix build warning." into jb-mr1-dev
Ying Wang [Thu, 23 Aug 2012 18:12:12 +0000 (11:12 -0700)]
Fix build warning.
Change-Id: I1f9813c9dc1dfc388f82f37584fe60256b6a8b12
Jeff Sharkey [Thu, 23 Aug 2012 17:32:20 +0000 (10:32 -0700)]
One more errno for encrypted devices.
Bug:
7017585
Change-Id: I4c2cc95a5c3a44bab4a93f3a1f8907869f0ce8e6
The Android Automerger [Thu, 23 Aug 2012 13:33:29 +0000 (06:33 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Jesse Wilson [Thu, 23 Aug 2012 06:20:26 +0000 (23:20 -0700)]
Fix a bug where debugInfos' size wasn't being computed.
Previously debugInfos' size of 0 caused a malformed dex file
because debug data was present but not mentioned in the table
of contents.
Change-Id: I07171aaee12fef9f303fc505909f44ef1a714114
Ian Rogers [Thu, 23 Aug 2012 05:14:32 +0000 (22:14 -0700)]
Trim pre-Zygote fork, fix under-estimate of heap limit.
Card scanning uses dvmHeapSourceGetValue to scan from the heap base to
the total foot print of the heap. Trimming the Zygote may lower the
footprint of the heap by creating a hole in the middle. This hole is
unaccounted for in the card scanning leading to missed dirty cards.
This was a regression introduced by:
https://android-review.googlesource.com/#/c/41728/
as it didn't #define MORECORE_CANNOT_TRIM 1 that was previously defined
here:
https://android-review.googlesource.com/#/c/41731/4/libcutils/mspace.c
Introduce a notion of dvmHeapSourceGetLimit so that card scanning
doesn't rely on footprint. Trim the heap before forking the Zygote. This
change continues to enable morecore trimming of mspaces.
Change-Id: I3f0b12371097f50a1f920cac25846ca08685e7ed
Ben Gruver [Thu, 23 Aug 2012 01:45:25 +0000 (18:45 -0700)]
Correctly handle switches on values in a high register
When dx generates a switch on a value in a high register, it prepends a move
instruction, to move the value to a low register. However, this causes the
switch data pseudo-instruction to use address of the move instruction as the
base address of the switch targets, rather than the address of the switch
instruction
Change-Id: I0708d35ec3059c30221cd0a64f426244411d31ea
Jeff Sharkey [Thu, 23 Aug 2012 01:17:30 +0000 (18:17 -0700)]
Merge "Iteration on multi-user external storage." into jb-mr1-dev
Jeff Sharkey [Wed, 22 Aug 2012 21:08:31 +0000 (14:08 -0700)]
Iteration on multi-user external storage.
Zygote now mounts a tmpfs over any existing /storage contents, giving
it a clean slate for its bind mounts. This supports a symlink that
enables legacy /sdcard paths for shell users. Move to using paths
defined from environment variables, instead of header files.
Bug:
6925012
Change-Id: Ia4a2ac35ecfe98b617c27ff3bd73deb29e395e55
Brian Carlstrom [Wed, 22 Aug 2012 19:11:40 +0000 (12:11 -0700)]
Revert "Upgrade to dlmalloc 2.8.5."
This reverts commit
bba37bd191843ef29ef9c7a8839e98b73debfffa.
Brian Carlstrom [Wed, 22 Aug 2012 19:11:29 +0000 (12:11 -0700)]
Revert "Ensure we fence the writing of clazz to an Object post allocation."
This reverts commit
821ab588af4566a800d4b5608092ccc1dd3764af.
Brian Carlstrom [Wed, 22 Aug 2012 19:11:40 +0000 (12:11 -0700)]
Revert "Upgrade to dlmalloc 2.8.5."
This reverts commit
bba37bd191843ef29ef9c7a8839e98b73debfffa.
Brian Carlstrom [Wed, 22 Aug 2012 19:11:29 +0000 (12:11 -0700)]
Revert "Ensure we fence the writing of clazz to an Object post allocation."
This reverts commit
821ab588af4566a800d4b5608092ccc1dd3764af.
Ian Rogers [Wed, 22 Aug 2012 00:26:13 +0000 (17:26 -0700)]
Ensure we fence the writing of clazz to an Object post allocation.
We hold the heap lock during the calloc of an object in the GCed heap.
We do a non-volatile store following this for the clazz, this may lead to a
race where an object is allocated but appears to have no clazz.
Found investigating Bug:
7028104
Change-Id: I390ad4c7b9632127bd27393742be347b84d9269a
Brian Carlstrom [Mon, 20 Aug 2012 23:29:58 +0000 (16:29 -0700)]
am
1129f6a7: am
b931f906: Merge "Upgrade to dlmalloc 2.8.5."
* commit '
1129f6a78708a8d8861f8053616c3961aefdc1ef':
Upgrade to dlmalloc 2.8.5.
Brian Carlstrom [Mon, 20 Aug 2012 23:28:17 +0000 (16:28 -0700)]
am
b931f906: Merge "Upgrade to dlmalloc 2.8.5."
* commit '
b931f9065990520bf34b8c6128e069b4cca4a7ec':
Upgrade to dlmalloc 2.8.5.
Brian Carlstrom [Mon, 20 Aug 2012 23:12:37 +0000 (16:12 -0700)]
Merge "Upgrade to dlmalloc 2.8.5."
Ian Rogers [Sat, 18 Aug 2012 00:01:51 +0000 (17:01 -0700)]
Upgrade to dlmalloc 2.8.5.
Switch to using dlmalloc 2.8.5. Define mspace functionality directly
using dlmalloc rather than taking from libcutils.
Remove growth limit check in tryMalloc that only checks initial growth
limit.
Implement trimming at the end of the mspace.
Depends upon: https://android-review.googlesource.com/41717
Change-Id: Ia2c6b50bdb0b0d5aae4b18deefbd1bf50dfa49d5
Jeff Sharkey [Thu, 16 Aug 2012 21:32:58 +0000 (14:32 -0700)]
Merge "Multi-user external storage support." into jb-mr1-dev
Jeff Sharkey [Sat, 11 Aug 2012 21:11:44 +0000 (14:11 -0700)]
Multi-user external storage support.
When a specialized zygote process needs external storage access,
create a private mount namespace and create a bind mount to give
them access. Support both single-user and multi-user modes, which
dictate the bind mount source.
Bug:
6925012
Change-Id: Ib987ba09f59ce03a6aeb9ee8bcb522965a2dfb67
Elliott Hughes [Mon, 13 Aug 2012 18:44:02 +0000 (11:44 -0700)]
am
031072f0: am
57573862: Merge "hardening: eliminate all text relocations from lidbvm"
* commit '
031072f007d3ffd0d2facd6277005f2dac93c19c':
hardening: eliminate all text relocations from lidbvm
Elliott Hughes [Mon, 13 Aug 2012 18:40:32 +0000 (11:40 -0700)]
am
57573862: Merge "hardening: eliminate all text relocations from lidbvm"
* commit '
57573862ca6b377c73958d5ba876a406445b4490':
hardening: eliminate all text relocations from lidbvm
Elliott Hughes [Mon, 13 Aug 2012 18:25:22 +0000 (11:25 -0700)]
Merge "hardening: eliminate all text relocations from lidbvm"
Ard Biesheuvel [Sat, 11 Aug 2012 10:45:01 +0000 (12:45 +0200)]
hardening: eliminate all text relocations from lidbvm
This patch consists of:
- changes to mterp/ that turn all literals from absolute
to PC relative, so the relocations can be resolved at
(build) link time
- changes to compiler/template/ that result in the
compiler templates to live in the non-executable
.data.rel.ro section (this code is never executed
directly, only from the jit heap, so there is no
reason to put it in the .text section)
Change-Id: I2dc97bd4720b393a74b7277a188f0c7b681fc932
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@gmail.com>
Elliott Hughes [Tue, 7 Aug 2012 01:38:14 +0000 (18:38 -0700)]
am
219a3f5f: am
21212cbd: Merge "Fix ALOGV bit rot."
* commit '
219a3f5fdb4a8b85646037e2c09b3c7e408b1ec8':
Fix ALOGV bit rot.
Elliott Hughes [Tue, 7 Aug 2012 01:36:44 +0000 (18:36 -0700)]
am
21212cbd: Merge "Fix ALOGV bit rot."
* commit '
21212cbd65aa7ec7d69f0c6f5b98794045f750a5':
Fix ALOGV bit rot.
Elliott Hughes [Tue, 7 Aug 2012 01:34:10 +0000 (18:34 -0700)]
Merge "Fix ALOGV bit rot."
Elliott Hughes [Tue, 7 Aug 2012 00:40:02 +0000 (17:40 -0700)]
Fix ALOGV bit rot.
Change-Id: Ia182af8f5ca3967a21003b3d1513145f8e6e5db0
Elliott Hughes [Mon, 6 Aug 2012 17:34:30 +0000 (10:34 -0700)]
am
aa1d0261: am
464388e8: Merge "Don\'t crash on invalid string/type ids."
* commit '
aa1d026167c9024bf08784527b5c4176ee8c6523':
Don't crash on invalid string/type ids.
Elliott Hughes [Mon, 6 Aug 2012 17:33:05 +0000 (10:33 -0700)]
am
464388e8: Merge "Don\'t crash on invalid string/type ids."
* commit '
464388e8756d362f91d110b5741ba785ea3d44bd':
Don't crash on invalid string/type ids.
Elliott Hughes [Mon, 6 Aug 2012 17:27:35 +0000 (10:27 -0700)]
Merge "Don't crash on invalid string/type ids."
Elliott Hughes [Mon, 6 Aug 2012 17:14:12 +0000 (10:14 -0700)]
am
74f9cd03: am
8fb8c4de: Merge "RETURN_VOID_BARRIER is also a return."
* commit '
74f9cd03d837538d311cc068bdd31cfd66eb014c':
RETURN_VOID_BARRIER is also a return.
Elliott Hughes [Mon, 6 Aug 2012 16:59:50 +0000 (09:59 -0700)]
am
8fb8c4de: Merge "RETURN_VOID_BARRIER is also a return."
* commit '
8fb8c4de25c5c95019a06b37f17bb6d82b41f4ac':
RETURN_VOID_BARRIER is also a return.
Elliott Hughes [Mon, 6 Aug 2012 16:51:21 +0000 (09:51 -0700)]
Don't crash on invalid string/type ids.
Bug: http://code.google.com/p/android/issues/detail?id=35934
Change-Id: I7bf31f6c80c794beb3554ad2f60ed5ebbca0c65e
Elliott Hughes [Mon, 6 Aug 2012 16:34:31 +0000 (09:34 -0700)]
Merge "RETURN_VOID_BARRIER is also a return."
Elliott Hughes [Mon, 6 Aug 2012 16:16:08 +0000 (09:16 -0700)]
RETURN_VOID_BARRIER is also a return.
Bug: http://code.google.com/p/android/issues/detail?id=36003
Change-Id: I7fb53b0898158a3ad7b0eb4f8385674ddaeffd60
Brian Carlstrom [Fri, 3 Aug 2012 00:57:26 +0000 (17:57 -0700)]
am
93018cdc: am
0b79e282: Merge "Change dalvik script to use exec"
* commit '
93018cdcc6d419b19587ad2e6622284a4b72742c':
Change dalvik script to use exec
Brian Carlstrom [Fri, 3 Aug 2012 00:55:33 +0000 (17:55 -0700)]
am
0b79e282: Merge "Change dalvik script to use exec"
* commit '
0b79e2824eeb763ea82aa8ff544ef7b20ea7fdd5':
Change dalvik script to use exec
Brian Carlstrom [Fri, 3 Aug 2012 00:36:55 +0000 (17:36 -0700)]
Merge "Change dalvik script to use exec"
Brian Carlstrom [Fri, 3 Aug 2012 00:05:25 +0000 (17:05 -0700)]
Change dalvik script to use exec
Change-Id: I0a82ced8ce31ae0e6916509a1c79b738c475ae18
Elliott Hughes [Wed, 1 Aug 2012 21:51:40 +0000 (14:51 -0700)]
am
339c627e: am
8ad6a746: Merge "Fix an array out-of-bound read in the JIT compiler."
* commit '
339c627e690215687deca0b845932c220ee9ebb3':
Fix an array out-of-bound read in the JIT compiler.
Elliott Hughes [Wed, 1 Aug 2012 21:47:42 +0000 (14:47 -0700)]
am
8ad6a746: Merge "Fix an array out-of-bound read in the JIT compiler."
* commit '
8ad6a74627b70166e594e15514f289a25eb8f721':
Fix an array out-of-bound read in the JIT compiler.
Elliott Hughes [Wed, 1 Aug 2012 21:33:30 +0000 (14:33 -0700)]
Merge "Fix an array out-of-bound read in the JIT compiler."
Douglas Leung [Wed, 1 Aug 2012 19:00:33 +0000 (12:00 -0700)]
Fix an array out-of-bound read in the JIT compiler.
Without the fix the compiler is still safe since the offending memory access
is a read, though the hoisted distance is non-deterministic. The easiest and
safest fix is to unconditionally hoist a load when it can reach the
scheduling barrier.
Change-Id: I021161cb2a6e011301ab65ba62bc2a74af1cb552
Signed-off-by: Douglas Leung <douglas@mips.com>
Elliott Hughes [Tue, 31 Jul 2012 21:45:14 +0000 (14:45 -0700)]
am
5918aeff: am
5b861ab5: Merge "Fix the MIPS build: 1. LOG->ALOG conversion 2. Remove Jumbo opcodes support"
* commit '
5918aeff98a37d3314ea485329a5d6f95b6941e1':
Fix the MIPS build: 1. LOG->ALOG conversion 2. Remove Jumbo opcodes support
Elliott Hughes [Tue, 31 Jul 2012 21:40:49 +0000 (14:40 -0700)]
am
5b861ab5: Merge "Fix the MIPS build: 1. LOG->ALOG conversion 2. Remove Jumbo opcodes support"
* commit '
5b861ab5541e9806d6255f17769acad3c2b4029b':
Fix the MIPS build: 1. LOG->ALOG conversion 2. Remove Jumbo opcodes support
Elliott Hughes [Tue, 31 Jul 2012 21:31:32 +0000 (14:31 -0700)]
Merge "Fix the MIPS build: 1. LOG->ALOG conversion 2. Remove Jumbo opcodes support"
Raghu Gandham [Mon, 30 Jul 2012 21:46:12 +0000 (14:46 -0700)]
Fix the MIPS build:
1. LOG->ALOG conversion
2. Remove Jumbo opcodes support
Change-Id: Ifbd1eae2f5e7a1cab5828ebfbdba380ad499abfd
The Android Open Source Project [Fri, 27 Jul 2012 22:46:07 +0000 (15:46 -0700)]
The Android Open Source Project [Fri, 27 Jul 2012 21:50:10 +0000 (14:50 -0700)]
Reconcile with jb-release
Change-Id: Id73f7a55edc5654069e7ce75f5545d3bff4448da
The Android Automerger [Wed, 25 Jul 2012 03:23:09 +0000 (20:23 -0700)]
merge in jb-release history after reset to jb-dev
Elliott Hughes [Tue, 24 Jul 2012 02:53:19 +0000 (19:53 -0700)]
am
505c1cad: am
37755063: Merge "Fix Method.getParameterAnnotations."
* commit '
505c1cad45fe793d59842bfbf6bae1d9e195b427':
Fix Method.getParameterAnnotations.
Elliott Hughes [Tue, 24 Jul 2012 00:44:30 +0000 (17:44 -0700)]
am
37755063: Merge "Fix Method.getParameterAnnotations."
* commit '
37755063648910ee919c22c3d15cd57092026633':
Fix Method.getParameterAnnotations.
Elliott Hughes [Tue, 24 Jul 2012 00:30:21 +0000 (17:30 -0700)]
Merge "Fix Method.getParameterAnnotations."
Elliott Hughes [Mon, 23 Jul 2012 17:49:56 +0000 (10:49 -0700)]
Fix Method.getParameterAnnotations.
The dex format represents parameter annotations using an
annotation_set_ref_item for each parameter. According to the spec,
the item's annotation_offset can be "0 if there are no annotations for this
element". The Dalvik VM accepts 0 values in the verification step,
but Method#getParameterAnnotations then crashes with a segmentation fault.
Bug: http://code.google.com/p/android/issues/detail?id=35304
Change-Id: I0ac7336d369894520c8e17848ab6a91dbbd905e9
Elliott Hughes [Sat, 21 Jul 2012 05:34:59 +0000 (22:34 -0700)]
am
025a6d08: am
b498bf42: Merge "[X86] X86 trace JIT compiler support"
* commit '
025a6d088554fcdaa8c0e94231c4048749bf103a':
[X86] X86 trace JIT compiler support
Elliott Hughes [Fri, 20 Jul 2012 19:47:25 +0000 (12:47 -0700)]
am
b498bf42: Merge "[X86] X86 trace JIT compiler support"
* commit '
b498bf420d28aeab14384fcc12db54d00ede03d3':
[X86] X86 trace JIT compiler support