OSDN Git Service
Nicolas Geoffray [Fri, 12 Sep 2014 18:47:55 +0000 (18:47 +0000)]
am
f79ba17d: Merge "Add a test for our NPE checks."
* commit '
f79ba17defbd9342e44ab9f3de0807054673d3c9':
Add a test for our NPE checks.
Nicolas Geoffray [Fri, 12 Sep 2014 18:47:54 +0000 (18:47 +0000)]
am
663c0bfd: Merge "x86 fault handler does not know about movb"
* commit '
663c0bfd8b66065e4b024ba4677b6d5a1cbbce6f':
x86 fault handler does not know about movb
Nicolas Geoffray [Fri, 12 Sep 2014 09:01:14 +0000 (09:01 +0000)]
Merge "Add a test for our NPE checks."
Nicolas Geoffray [Thu, 11 Sep 2014 17:46:01 +0000 (18:46 +0100)]
Add a test for our NPE checks.
Change-Id: Ic83af6c582cd955168d01db7bdbdf27aebff64ab
Nicolas Geoffray [Fri, 12 Sep 2014 08:52:22 +0000 (08:52 +0000)]
Merge "x86 fault handler does not know about movb"
Sebastien Hertz [Fri, 12 Sep 2014 08:04:48 +0000 (10:04 +0200)]
resolved conflicts for merge of
6841e3f3 to lmp-dev-plus-aosp
Change-Id: I2f115f3480022b39bff1f5d1ab6f3b9720bc3008
Mathieu Chartier [Fri, 12 Sep 2014 06:20:41 +0000 (23:20 -0700)]
resolved conflicts for merge of
d0ceb549 to lmp-dev-plus-aosp
Change-Id: Ia0e6af178bfb0a8ecf655777d348912b74adfe4f
Mathieu Chartier [Fri, 12 Sep 2014 05:59:15 +0000 (05:59 +0000)]
am
6fc33690: Merge "Add fast path to VMClassLoader.findLoadedClass"
* commit '
6fc33690c7763064e6c011c251f823ab3f733021':
Add fast path to VMClassLoader.findLoadedClass
Andreas Gampe [Fri, 12 Sep 2014 05:59:14 +0000 (05:59 +0000)]
am
3fec7718: Merge "ART: Fix preverified setting in VerifyClass"
* commit '
3fec7718041302f769995eedda9beef362131842':
ART: Fix preverified setting in VerifyClass
Mathieu Chartier [Fri, 12 Sep 2014 05:59:10 +0000 (05:59 +0000)]
am
59dae45a: Merge "Delete pin table"
* commit '
59dae45a3d1ef83771fb78421fcf8fda838b4d16':
Delete pin table
Brian Carlstrom [Fri, 12 Sep 2014 05:59:09 +0000 (05:59 +0000)]
am
02308cf7: Merge "Print the command line and ABI in stack dumps like debuggerd."
* commit '
02308cf78484bcd125d92ebb27185d890889b92a':
Print the command line and ABI in stack dumps like debuggerd.
Brian Carlstrom [Fri, 12 Sep 2014 05:59:08 +0000 (05:59 +0000)]
am
77f46bbe: Merge "Add DumpClass context on CacheField and CacheMethod failures"
* commit '
77f46bbe03cde911bc4b36ff8e7807e8ceaa9f90':
Add DumpClass context on CacheField and CacheMethod failures
Brian Carlstrom [Fri, 12 Sep 2014 05:59:07 +0000 (05:59 +0000)]
am
a68b478f: Merge changes I57f70381,I9f225825
* commit '
a68b478fbc6ca8d445a3befc7eb8ca58586294eb':
Fix cpplint issue.
Fix crash when connected to DDMS
Brian Carlstrom [Fri, 12 Sep 2014 05:59:06 +0000 (05:59 +0000)]
am
d30315ef: (-s ours) Merge "Use WellKnownClasses in ThrowStackOverflowError to reduce changes of further stack overflow"
* commit '
d30315ef5ce124a83ef4a8d402608f63b0190141':
Use WellKnownClasses in ThrowStackOverflowError to reduce changes of further stack overflow
Brian Carlstrom [Fri, 12 Sep 2014 05:48:59 +0000 (05:48 +0000)]
am
2add1a7c: am
776ee723: Merge "Print the command line and ABI in stack dumps like debuggerd." into lmp-dev
* commit '
2add1a7ccc4cb335ac7ba4fc74842aa9430ab8bc':
Print the command line and ABI in stack dumps like debuggerd.
Jeff Brown [Fri, 12 Sep 2014 05:48:58 +0000 (05:48 +0000)]
am
f9c99b25: am
53f7ac1d: Merge "Revert "Print the command line and ABI in stack dumps like debuggerd."" into lmp-dev
* commit '
f9c99b25d2752b77feadcdbf163b41884fcac734':
Revert "Print the command line and ABI in stack dumps like debuggerd."
Jeff Brown [Fri, 12 Sep 2014 05:48:57 +0000 (05:48 +0000)]
am
d4caea7b: am
d1ae5004: Merge "Print the command line and ABI in stack dumps like debuggerd." into lmp-dev
* commit '
d4caea7b1590f9f5816fa343008f1a0359baef1f':
Print the command line and ABI in stack dumps like debuggerd.
Mathieu Chartier [Fri, 12 Sep 2014 04:59:13 +0000 (04:59 +0000)]
am
0f79299e: Merge "Add fast path to VMClassLoader.findLoadedClass" into lmp-dev
* commit '
0f79299e78cb9e304f2a723ce7691f35ecaa4bab':
Add fast path to VMClassLoader.findLoadedClass
Mathieu Chartier [Fri, 12 Sep 2014 04:59:12 +0000 (04:59 +0000)]
am
6b9f31a7: Merge "Delete pin table" into lmp-dev
* commit '
6b9f31a7cbdc6d4b590c8c2119ffddbf5f8c0720':
Delete pin table
Brian Carlstrom [Fri, 12 Sep 2014 04:59:11 +0000 (04:59 +0000)]
am
776ee723: Merge "Print the command line and ABI in stack dumps like debuggerd." into lmp-dev
* commit '
776ee7236f3d95ad5b8a1e6af693e636266f8131':
Print the command line and ABI in stack dumps like debuggerd.
Jeff Brown [Fri, 12 Sep 2014 04:59:10 +0000 (04:59 +0000)]
am
53f7ac1d: Merge "Revert "Print the command line and ABI in stack dumps like debuggerd."" into lmp-dev
* commit '
53f7ac1d6b96621e9fd0225d7579a0183f6f179e':
Revert "Print the command line and ABI in stack dumps like debuggerd."
Jeff Brown [Fri, 12 Sep 2014 04:59:09 +0000 (04:59 +0000)]
am
d1ae5004: Merge "Print the command line and ABI in stack dumps like debuggerd." into lmp-dev
* commit '
d1ae50047c5da787e722e182992bd242540b502a':
Print the command line and ABI in stack dumps like debuggerd.
Mathieu Chartier [Fri, 12 Sep 2014 01:05:06 +0000 (01:05 +0000)]
Merge "Add fast path to VMClassLoader.findLoadedClass"
Mathieu Chartier [Thu, 11 Sep 2014 21:21:41 +0000 (14:21 -0700)]
Add fast path to VMClassLoader.findLoadedClass
VMClassLoader.findLoadedClass now calls FindClassInPathClassLoader
as a fast path. Exclusive time results (trace view maps launch):
Before:
nativeFillInStackTrace 1.4%
defineClassNative 1.2%
findLoadedClass 0.2%
After:
nativeFillInStackTrace 0.5%
defineClassNative 0.0%
findLoadedClass 0.9%
(cherry picked from commit
194116c836080de14245a3a7c4617d07b8abf8cf)
Change-Id: I63fd7b4bccb71789e92bd39d1d3f9d0de22535de
Andreas Gampe [Fri, 12 Sep 2014 00:49:46 +0000 (00:49 +0000)]
Merge "ART: Fix preverified setting in VerifyClass"
Andreas Gampe [Thu, 11 Sep 2014 17:59:33 +0000 (10:59 -0700)]
ART: Fix preverified setting in VerifyClass
Make sure soft-failed classes cannot set methods to pre-verified.
Bug:
16828525,
17465185
(cherry picked from commit
3892cf8da7d5e76c0dee585fc8f69df773680525)
Change-Id: I09c0a68ca722978459741311148eae7614f9ca49
Mathieu Chartier [Thu, 11 Sep 2014 23:57:49 +0000 (23:57 +0000)]
Merge "Delete pin table"
Mathieu Chartier [Thu, 11 Sep 2014 20:14:31 +0000 (13:14 -0700)]
Delete pin table
The pin table was brought over from dalvik but not really needed
since ART doesn't support pinning in movable spaces. The only
thing it did was hold objects live for JNI functions.
This shouldn't be necessary since people keep jni references to
these objects or else they could never release the elements.
Bug:
17456946
(cherry picked from commit
a967c62e4e6675d3553445aa8e95a09e7a3381b0)
Change-Id: Ibed0d029157ffb9e75ecd80d4d544d690986c090
Mathieu Chartier [Thu, 11 Sep 2014 23:51:03 +0000 (23:51 +0000)]
Merge "Add fast path to VMClassLoader.findLoadedClass" into lmp-dev
Mathieu Chartier [Thu, 11 Sep 2014 23:27:11 +0000 (23:27 +0000)]
Merge "Delete pin table" into lmp-dev
Brian Carlstrom [Thu, 11 Sep 2014 23:14:15 +0000 (23:14 +0000)]
Merge "Print the command line and ABI in stack dumps like debuggerd."
Brian Carlstrom [Thu, 11 Sep 2014 23:13:17 +0000 (23:13 +0000)]
Merge "Print the command line and ABI in stack dumps like debuggerd." into lmp-dev
Jeff Brown [Thu, 11 Sep 2014 01:41:18 +0000 (18:41 -0700)]
Print the command line and ABI in stack dumps like debuggerd.
Ensure the heading is "Cmd line:" just like debuggerd and
as it used to be in Dalvik.
Fix a missing newline.
Trim all training nulls from the command line.
Don't bother printing the original command line if unset.
Add the ABI to the dump to help the native stack symbol tool.
Bug:
17474152
(cherry picked from commit
09865b8aa2d85f2824fbdac8034cab01629e8adc)
Change-Id: I52d55660276092ed73b61d5e0708460ec39f1a4a
Jeff Brown [Thu, 11 Sep 2014 01:41:18 +0000 (18:41 -0700)]
Print the command line and ABI in stack dumps like debuggerd.
Ensure the heading is "Cmd line:" just like debuggerd and
as it used to be in Dalvik.
Fix a missing newline.
Trim all training nulls from the command line.
Don't bother printing the original command line if unset.
Add the ABI to the dump to help the native stack symbol tool.
Bug:
17474152
Change-Id: Ie1da1bd4f38c92b13ea08c7122f4573d8ec8fc73
Jeff Brown [Thu, 11 Sep 2014 23:01:55 +0000 (23:01 +0000)]
Merge "Revert "Print the command line and ABI in stack dumps like debuggerd."" into lmp-dev
Jeff Brown [Thu, 11 Sep 2014 23:01:44 +0000 (23:01 +0000)]
Revert "Print the command line and ABI in stack dumps like debuggerd."
This reverts commit
38ac77b6fb1fc626299022fe0f16d5b6c365cb9b.
Change-Id: I8e4952b80d03ad61c3ff2afaf8a96b8c2e36f0c7
Jeff Brown [Thu, 11 Sep 2014 22:57:55 +0000 (22:57 +0000)]
Merge "Print the command line and ABI in stack dumps like debuggerd." into lmp-dev
Mathieu Chartier [Thu, 11 Sep 2014 21:21:41 +0000 (14:21 -0700)]
Add fast path to VMClassLoader.findLoadedClass
VMClassLoader.findLoadedClass now calls FindClassInPathClassLoader
as a fast path. Exclusive time results (trace view maps launch):
Before:
nativeFillInStackTrace 1.4%
defineClassNative 1.2%
findLoadedClass 0.2%
After:
nativeFillInStackTrace 0.5%
defineClassNative 0.0%
findLoadedClass 0.9%
Bug:
16828525
Change-Id: I1bde48effcd28529778c00ec0fa0dda4e32026a3
Jeff Brown [Thu, 11 Sep 2014 01:41:18 +0000 (18:41 -0700)]
Print the command line and ABI in stack dumps like debuggerd.
Ensure the heading is "Cmd line:" just like debuggerd and
as it used to be in Dalvik.
Fix a missing newline.
Trim all training nulls from the command line.
Don't bother printing the original command line if unset.
Add the ABI to the dump to help the native stack symbol tool.
Bug:
17474152
Change-Id: I19c585dbd7d31ef6c98270e469445cae40cbd518
Mathieu Chartier [Thu, 11 Sep 2014 20:14:31 +0000 (13:14 -0700)]
Delete pin table
The pin table was brought over from dalvik but not really needed
since ART doesn't support pinning in movable spaces. The only
thing it did was hold objects live for JNI functions.
This shouldn't be necessary since people keep jni references to
these objects or else they could never release the elements.
Bug:
17456946
Change-Id: Ibed0d029157ffb9e75ecd80d4d544d690986c090
Brian Carlstrom [Thu, 11 Sep 2014 20:10:09 +0000 (20:10 +0000)]
Merge "Add DumpClass context on CacheField and CacheMethod failures"
Brian Carlstrom [Wed, 10 Sep 2014 17:08:37 +0000 (10:08 -0700)]
Add DumpClass context on CacheField and CacheMethod failures
Change-Id: Ia1992d98c998cdc98896f5912da50c4849de7699
Brian Carlstrom [Thu, 11 Sep 2014 19:28:59 +0000 (19:28 +0000)]
Merge changes I57f70381,I9f225825
* changes:
Fix cpplint issue.
Fix crash when connected to DDMS
Brian Carlstrom [Thu, 11 Sep 2014 19:28:53 +0000 (19:28 +0000)]
Merge "Use WellKnownClasses in ThrowStackOverflowError to reduce changes of further stack overflow"
Brian Carlstrom [Thu, 11 Sep 2014 19:21:04 +0000 (12:21 -0700)]
Fix cpplint issue.
Change-Id: I57f70381b005a3601bba1ab4d646e974860af1c4
Brian Carlstrom [Thu, 11 Sep 2014 06:10:47 +0000 (23:10 -0700)]
Use WellKnownClasses in ThrowStackOverflowError to reduce changes of further stack overflow
Bug:
17463118
(cherry picked from commit
bfc2b98a3cf7a9d580f2477e54aabded5004fd26)
Change-Id: Iea04bb7f6c4daa9cbdb8ee6ce8ddcbeb9f05aa3d
Sebastien Hertz [Thu, 11 Sep 2014 14:23:44 +0000 (16:23 +0200)]
Fix crash when connected to DDMS
Restore init of WellKnownClasses::org_apache_harmony_dalvik_ddmc_Chunk_data and
removed duplicated line.
Bug:
17467328
Bug:
17463118
(cherry picked from commit
96cd6714d94b47512710776761dec98c8be68bef)
Change-Id: I9f225825bef4995460e1c79a9f3a6c1331f24201
Andreas Gampe [Thu, 11 Sep 2014 19:00:07 +0000 (19:00 +0000)]
am
7cc97042: am
3892cf8d: ART: Fix preverified setting in VerifyClass
* commit '
7cc970426d41043a7254d31909ea35fec0ce4a6c':
ART: Fix preverified setting in VerifyClass
Andreas Gampe [Thu, 11 Sep 2014 18:48:21 +0000 (18:48 +0000)]
am
3892cf8d: ART: Fix preverified setting in VerifyClass
* commit '
3892cf8da7d5e76c0dee585fc8f69df773680525':
ART: Fix preverified setting in VerifyClass
Andreas Gampe [Thu, 11 Sep 2014 17:59:33 +0000 (10:59 -0700)]
ART: Fix preverified setting in VerifyClass
Make sure soft-failed classes cannot set methods to pre-verified.
Bug:
16828525,
17465185
Change-Id: I09c0a68ca722978459741311148eae7614f9ca49
Mingyao Yang [Thu, 11 Sep 2014 18:32:10 +0000 (18:32 +0000)]
am
967e1a56: Merge "Add some comments for retired class."
* commit '
967e1a56df7675c8d38d411736fc081039f1a9f9':
Add some comments for retired class.
Mingyao Yang [Thu, 11 Sep 2014 18:10:04 +0000 (18:10 +0000)]
Merge "Add some comments for retired class."
Vladimir Marko [Thu, 11 Sep 2014 17:43:30 +0000 (18:43 +0100)]
resolved conflicts for merge of
4f559aa6 to lmp-dev-plus-aosp
Change-Id: Ib46ff4493c4f72399b527868afbf18b7a0d38ad1
Vladimir Marko [Thu, 11 Sep 2014 17:27:39 +0000 (18:27 +0100)]
resolved conflicts for merge of
5366c20d to lmp-dev-plus-aosp
Change-Id: I65defc92aa4fcb61f3ddcbfde2851dd3fd6f2336
Vladimir Marko [Thu, 11 Sep 2014 16:26:54 +0000 (16:26 +0000)]
am
0a40828e: Merge "Improve dex location canonicalization-related performance." into lmp-dev
* commit '
0a40828e6f4914968048642e8c0e5fdf6bc3b1af':
Improve dex location canonicalization-related performance.
Vladimir Marko [Thu, 11 Sep 2014 16:26:54 +0000 (16:26 +0000)]
am
11db17c4: Merge "Fix GetDexCanonicalLocation test for relative paths." into lmp-dev
* commit '
11db17c44cdbd71e97a677cdc8fb1e18907ab93d':
Fix GetDexCanonicalLocation test for relative paths.
Vladimir Marko [Thu, 11 Sep 2014 16:18:49 +0000 (16:18 +0000)]
Merge "Improve dex location canonicalization-related performance." into lmp-dev
Vladimir Marko [Thu, 11 Sep 2014 16:18:16 +0000 (16:18 +0000)]
Merge "Fix GetDexCanonicalLocation test for relative paths." into lmp-dev
Andreas Gampe [Thu, 11 Sep 2014 15:19:23 +0000 (15:19 +0000)]
am
4a4dafe9: Merge "ART: Correctly make methods preverified"
* commit '
4a4dafe9bbf3fd1b15d85d76c3af7dd581647ace':
ART: Correctly make methods preverified
Andreas Gampe [Thu, 11 Sep 2014 15:06:09 +0000 (15:06 +0000)]
Merge "ART: Correctly make methods preverified"
Andreas Gampe [Thu, 11 Sep 2014 02:48:05 +0000 (19:48 -0700)]
ART: Correctly make methods preverified
Bug:
16828525
(cherry picked from commit
df1532b9ba0cda2d00b78fbdef461f8a6cf8a737)
Change-Id: I66756348b2aa50e41dacca59769b6810a91c73b0
Sebastien Hertz [Thu, 11 Sep 2014 14:55:54 +0000 (14:55 +0000)]
am
b4bdef2b: am
96cd6714: Fix crash when connected to DDMS
* commit '
b4bdef2b104329145a7c668b142209e22eb8cc80':
Fix crash when connected to DDMS
Sebastien Hertz [Thu, 11 Sep 2014 14:43:56 +0000 (14:43 +0000)]
am
96cd6714: Fix crash when connected to DDMS
* commit '
96cd6714d94b47512710776761dec98c8be68bef':
Fix crash when connected to DDMS
Sebastien Hertz [Thu, 11 Sep 2014 14:23:44 +0000 (16:23 +0200)]
Fix crash when connected to DDMS
Restore init of WellKnownClasses::org_apache_harmony_dalvik_ddmc_Chunk_data and
removed duplicated line.
Bug:
17467328
Bug:
17463118
Change-Id: I64638e23615b7c20061b49c41a9c0e9f35a4d537
Nicolas Geoffray [Thu, 11 Sep 2014 11:42:36 +0000 (11:42 +0000)]
am
33c16932: Merge "Fix builds on archs the compiler does not support."
* commit '
33c1693244996102c3aa37d2f54e02220d77f62b':
Fix builds on archs the compiler does not support.
Nicolas Geoffray [Thu, 11 Sep 2014 11:25:26 +0000 (11:25 +0000)]
Merge "Fix builds on archs the compiler does not support."
Nicolas Geoffray [Thu, 11 Sep 2014 11:17:43 +0000 (12:17 +0100)]
Fix builds on archs the compiler does not support.
Change-Id: Ibfc47026596c868fb6d48465a6e564a0b1e07fd0
Nicolas Geoffray [Thu, 11 Sep 2014 10:55:41 +0000 (10:55 +0000)]
am
0b35b978: Merge "Fix valgrind errors."
* commit '
0b35b9781b9e7143d673474fd59e13294c90abb5':
Fix valgrind errors.
Nicolas Geoffray [Thu, 11 Sep 2014 10:39:42 +0000 (10:39 +0000)]
Merge "Fix valgrind errors."
Sebastien Hertz [Thu, 11 Sep 2014 10:19:35 +0000 (10:19 +0000)]
am
776995cb: Merge "Fix deadlock in VirtualMachine.AllThreads"
* commit '
776995cb539ffe5afb9382027c6995d27becd72f':
Fix deadlock in VirtualMachine.AllThreads
Sebastien Hertz [Thu, 11 Sep 2014 10:03:21 +0000 (12:03 +0200)]
resolved conflicts for merge of
bb2e4d7d to lmp-dev-plus-aosp
Change-Id: I09494f20cbdfde03dc2f1d05fddb17b2acedb63e
Sebastien Hertz [Thu, 11 Sep 2014 10:00:04 +0000 (10:00 +0000)]
Merge "Fix deadlock in VirtualMachine.AllThreads"
Sebastien Hertz [Tue, 9 Sep 2014 10:08:49 +0000 (12:08 +0200)]
Fix deadlock in VirtualMachine.AllThreads
We cannot add any object in the JDWP object registry while holding the
Locks::thread_list_lock. Indeed we may need to suspend a thread and take it,
causing a deadlock by waiting for ourself on this lock.
Bug:
17343664
(cherry picked from commit
d35776413901a6a9d478e06dc354ea4f7d962e04)
Change-Id: I07d150b95a6d2b62c913bf2ca2ac217911b2f19d
Sebastien Hertz [Thu, 11 Sep 2014 09:53:40 +0000 (11:53 +0200)]
resolved conflicts for merge of
d9a043f9 to lmp-dev-plus-aosp
Change-Id: I595596ea8953cad50d501e86d80ffba91392d859
Sebastien Hertz [Thu, 11 Sep 2014 09:41:31 +0000 (09:41 +0000)]
Merge "Don't hold any lock when visiting classes from JDWP"
Sebastien Hertz [Thu, 11 Sep 2014 09:38:48 +0000 (09:38 +0000)]
am
5f0438a4: Merge "Fix deadlock in VirtualMachine.AllThreads" into lmp-dev
* commit '
5f0438a4123aeaae55ee034d31c5b1465fcf69cd':
Fix deadlock in VirtualMachine.AllThreads
Sebastien Hertz [Thu, 28 Aug 2014 12:41:50 +0000 (14:41 +0200)]
Don't hold any lock when visiting classes from JDWP
Computes reference type ids of all loaded classes without holding the class
linker lock. Because computing the JDWP reference type id can cause thread
suspension, we can't hold any lock. This is detected in debug build (using
libartd.so) and causes an abort.
Also adds missing thread safety annotations related to ObjectRegistry::lock_.
Bug:
17305632
Bug:
16720689
(cherry picked from commit
95795e286145a4aece5c4a095fa2e7e88ee2115a)
Change-Id: If4fb069790a0a3358ad49da8f75c62a54c0f0b56
Sebastien Hertz [Thu, 11 Sep 2014 09:33:33 +0000 (09:33 +0000)]
Merge "Fix deadlock in VirtualMachine.AllThreads" into lmp-dev
Nicolas Geoffray [Thu, 11 Sep 2014 09:30:02 +0000 (10:30 +0100)]
Fix valgrind errors.
For now just stack allocate the code generator. Will think
about cleaning up the root problem later (CodeGenerator being an
arena object).
Change-Id: I161a6f61c5f27ea88851b446f3c1e12ee9c594d7
Sebastien Hertz [Thu, 11 Sep 2014 09:26:01 +0000 (11:26 +0200)]
resolved conflicts for merge of
223390fd to lmp-dev-plus-aosp
Change-Id: I889e3e4b1bf9ac5a699c962341d71633294b40c6
Nicolas Geoffray [Thu, 11 Sep 2014 09:22:54 +0000 (09:22 +0000)]
am
c7f6b86c: Merge "Fix bug in register allocator."
* commit '
c7f6b86c269727fe031146b9c18652d40916d46f':
Fix bug in register allocator.
Sebastien Hertz [Thu, 11 Sep 2014 09:17:59 +0000 (09:17 +0000)]
am
94aa2482: Merge "Don\'t hold any lock when visiting classes from JDWP" into lmp-dev
* commit '
94aa2482e8ba71e85a875c2afc85ad8b8d3fb0f3':
Don't hold any lock when visiting classes from JDWP
Nicolas Geoffray [Thu, 11 Sep 2014 08:21:10 +0000 (08:21 +0000)]
Merge "Fix bug in register allocator."
Brian Carlstrom [Thu, 11 Sep 2014 08:14:54 +0000 (01:14 -0700)]
Move EnsurePreverifiedMethods to take ConstHandle to reconcile with AOSP
Bug:
16828525
Change-Id: I7b6a3771ed78ef609d84ee539e9d9575deb2476a
Sebastien Hertz [Thu, 11 Sep 2014 08:04:30 +0000 (08:04 +0000)]
Merge "Don't hold any lock when visiting classes from JDWP" into lmp-dev
Brian Carlstrom [Thu, 11 Sep 2014 07:23:39 +0000 (07:23 +0000)]
Merge "Revert "Workaround Darwin ContainedWithinExistingMap issue"" into lmp-dev-plus-aosp
Brian Carlstrom [Thu, 11 Sep 2014 07:12:33 +0000 (07:12 +0000)]
am
c67a6d7b: am
59d0e8ac: Merge "Use WellKnownClasses in ThrowStackOverflowError to reduce changes of further stack overflow" into lmp-dev
* commit '
c67a6d7b9455110dc76b5d353923c4079a176c7f':
Use WellKnownClasses in ThrowStackOverflowError to reduce changes of further stack overflow
Brian Carlstrom [Thu, 11 Sep 2014 07:01:47 +0000 (07:01 +0000)]
am
59d0e8ac: Merge "Use WellKnownClasses in ThrowStackOverflowError to reduce changes of further stack overflow" into lmp-dev
* commit '
59d0e8aca127088bc08586add9be38045ad420c0':
Use WellKnownClasses in ThrowStackOverflowError to reduce changes of further stack overflow
Brian Carlstrom [Thu, 11 Sep 2014 06:54:05 +0000 (06:54 +0000)]
Merge "Use WellKnownClasses in ThrowStackOverflowError to reduce changes of further stack overflow" into lmp-dev
Brian Carlstrom [Thu, 11 Sep 2014 06:10:47 +0000 (23:10 -0700)]
Use WellKnownClasses in ThrowStackOverflowError to reduce changes of further stack overflow
Bug:
17463118
Change-Id: Ic05b07803d2d3112e0b67064f380cd46ba9e293f
Andreas Gampe [Thu, 11 Sep 2014 05:56:08 +0000 (05:56 +0000)]
am
b19e9bb5: am
df1532b9: ART: Correctly make methods preverified
* commit '
b19e9bb527bd156d1dccbc5c6e388917be28b16c':
ART: Correctly make methods preverified
Andreas Gampe [Thu, 11 Sep 2014 05:46:06 +0000 (05:46 +0000)]
am
df1532b9: ART: Correctly make methods preverified
* commit '
df1532b9ba0cda2d00b78fbdef461f8a6cf8a737':
ART: Correctly make methods preverified
Andreas Gampe [Thu, 11 Sep 2014 02:48:05 +0000 (19:48 -0700)]
ART: Correctly make methods preverified
Bug:
16828525
Change-Id: I66756348b2aa50e41dacca59769b6810a91c73b0
Serguei Katkov [Mon, 8 Sep 2014 10:48:25 +0000 (17:48 +0700)]
x86 fault handler does not know about movb
mov byte instruction is not known for fault handler and therefore
it cannot catch null pointer exception represented by this instruction.
As a result implicit null check does not work.
Change-Id: I45d6056f838d1568fce3de58218437fc12d1c45b
Signed-off-by: Serguei Katkov <serguei.i.katkov@intel.com>
Brian Carlstrom [Thu, 11 Sep 2014 01:23:57 +0000 (18:23 -0700)]
Revert "Workaround Darwin ContainedWithinExistingMap issue"
This reverts commit
29acd2f2e2d5f953535be1f71bc89cbb3a00f52c.
This workaround apparently is not needed in the master branches.
Bug:
16861075
Change-Id: I9aa3e3f8830c81a54bc5ba7fef3b9f87b81cdc4e
Andreas Gampe [Thu, 11 Sep 2014 00:06:00 +0000 (00:06 +0000)]
am
b9620f30: Merge "ART: Fix things for valgrind"
* commit '
b9620f305c79914f5159cf9279a7ccd173af1186':
ART: Fix things for valgrind
Andreas Gampe [Wed, 10 Sep 2014 23:43:32 +0000 (23:43 +0000)]
Merge "ART: Fix things for valgrind"
Stephen Hines [Wed, 10 Sep 2014 23:32:48 +0000 (23:32 +0000)]
am
575a5649: Merge "Revert "Disable Clang internal assembler.""
* commit '
575a5649715ee50e0de8a107e8a5379d4c465382':
Revert "Disable Clang internal assembler."
Ian Rogers [Wed, 10 Sep 2014 23:18:16 +0000 (23:18 +0000)]
am
6c8f8f63: Merge "Re-add read barrier to roots in the verifier."
* commit '
6c8f8f632da00bbc0cffc89a12b0716f8500f039':
Re-add read barrier to roots in the verifier.
Ian Rogers [Wed, 10 Sep 2014 23:18:15 +0000 (23:18 +0000)]
am
a87a7950: Merge "Revert "Add read barriers for the roots in the verifier.""
* commit '
a87a7950ee79f42351992d211517f9f22e9393ee':
Revert "Add read barriers for the roots in the verifier."