OSDN Git Service
Nicolas Geoffray [Wed, 24 Jun 2015 14:19:56 +0000 (14:19 +0000)]
am
2b1bc487: Merge "BCE: Narrow instead of unconditionnaly overwrite the range."
* commit '
2b1bc487d3fa84e4bac16e85112e5e45682ac0ba':
BCE: Narrow instead of unconditionnaly overwrite the range.
Nicolas Geoffray [Wed, 24 Jun 2015 14:10:57 +0000 (14:10 +0000)]
Merge "BCE: Narrow instead of unconditionnaly overwrite the range."
Nicolas Geoffray [Wed, 24 Jun 2015 09:38:27 +0000 (10:38 +0100)]
BCE: Narrow instead of unconditionnaly overwrite the range.
bug:
21862741
Change-Id: Ic1c2d6fa64255623f87af33a297c459cc9080d3c
David Brazdil [Wed, 24 Jun 2015 14:06:18 +0000 (14:06 +0000)]
am
b809daaf: Merge "ART: Stop creating a fallthrough block for Goto"
* commit '
b809daaffdd42dc01457ae06ae83f2d7ebdb5e65':
ART: Stop creating a fallthrough block for Goto
David Brazdil [Wed, 24 Jun 2015 13:56:48 +0000 (13:56 +0000)]
Merge "ART: Stop creating a fallthrough block for Goto"
Nicolas Geoffray [Wed, 24 Jun 2015 13:35:37 +0000 (13:35 +0000)]
am
1c7f2f10: Merge "Fix codegen_test after DCE fix."
* commit '
1c7f2f10230baf7a549af5bfd16fd3f0fb73ba21':
Fix codegen_test after DCE fix.
Nicolas Geoffray [Wed, 24 Jun 2015 13:26:22 +0000 (13:26 +0000)]
Merge "Fix codegen_test after DCE fix."
Nicolas Geoffray [Wed, 24 Jun 2015 13:25:09 +0000 (14:25 +0100)]
Fix codegen_test after DCE fix.
Change-Id: I16c64abc26c64815da4cb4034276d60e9bfb6996
David Brazdil [Wed, 24 Jun 2015 13:23:56 +0000 (14:23 +0100)]
ART: Stop creating a fallthrough block for Goto
Optimizing's Builder used to create a basic block after a Goto under
the assumption that control flow can fall through.
Bug:
19084197
Change-Id: Id85f31df98a4177466750d3cd0bc8bb74782ca2d
Nicolas Geoffray [Wed, 24 Jun 2015 13:12:31 +0000 (13:12 +0000)]
am
9dda8f23: Merge "Fix another case of un-verified dead code."
* commit '
9dda8f231bf6aaac3f0397f1fa0cd9d42eb393ed':
Fix another case of un-verified dead code.
Nicolas Geoffray [Wed, 24 Jun 2015 13:01:55 +0000 (13:01 +0000)]
Merge "Fix another case of un-verified dead code."
Nicolas Geoffray [Wed, 24 Jun 2015 12:58:51 +0000 (12:58 +0000)]
am
d61d77d6: Merge "Recompute dominator tree after DCE."
* commit '
d61d77d67a90f2e12ef89997e181f91f8858d7a8':
Recompute dominator tree after DCE.
Nicolas Geoffray [Wed, 24 Jun 2015 11:41:20 +0000 (12:41 +0100)]
Fix another case of un-verified dead code.
bug:
22042796
https://code.google.com/p/android/issues/detail?id=178008
Change-Id: Ie77ccf17ce2a69c86b2278f7920aa4ad39bf142b
Nicolas Geoffray [Wed, 24 Jun 2015 12:50:33 +0000 (12:50 +0000)]
Merge "Recompute dominator tree after DCE."
Nicolas Geoffray [Wed, 24 Jun 2015 11:20:24 +0000 (12:20 +0100)]
Recompute dominator tree after DCE.
bug:
22031382
Change-Id: Ifebe169897b76872015e3ce0ed7d0a9662f80cef
Calin Juravle [Wed, 24 Jun 2015 11:32:42 +0000 (11:32 +0000)]
am
a256ee9c: Merge "Revert "Use -Xno-dex-file-fallback for libcore tests.""
* commit '
a256ee9ccbd01407541958476f388ae7c687a9c2':
Revert "Use -Xno-dex-file-fallback for libcore tests."
Calin Juravle [Wed, 24 Jun 2015 11:21:22 +0000 (11:21 +0000)]
Merge "Revert "Use -Xno-dex-file-fallback for libcore tests.""
Calin Juravle [Wed, 24 Jun 2015 11:21:09 +0000 (11:21 +0000)]
Revert "Use -Xno-dex-file-fallback for libcore tests."
This reverts commit
0b58603bc02c0922a1ec2d2cda8de9dbb3128294.
Change-Id: I80ec8f7c41907cd8716d1d73f25818fbb096daa6
Calin Juravle [Wed, 24 Jun 2015 10:50:44 +0000 (10:50 +0000)]
am
264e63bb: Merge "Use -Xno-dex-file-fallback for libcore tests."
* commit '
264e63bb899320a779264964aee6b868de25515e':
Use -Xno-dex-file-fallback for libcore tests.
Calin Juravle [Wed, 24 Jun 2015 10:40:35 +0000 (10:40 +0000)]
Merge "Use -Xno-dex-file-fallback for libcore tests."
Nicolas Geoffray [Wed, 24 Jun 2015 09:47:28 +0000 (09:47 +0000)]
am
a12f729e: Merge "Remove bogus DCHECK."
* commit '
a12f729e7165780e73857e6248af0df00ad6ce2b':
Remove bogus DCHECK.
Nicolas Geoffray [Wed, 24 Jun 2015 09:47:27 +0000 (09:47 +0000)]
am
582195df: Merge "libcore tests: increase the timeout in debug mode."
* commit '
582195dfcee32586b71b0ed00a973cfc7d7b8b57':
libcore tests: increase the timeout in debug mode.
Nicolas Geoffray [Wed, 24 Jun 2015 09:03:56 +0000 (09:03 +0000)]
Merge "Remove bogus DCHECK."
Nicolas Geoffray [Tue, 23 Jun 2015 17:16:46 +0000 (18:16 +0100)]
Remove bogus DCHECK.
Spotted by running libcore tests with libartd.so. The FindClass
call will throw the exception if the element type is void.
Change-Id: Ic5df7eb6c9934b8e70f7bfdcfe533e5c1ad5c518
Nicolas Geoffray [Wed, 24 Jun 2015 08:21:31 +0000 (08:21 +0000)]
Merge "libcore tests: increase the timeout in debug mode."
Mathieu Chartier [Tue, 23 Jun 2015 23:16:59 +0000 (23:16 +0000)]
am
442cfa4c: Merge "Fix field ordering for String in hprof"
* commit '
442cfa4cf08d4da6b95c48529bc79873fe6ff332':
Fix field ordering for String in hprof
Andreas Gampe [Tue, 23 Jun 2015 23:16:57 +0000 (23:16 +0000)]
Mathieu Chartier [Tue, 23 Jun 2015 23:10:45 +0000 (23:10 +0000)]
Merge "Fix field ordering for String in hprof"
Andreas Gampe [Tue, 23 Jun 2015 23:03:07 +0000 (23:03 +0000)]
Andreas Gampe [Tue, 23 Jun 2015 21:18:17 +0000 (14:18 -0700)]
ART: Follow-up to
507cc6f83bf6379728f2dd20391f2ed5fbfe6371
Do not trigger DCHECK aborts for final and abstract classes when
they are used from other classes. Instead issue a soft error that
leads to a runtime failure.
Bug:
21873151
Change-Id: Ie5251a176722811b3c74585222874313a53f7e02
Mathieu Chartier [Tue, 23 Jun 2015 22:45:15 +0000 (15:45 -0700)]
Fix field ordering for String in hprof
We were inserting value field after the Object field instead of
the String fields.
(cherry picked from commit
c94c6a751ef1ee31cbc3b924835290bcdef731a0)
Bug:
22043800
Change-Id: Ibaddbd7299562949e32eceb625feac325539e3ce
Jeff Hao [Tue, 23 Jun 2015 22:36:48 +0000 (22:36 +0000)]
am
b1452c2f: Merge "Make dex file verifier check that indexes are increasing."
* commit '
b1452c2fb01bfb663dbac94010c73b97e0c094e8':
Make dex file verifier check that indexes are increasing.
Jeff Hao [Tue, 23 Jun 2015 22:27:06 +0000 (22:27 +0000)]
Merge "Make dex file verifier check that indexes are increasing."
Jeff Hao [Tue, 23 Jun 2015 03:20:30 +0000 (20:20 -0700)]
Make dex file verifier check that indexes are increasing.
Note that this still allows duplicates.
Bug:
21868011
(cherry-picked from commit
dd32833e24241508aa697d5349edf6aba9922434)
Change-Id: Ifcb2cda465d9451c16b122185a260ca8cebc41c5
Nicolas Geoffray [Tue, 23 Jun 2015 17:20:41 +0000 (18:20 +0100)]
libcore tests: increase the timeout in debug mode.
libcore.java.lang.SystemTest#testArrayCopyConcurrentModification
is slow on device.
Change-Id: I21e6533b2a3199e9e85d17b059065a6289553f8b
Vladimir Marko [Tue, 23 Jun 2015 16:53:06 +0000 (16:53 +0000)]
am
bb3dabaf: Merge "ART: Improve Indenter performance."
* commit '
bb3dabaf804e0d0bd2bf34e69091b2f86fd4e78b':
ART: Improve Indenter performance.
Vladimir Marko [Tue, 23 Jun 2015 16:43:31 +0000 (16:43 +0000)]
Merge "ART: Improve Indenter performance."
Nicolas Geoffray [Tue, 23 Jun 2015 16:05:22 +0000 (16:05 +0000)]
am
568e8f39: Merge "Fix 496 test."
* commit '
568e8f394b264a9b7932f081f971b141e563641e':
Fix 496 test.
Nicolas Geoffray [Tue, 23 Jun 2015 15:57:12 +0000 (15:57 +0000)]
Merge "Fix 496 test."
Nicolas Geoffray [Tue, 23 Jun 2015 11:09:55 +0000 (12:09 +0100)]
Fix 496 test.
Make sure the class requested by LoadedByMyClassLoader.bar
is not loaded yet ('Main' is already loaded), in order to
do a proper class loader lookup and not use a dex cache
version.
Change-Id: I77215ae489e6d2c50b90684951bccd0bbf8c1a53
Vladimir Marko [Tue, 23 Jun 2015 14:39:01 +0000 (15:39 +0100)]
ART: Improve Indenter performance.
This reduces the time taken by oatdump_test by ~15s (16%)
on host and ~30s (5%) on N5. The Indenter.overflow() was
previously the hottest function according to perf.
Change-Id: I96eb69ce3f5420cd09dba23b29f8025cedc3d80a
Roland Levillain [Tue, 23 Jun 2015 14:05:29 +0000 (14:05 +0000)]
am
d4a02cfc: Merge "Replace some run-time assertions with compile-time ones in ART."
* commit '
d4a02cfc59a449d216faa687cfdaa4252b4a433f':
Replace some run-time assertions with compile-time ones in ART.
Roland Levillain [Tue, 23 Jun 2015 13:53:54 +0000 (13:53 +0000)]
Merge "Replace some run-time assertions with compile-time ones in ART."
Calin Juravle [Thu, 18 Jun 2015 17:38:48 +0000 (18:38 +0100)]
Use -Xno-dex-file-fallback for libcore tests.
Change-Id: I23911d17c4d71504b3ff9293325af533097ba49d
Roland Levillain [Tue, 23 Jun 2015 13:10:40 +0000 (13:10 +0000)]
am
0022bdf7: Merge "ART: Fix data loss when symbolizing oat files."
* commit '
0022bdf71533a300deebe6b9cf287eaceeb0620c':
ART: Fix data loss when symbolizing oat files.
Roland Levillain [Tue, 23 Jun 2015 13:00:43 +0000 (13:00 +0000)]
Merge "ART: Fix data loss when symbolizing oat files."
Nicolas Geoffray [Tue, 23 Jun 2015 11:41:40 +0000 (11:41 +0000)]
am
508755a3: Merge "Use GetOffsetDuringLinking instead of GetOffset."
* commit '
508755a3d4d3d67aa834c033c79073c0a08a8fbd':
Use GetOffsetDuringLinking instead of GetOffset.
Nicolas Geoffray [Tue, 23 Jun 2015 11:32:10 +0000 (11:32 +0000)]
Merge "Use GetOffsetDuringLinking instead of GetOffset."
Vladimir Marko [Tue, 23 Jun 2015 11:11:25 +0000 (11:11 +0000)]
am
87dc1b09: Merge "ART: Compiler generated GC map should take care of temp registers."
* commit '
87dc1b09cee6e972fbe3ad48ba8b5ae68d37085f':
ART: Compiler generated GC map should take care of temp registers.
Nicolas Geoffray [Tue, 23 Jun 2015 11:11:24 +0000 (12:11 +0100)]
Use GetOffsetDuringLinking instead of GetOffset.
GetOffset assumes the class has been resolved, but LinkFields
is called before the class is marked as such.
Change-Id: I6f9fc21cd220881806f00461a82a14e459e26a8b
Vladimir Marko [Tue, 23 Jun 2015 11:00:19 +0000 (11:00 +0000)]
Merge "ART: Compiler generated GC map should take care of temp registers."
Nicolas Geoffray [Tue, 23 Jun 2015 10:24:40 +0000 (10:24 +0000)]
am
b5061a82: Merge "Do not overwrite an input register in shift operations."
* commit '
b5061a821d96cb1af7ba24d21a4d2d59f7f16c7c':
Do not overwrite an input register in shift operations.
Nicolas Geoffray [Tue, 23 Jun 2015 10:15:45 +0000 (10:15 +0000)]
Merge "Do not overwrite an input register in shift operations."
Nicolas Geoffray [Mon, 22 Jun 2015 22:12:45 +0000 (23:12 +0100)]
Do not overwrite an input register in shift operations.
'second_reg' is an input register that can survive the instruction.
Instead use the output register as a temporary result.
bug:
21667432
Change-Id: I1a4577b0333c3fb184645023d5eae30555bbf65c
David Brazdil [Tue, 23 Jun 2015 10:00:43 +0000 (10:00 +0000)]
am
1f22dbc1: Merge "ART: Fix GraphVisualizer dlopen crash"
* commit '
1f22dbc10d9fdc96a6814e737718098e36a0ea3c':
ART: Fix GraphVisualizer dlopen crash
David Brazdil [Tue, 23 Jun 2015 09:47:23 +0000 (09:47 +0000)]
Merge "ART: Fix GraphVisualizer dlopen crash"
David Brazdil [Tue, 23 Jun 2015 09:22:38 +0000 (10:22 +0100)]
ART: Fix GraphVisualizer dlopen crash
The HGraphVisualizer used to crash if it failed to dlopen the
libart(d)-disassembler.so. This patch fixes that.
Bug:
22001285
Change-Id: Ibe9b9af17a77e22e3571c886f77918e9491b7827
Mathieu Chartier [Tue, 23 Jun 2015 03:35:17 +0000 (03:35 +0000)]
am
da0e224d: Merge "Restore DDMS recent allocation tracking\'s behavior"
* commit '
da0e224d79262b11fbac9e7b1fdc11c4df31b77f':
Restore DDMS recent allocation tracking's behavior
Mathieu Chartier [Tue, 23 Jun 2015 03:35:15 +0000 (03:35 +0000)]
am
3355963c: Merge "Fix another miranda method moving GC bug"
* commit '
3355963cee00fe97cc7aaeaab2c6e31c5657ff6a':
Fix another miranda method moving GC bug
Mathieu Chartier [Tue, 23 Jun 2015 03:27:44 +0000 (03:27 +0000)]
Merge "Restore DDMS recent allocation tracking's behavior"
Mathieu Chartier [Tue, 23 Jun 2015 03:27:18 +0000 (03:27 +0000)]
Merge "Fix another miranda method moving GC bug"
Mathieu Chartier [Sat, 20 Jun 2015 03:24:45 +0000 (20:24 -0700)]
Fix another miranda method moving GC bug
Need to copy miranda methods over before we allocate the new vtable
or else we may have stale miranda gc roots.
(cherry picked from commit
6e80460bdf0aa9bd273d4a4d665d679c651b5f4f)
Bug:
21664466
Change-Id: Ib3e415bb9e7df7abfa18c98fe01f790fa39622dc
Man Cao [Fri, 12 Jun 2015 05:47:35 +0000 (22:47 -0700)]
Restore DDMS recent allocation tracking's behavior
Make the allocation tracker mark recently allocated objects as roots,
so the allocation records are not swept. Because DDMS needs recent
allocation tracking records even for dead objects. This should fix
the flaky failures for 098-ddmc test, but it cannot pass GC stress
test (OOM). Re-enabled 098-ddmc for other tests.
There should be an option to not mark them as roots, when user only
needs HPROF dump with traces but not DDMS's recent allocation tracking.
Probably need to add a new JNI API function for this option.
There could be another way to keep a second list of recent allocation
records and maintain a type cache for them, so not to make the objects
roots. But it's more complex, and not sure which is better.
Also reduce memory usage for AllocRecordStackTrace objects, and change
default stack depth to 16. Rename the property that controls the stack
depth to "debug.allocTracker.maxStackDepth" so developer can change it.
Bug:
20037135
Change-Id: Ic6b9ae87bdcda558be6f14ded8057e763439881c
Igor Murashkin [Mon, 22 Jun 2015 23:44:53 +0000 (23:44 +0000)]
am
336b0b1b: Merge "base: Fix an infinite loop in HashSet::Insert"
* commit '
336b0b1baaf2b3eccb26ccf1b7d502c90c3f33fd':
base: Fix an infinite loop in HashSet::Insert
Igor Murashkin [Mon, 22 Jun 2015 23:36:14 +0000 (23:36 +0000)]
Merge "base: Fix an infinite loop in HashSet::Insert"
Igor Murashkin [Mon, 22 Jun 2015 22:57:38 +0000 (15:57 -0700)]
base: Fix an infinite loop in HashSet::Insert
Also adds a test for HashSet::ShrinkToMaximumLoad
(This bug was only reachable when using ShrinkToMaximumLoad, which is not
called from anywhere other than the new test)
Change-Id: I5276b4b3f4ecf6090bb545ddd1752758b11609dd
Mathieu Chartier [Mon, 22 Jun 2015 23:17:59 +0000 (23:17 +0000)]
am
ac854d27: Merge "New experimental GC stress mode"
* commit '
ac854d27aeafb3dca04dfc5c716d0436f1d5ffc1':
New experimental GC stress mode
Mathieu Chartier [Mon, 22 Jun 2015 22:58:54 +0000 (22:58 +0000)]
Merge "New experimental GC stress mode"
Jeff Hao [Mon, 22 Jun 2015 22:47:11 +0000 (22:47 +0000)]
am
5aa39bb7: Merge "Change GC to allow strings to use large object space."
* commit '
5aa39bb7f93cf2e8f73d06980b588519825c0ebe':
Change GC to allow strings to use large object space.
Mathieu Chartier [Sun, 14 Jun 2015 21:14:37 +0000 (14:14 -0700)]
New experimental GC stress mode
Tries to do a GC for every unique call stack (up to 16 frames).
The goal is to catch moving GC bugs and lock violations without being
rediculously slow. Some tests fail on 64 bits, 32 bit host doesn't
work. N5 is booting.
Added runtime -Xgc options: gcstress and nogcstress.
Bug:
21664466
Change-Id: Icb8e420f2048e8ee83bcca7937563166a2638f5c
Jeff Hao [Mon, 22 Jun 2015 22:42:22 +0000 (22:42 +0000)]
am
d423552a: Merge "Make large string use large object space."
* commit '
d423552afd00bac3cdb523b9f8681f3f58163564':
Make large string use large object space.
Jeff Hao [Mon, 22 Jun 2015 22:39:55 +0000 (22:39 +0000)]
Merge "Change GC to allow strings to use large object space."
Jeff Hao [Mon, 22 Jun 2015 22:14:49 +0000 (15:14 -0700)]
Change GC to allow strings to use large object space.
Bug:
21209641
(cherry-picked from commit
37fd5275c665b483f2d990634a500c4e79aae87f)
Change-Id: I043f59eeb601a95c7d01b10a844c2237167ee862
Jeff Hao [Mon, 22 Jun 2015 22:27:56 +0000 (22:27 +0000)]
Merge "Make large string use large object space."
Jeff Hao [Mon, 22 Jun 2015 21:29:54 +0000 (14:29 -0700)]
Make large string use large object space.
Bug:
21209641
(cherry-picked from commit
38fafa18f0fcf610f6314a0fc4165e04e6e5d017)
Change-Id: If6d708307ba1ecdde6bf856d31dceac9ee782fb7
Igor Murashkin [Mon, 22 Jun 2015 21:25:27 +0000 (21:25 +0000)]
am
ec3a4e7c: Merge "runtime: Partially implement box-lambda and unbox-lambda experimental opcodes"
* commit '
ec3a4e7cdc4f268b40d923227c125429f4ee4884':
runtime: Partially implement box-lambda and unbox-lambda experimental opcodes
Andreas Gampe [Mon, 22 Jun 2015 21:25:25 +0000 (21:25 +0000)]
am
11dc78c8: Merge "ART: Allow checking RETURN_VOID_NO_BARRIER on unresolved classes"
* commit '
11dc78c8d36b4a65f4d955bc4303cc8279f1151e':
ART: Allow checking RETURN_VOID_NO_BARRIER on unresolved classes
Igor Murashkin [Mon, 22 Jun 2015 21:15:01 +0000 (21:15 +0000)]
Merge "runtime: Partially implement box-lambda and unbox-lambda experimental opcodes"
Andreas Gampe [Mon, 22 Jun 2015 21:14:43 +0000 (21:14 +0000)]
Merge "ART: Allow checking RETURN_VOID_NO_BARRIER on unresolved classes"
Igor Murashkin [Thu, 18 Jun 2015 17:05:11 +0000 (10:05 -0700)]
runtime: Partially implement box-lambda and unbox-lambda experimental opcodes
These opcodes are not yet fully specified, and *will* change before they become shippable.
Do not write production code against experimental opcodes.
--
Implement partial interpreter support for new dex instructions box/unbox-lambda.
* box-lambda will take a closure and convert it into an Object
* unbox-lambda will take an Object and convert it to a closure
(Currently does not implement object identity or variable capture).
All new opcodes are disabled by default, use runtime option -Xexperimental-lambdas to enable them.
Change-Id: I3c15ccf8a26ccecd1d35808a8c1b4149220f6019
Hiroshi Yamauchi [Mon, 22 Jun 2015 19:50:41 +0000 (19:50 +0000)]
am
f7012291: Merge "Run an empty checkpoint before marking ends in the CC collector."
* commit '
f7012291ed9c984e2b50d83d7a2d5758cd64c99a':
Run an empty checkpoint before marking ends in the CC collector.
Hiroshi Yamauchi [Mon, 22 Jun 2015 19:40:00 +0000 (19:40 +0000)]
Merge "Run an empty checkpoint before marking ends in the CC collector."
Andreas Gampe [Mon, 22 Jun 2015 18:35:46 +0000 (11:35 -0700)]
ART: Allow checking RETURN_VOID_NO_BARRIER on unresolved classes
We must check that all fields are non-final, even for unresolved
classes. Fall back to the dex file for this information.
Bug:
22005084
Bug: https://code.google.com/p/android/issues/detail?id=177694
Change-Id: If2126d1be5dccadbbedcdccabde7398688d6e5ca
Andreas Gampe [Mon, 22 Jun 2015 17:28:15 +0000 (17:28 +0000)]
am
ae393c3b: Merge "ART: Avoid recursive abort in barrier"
* commit '
ae393c3b24cfdad97aaded8c0ff1ee7262b46ffe':
ART: Avoid recursive abort in barrier
Andreas Gampe [Mon, 22 Jun 2015 17:18:57 +0000 (17:18 +0000)]
Merge "ART: Avoid recursive abort in barrier"
Calin Juravle [Mon, 22 Jun 2015 17:06:52 +0000 (17:06 +0000)]
am
59cb5218: Merge "Fix in ReferenceTypePropagation"
* commit '
59cb52189d350fa9fb38b767fa9b25d971375833':
Fix in ReferenceTypePropagation
Andreas Gampe [Mon, 22 Jun 2015 17:04:39 +0000 (10:04 -0700)]
ART: Avoid recursive abort in barrier
Try to avoid recursive abort in barrier. May lead to a segfault
instead of a nested abort in bad cases.
Change-Id: I0e7976b77c243956dbcf81142bd5df81d5927ce0
Calin Juravle [Mon, 22 Jun 2015 16:57:04 +0000 (16:57 +0000)]
Merge "Fix in ReferenceTypePropagation"
Vladimir Marko [Mon, 22 Jun 2015 16:10:45 +0000 (16:10 +0000)]
am
c30e721b: Merge "ART: Don\'t do pre-linked calls to the interpreter bridge."
* commit '
c30e721b5ddcb4ba6835c5b721e1c5095f4a3d7f':
ART: Don't do pre-linked calls to the interpreter bridge.
Vladimir Marko [Mon, 22 Jun 2015 15:57:16 +0000 (15:57 +0000)]
Merge "ART: Don't do pre-linked calls to the interpreter bridge."
Andreas Gampe [Mon, 22 Jun 2015 15:02:49 +0000 (15:02 +0000)]
am
f91fb4a6: Merge "ART: Disallow classes that are abstract and final"
* commit '
f91fb4a6a565809dd077ee128d11f30b67e6f2ff':
ART: Disallow classes that are abstract and final
Andreas Gampe [Mon, 22 Jun 2015 14:50:42 +0000 (14:50 +0000)]
Merge "ART: Disallow classes that are abstract and final"
Vladimir Marko [Mon, 22 Jun 2015 13:35:42 +0000 (14:35 +0100)]
ART: Don't do pre-linked calls to the interpreter bridge.
Bug:
21897404
Change-Id: I6cca9d3b436df2eed2b0192607de0faf5cc2ecf7
Nicolas Geoffray [Mon, 22 Jun 2015 13:53:58 +0000 (13:53 +0000)]
am
2d655f1c: Merge "Revert "Revert "Use IsAssignableFrom instead of IsSubclass for robustness."""
* commit '
2d655f1ce89a714094a4f55ac75edcf9a34c7e24':
Revert "Revert "Use IsAssignableFrom instead of IsSubclass for robustness.""
Nicolas Geoffray [Mon, 22 Jun 2015 13:47:02 +0000 (13:47 +0000)]
Merge "Revert "Revert "Use IsAssignableFrom instead of IsSubclass for robustness."""
Nicolas Geoffray [Mon, 22 Jun 2015 10:06:43 +0000 (11:06 +0100)]
Revert "Revert "Use IsAssignableFrom instead of IsSubclass for robustness.""
Don't use IsAssignableFrom, but check beforehand if the referrer is an
interface. Otherwise, we are being too aggressive on removing clinit
checks on interfaces (being a subclass doesn't imply the interface
has been initialized).
bug:
21870666
This reverts commit
463580ca5a1e75e27ad0207537ffc6252091326a.
Change-Id: I2a13974d28477ee3e5224142cc260cbf46d19aa9
Narayan Kamath [Mon, 22 Jun 2015 11:42:49 +0000 (11:42 +0000)]
am
a63d8f44: Merge "fault_handler : debug output sp in hex and not decimal."
* commit '
a63d8f44740a8406adda6aaff7ed75ef923c085f':
fault_handler : debug output sp in hex and not decimal.
Narayan Kamath [Mon, 22 Jun 2015 11:28:17 +0000 (11:28 +0000)]
Merge "fault_handler : debug output sp in hex and not decimal."
Narayan Kamath [Fri, 19 Jun 2015 14:23:46 +0000 (15:23 +0100)]
fault_handler : debug output sp in hex and not decimal.
Easier to compare against hex values in tombstones and debuggerd
dumps.
Change-Id: I4a4512ea1ce5872fdb6b41e824fa3475dfcfb71d
Nicolas Geoffray [Mon, 22 Jun 2015 11:16:42 +0000 (11:16 +0000)]
am
ae370391: Merge "Use compiling class instead of outer class for access checks."
* commit '
ae370391057b88607b0e451fdea020b257684b91':
Use compiling class instead of outer class for access checks.