OSDN Git Service
Calin Juravle [Wed, 7 Oct 2015 11:08:54 +0000 (12:08 +0100)]
Enforce optimizing test marker for verification errors.
Change-Id: Ie7babf162729fa02d285572ee043fa9e588d73cc
Andreas Gampe [Wed, 7 Oct 2015 16:59:56 +0000 (16:59 +0000)]
Merge "ART: Remove interpreter entrypoints"
Andreas Gampe [Wed, 7 Oct 2015 00:04:01 +0000 (17:04 -0700)]
ART: Remove interpreter entrypoints
These are no longer used as entrypoints. Make them proper runtime
functions local to the interpreter.
Bump oat version.
Change-Id: Icdd92e20eafc5668b68eeebf55cf624560f462b3
Andreas Gampe [Wed, 7 Oct 2015 16:29:30 +0000 (16:29 +0000)]
Merge "ART: Change asm test logging"
Andreas Gampe [Wed, 7 Oct 2015 01:59:08 +0000 (18:59 -0700)]
ART: Change asm test logging
Adapt the output a bit to log the exact shell command, and change
how the output is logged and what is logged. Should get more info
on failure.
Change-Id: Iacf58d27d6e1cf01e2fcd5835c4e0f8b5a820501
Vladimir Marko [Wed, 7 Oct 2015 15:00:41 +0000 (15:00 +0000)]
Merge "Revert "Quick: Work around large frame sizes for x86_64.""
Vladimir Marko [Wed, 7 Oct 2015 12:44:31 +0000 (12:44 +0000)]
Revert "Quick: Work around large frame sizes for x86_64."
Instead, move the MEMORY_TOOL_MAKE_* calls out-of-line.
Bug:
24729377
This reverts commit
d4cf1e4fe0624b99df22ed5556dc1d042b32a7e0.
Change-Id: I9bccc8bd4a691a2d018b84de8b95bc68fafad4e1
Vladimir Marko [Wed, 7 Oct 2015 11:07:30 +0000 (11:07 +0000)]
Merge "Quick: Work around large frame sizes for x86_64."
Vladimir Marko [Wed, 7 Oct 2015 11:03:29 +0000 (12:03 +0100)]
Quick: Work around large frame sizes for x86_64.
Bug:
24729377
Change-Id: Id608aabad60fb7f1a1450a02444bddfb0eb008a6
Nicolas Geoffray [Wed, 7 Oct 2015 11:00:15 +0000 (11:00 +0000)]
Merge "Fix lint issues."
Nicolas Geoffray [Wed, 7 Oct 2015 10:52:21 +0000 (11:52 +0100)]
Fix lint issues.
Change-Id: I989e25cdaa7e0b99bfef1379f4e4a71511ae1a27
Nicolas Geoffray [Wed, 7 Oct 2015 09:51:07 +0000 (09:51 +0000)]
Merge "Add support for intrinsic optimizations."
Nicolas Geoffray [Fri, 2 Oct 2015 16:30:26 +0000 (17:30 +0100)]
Add support for intrinsic optimizations.
Change-Id: Ib5a4224022f9360e60c09a19ac8642270a7f3b64
Vladimir Marko [Wed, 7 Oct 2015 09:11:49 +0000 (09:11 +0000)]
Merge "Revert "Optimizing: Disable -Wframe-larger-than= for CompileOptimized().""
Nicolas Geoffray [Wed, 7 Oct 2015 08:31:18 +0000 (08:31 +0000)]
Merge "The move to jack forces us to explicitly give the jar path."
Nicolas Geoffray [Wed, 7 Oct 2015 08:28:52 +0000 (09:28 +0100)]
The move to jack forces us to explicitly give the jar path.
vogar currently does not support the --classpath option with jack.
bug:
24723887
Change-Id: I0923ff32ffa62d0ea3fbb4b330e50a3e7dbe8e69
Mathieu Chartier [Tue, 6 Oct 2015 22:05:45 +0000 (22:05 +0000)]
Merge "Disable class unloading test for CC"
Mathieu Chartier [Tue, 6 Oct 2015 21:14:26 +0000 (14:14 -0700)]
Disable class unloading test for CC
Test is flaky for now.
Bug:
22720414
Bug:
24468364
Change-Id: I5d9a7468e17b64522929ae2f7ca469680b8dced2
Vladimir Marko [Tue, 6 Oct 2015 17:30:45 +0000 (17:30 +0000)]
Revert "Optimizing: Disable -Wframe-larger-than= for CompileOptimized()."
Instead, prevent inlining of AllocateRegisters() that uses
huge stack-allocated objects.
Bug:
24698147
This reverts commit
67f784e63343db5ecd6e584343484684ea60d1f8.
Change-Id: I94c408f7acf6e43897a248d9ea0761b979ed00c8
Hiroshi Yamauchi [Tue, 6 Oct 2015 17:01:33 +0000 (17:01 +0000)]
Merge "Refactor the alloc entry point generation code."
The Android Open Source Project [Tue, 6 Oct 2015 16:59:00 +0000 (09:59 -0700)]
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
Calin Juravle [Tue, 6 Oct 2015 16:38:30 +0000 (16:38 +0000)]
Merge "Fix location summary for LoadClass"
Calin Juravle [Tue, 6 Oct 2015 16:35:58 +0000 (17:35 +0100)]
Fix location summary for LoadClass
Don't request a register for the current method if we're gonna call the
runtime.
Change-Id: I9760d15108bd95efb2a34e6eacd84b60841781d7
Andreas Gampe [Tue, 6 Oct 2015 16:25:16 +0000 (16:25 +0000)]
Merge "ART: Add more error logging to assembler tests"
Andreas Gampe [Tue, 6 Oct 2015 16:05:10 +0000 (09:05 -0700)]
ART: Add more error logging to assembler tests
Add error logging so we can figure out when something goes wrong
on the build servers.
Change-Id: Idf9bc1d0e19846059d1dc78510be6333179cd758
Calin Juravle [Tue, 6 Oct 2015 16:21:28 +0000 (16:21 +0000)]
Merge "Assert we don't store an invalid dex_pc in the stack maps."
Calin Juravle [Tue, 6 Oct 2015 16:09:49 +0000 (17:09 +0100)]
Assert we don't store an invalid dex_pc in the stack maps.
Change-Id: Ie106486bd4a6d975c9a3d03d02dc48d97d83c3d8
Calin Juravle [Tue, 6 Oct 2015 15:47:49 +0000 (15:47 +0000)]
am
22d450d3: Merge "Remove dex_pc\'s default value from top level HInstruction"
* commit '
22d450d37801d05785ad1fc792ea9873225fb6a6':
Remove dex_pc's default value from top level HInstruction
Calin Juravle [Tue, 6 Oct 2015 15:43:38 +0000 (15:43 +0000)]
Merge "Remove dex_pc's default value from top level HInstruction"
Calin Juravle [Tue, 6 Oct 2015 14:46:54 +0000 (15:46 +0100)]
Remove dex_pc's default value from top level HInstruction
This clearly hints that the dex_pc is stored in the super class and
doesn't need to be reimplemented in subclasses.
Change-Id: Ifd4aa95190c4c89367b4dd2cc8ab0ffd263659ac
Vladimir Marko [Tue, 6 Oct 2015 15:19:02 +0000 (15:19 +0000)]
am
51d70f17: Merge "Optimizing: Disable -Wframe-larger-than= for CompileOptimized()."
* commit '
51d70f1744493d75e5cef946b7f5e398d0df4d3d':
Optimizing: Disable -Wframe-larger-than= for CompileOptimized().
Vladimir Marko [Tue, 6 Oct 2015 15:15:58 +0000 (15:15 +0000)]
Merge "Optimizing: Disable -Wframe-larger-than= for CompileOptimized()."
Vladimir Marko [Tue, 6 Oct 2015 14:52:34 +0000 (15:52 +0100)]
Optimizing: Disable -Wframe-larger-than= for CompileOptimized().
Bug:
24698147
Change-Id: I360e9412d85afa83ef2152e4c16bcd3139b34f75
Nicolas Geoffray [Tue, 6 Oct 2015 14:57:10 +0000 (14:57 +0000)]
am
72305e26: Merge "Fix another Makefile typo."
* commit '
72305e26c8cecea0d2259278c950b96541c3f8ce':
Fix another Makefile typo.
Nicolas Geoffray [Tue, 6 Oct 2015 14:50:48 +0000 (14:50 +0000)]
Merge "Fix another Makefile typo."
Vladimir Marko [Tue, 6 Oct 2015 12:58:33 +0000 (12:58 +0000)]
am
35ef974d: Merge "ART: Mark deallocated arena memory as inaccessible."
* commit '
35ef974da353b13938fb0f3272c03070ad728431':
ART: Mark deallocated arena memory as inaccessible.
Calin Juravle [Tue, 6 Oct 2015 12:54:57 +0000 (12:54 +0000)]
am
3b6b5879: Merge "Add support for unresolved classes in optimizing."
* commit '
3b6b587934659bc4428557ac174ccce3731fd91a':
Add support for unresolved classes in optimizing.
Vladimir Marko [Tue, 6 Oct 2015 12:53:41 +0000 (12:53 +0000)]
Merge "ART: Mark deallocated arena memory as inaccessible."
Calin Juravle [Tue, 6 Oct 2015 12:48:56 +0000 (12:48 +0000)]
Merge "Add support for unresolved classes in optimizing."
Calin Juravle [Fri, 2 Oct 2015 20:05:03 +0000 (21:05 +0100)]
Add support for unresolved classes in optimizing.
Change-Id: I0e299a81e560eb9cb0737ec46125dffc99333b54
Nicolas Geoffray [Tue, 6 Oct 2015 11:39:17 +0000 (12:39 +0100)]
Fix another Makefile typo.
Change-Id: I4a4a81255c3bef47c92c127e66c2ccd8b199e51d
Nicolas Geoffray [Tue, 6 Oct 2015 11:31:05 +0000 (11:31 +0000)]
am
f82baa91: Merge "Use optimizing\'s pic boot image in art script."
* commit '
f82baa912a4c05a39f953826a45c0617dd2e78ff':
Use optimizing's pic boot image in art script.
Nicolas Geoffray [Tue, 6 Oct 2015 11:26:13 +0000 (11:26 +0000)]
Merge "Use optimizing's pic boot image in art script."
Nicolas Geoffray [Tue, 6 Oct 2015 11:00:47 +0000 (12:00 +0100)]
Use optimizing's pic boot image in art script.
Optimizing is the default compiler.
Change-Id: Ief961c2615f880425eeb348971e50583c3b6283d
Calin Juravle [Tue, 6 Oct 2015 10:52:32 +0000 (10:52 +0000)]
am
7b5c395e: Merge "Fix style issue in stub_test."
* commit '
7b5c395e9a50f988ca2275a429df17b6abbcc475':
Fix style issue in stub_test.
Calin Juravle [Tue, 6 Oct 2015 10:48:21 +0000 (10:48 +0000)]
Merge "Fix style issue in stub_test."
Calin Juravle [Tue, 6 Oct 2015 10:46:58 +0000 (11:46 +0100)]
Fix style issue in stub_test.
Change-Id: I8c338d48f479337b176039c9398d6ee2b44fe6fd
Nicolas Geoffray [Tue, 6 Oct 2015 09:08:42 +0000 (09:08 +0000)]
am
26aad174: Merge "Don\'t delegate to Quick anymore."
* commit '
26aad174f2e369840a39e3142da3f5f0b7d0f950':
Don't delegate to Quick anymore.
Nicolas Geoffray [Tue, 6 Oct 2015 08:23:13 +0000 (08:23 +0000)]
Merge "Don't delegate to Quick anymore."
Andreas Gampe [Tue, 6 Oct 2015 01:21:29 +0000 (01:21 +0000)]
am
bcb71a2c: Merge "MIPS64r6 Assembler Tests"
* commit '
bcb71a2ce5bcb516f76fc9fe838b61b0c48e1210':
MIPS64r6 Assembler Tests
Andreas Gampe [Tue, 6 Oct 2015 01:15:07 +0000 (01:15 +0000)]
Merge "MIPS64r6 Assembler Tests"
Mathieu Chartier [Tue, 6 Oct 2015 01:14:38 +0000 (01:14 +0000)]
am
0edc0bdb: Merge "Disable class unloading when tracing is active"
* commit '
0edc0bdb1dc8018ec0000702e6de60e99537b519':
Disable class unloading when tracing is active
Chris Larsen [Thu, 17 Sep 2015 20:34:00 +0000 (13:34 -0700)]
MIPS64r6 Assembler Tests
Assembler tests for:
- SQRT.fmt - ABS.fmt - ROUND.L.fmt - ROUND.W.fmt
- CEIL.L.fmt - CEIL.W.fmt - FLOOR.L.fmt - FLOOR.W.fmt
- SEL.fmt - RINT.fmt - CLASS.fmt - MIN.fmt
- MAX.fmt - cvt.d.l - BITSWAP - DBITSWAP
- DSBH - DSHD - WSBH - ROTR
- SELEQZ - SELNEZ - CLZ - CLO
- DCLZ - DCLO - SC - SCD
- LL - LLD
These are the assembler instructions which were added to support
intrinsic functions on MIPS64. Tests for additional assembler
instructions will follow.
Support added to the testing infrastructure for:
- Assembler instructions which use three registers; previously
instructions were limited to one, or two, registers.
- Immediate values which have their sizes specified by the number of
bits required to store them rather than the number of bytes, in both
signed and unsigned versions.
Change-Id: I38c07dcbf2539825b25bed13aac05a26fa594b0b
Mathieu Chartier [Tue, 6 Oct 2015 01:10:45 +0000 (01:10 +0000)]
Merge "Disable class unloading when tracing is active"
Mathieu Chartier [Mon, 5 Oct 2015 23:41:10 +0000 (16:41 -0700)]
Disable class unloading when tracing is active
Tracing keeps a lot of pointers to ArtMethods that could belong to
classes that we are going to unload. A quick fix for this is to
disable class unloading when tracing is active.
Bug:
24414774
Bug:
22720414
Change-Id: Ia5619cbd7c9fd558eaa2a5000871d287213c4a76
Hiroshi Yamauchi [Fri, 2 Oct 2015 22:27:55 +0000 (15:27 -0700)]
Refactor the alloc entry point generation code.
Move the x86/x86-64 specific alloc entrypoint generation code to a macro
GENERATE_ALLOC_ENTRYPOINTS_FOR_EACH_ALLOCATOR in a common file to remove
duplication.
This will make it easier to selectively add more hand-written assembly
allocation fast path code.
Rename RETURN_IF_RESULT_IS_NON_ZERO to
RETURN_IF_RESULT_IS_NON_ZERO_OR_DELIVER in the x86/x86_64 files to match
the other architectures.
Bug:
9986565
Change-Id: I56f33b790f94db68891db8a2f42e9231d1770eef
Mathieu Chartier [Mon, 5 Oct 2015 21:35:20 +0000 (21:35 +0000)]
am
6639985f: Merge "Fix test 087 for interpreter"
* commit '
6639985f39a1983494fc7de2e4639fdc88e81228':
Fix test 087 for interpreter
Mathieu Chartier [Mon, 5 Oct 2015 21:29:40 +0000 (21:29 +0000)]
Merge "Fix test 087 for interpreter"
Mathieu Chartier [Mon, 5 Oct 2015 21:26:32 +0000 (14:26 -0700)]
Fix test 087 for interpreter
Dex register was keeping BrokenDexLoader live. Fixes interpreter
tests.
Change-Id: I9d2d0907ad5d38dc40434dbde88a5e0cefbb5c80
Mathieu Chartier [Mon, 5 Oct 2015 20:03:33 +0000 (20:03 +0000)]
am
02706fcb: Merge "Delete DexFiles in closeDexFiles"
* commit '
02706fcb35325ba11825d575eb7278e3b9d6dfac':
Delete DexFiles in closeDexFiles
Mathieu Chartier [Mon, 5 Oct 2015 19:57:21 +0000 (19:57 +0000)]
Merge "Delete DexFiles in closeDexFiles"
Mathieu Chartier [Mon, 5 Oct 2015 19:52:57 +0000 (19:52 +0000)]
am
3a9122a5: Merge "Add exclusion between instrumentation and GC"
* commit '
3a9122a5f9f057e9acb20083cd7e076f3bbf8577':
Add exclusion between instrumentation and GC
Mathieu Chartier [Mon, 5 Oct 2015 19:48:24 +0000 (19:48 +0000)]
Merge "Add exclusion between instrumentation and GC"
Mathieu Chartier [Fri, 25 Sep 2015 23:48:57 +0000 (16:48 -0700)]
Delete DexFiles in closeDexFiles
TODO: Also unmap oat code.
Bug:
22720414
Change-Id: I4d003d9b7f8c22890e7b40121a73081524e71f42
Mathieu Chartier [Fri, 2 Oct 2015 22:53:37 +0000 (15:53 -0700)]
Add exclusion between instrumentation and GC
Instrumentation calls VisitClasses while exclusive holding the
mutator lock. This can cause deadlocks since VisitClasses needs to
decode JNI weak globals. If the system weak slow path flag is set,
then we wait holding locks while exclusive holding the mutator lock.
This causes a deadlock since the GC cannot acquire the mutator lock
to sweep system weaks.
This fixes a deadlock seen in one of the tracing tests.
Change-Id: I580152118e068a70f309dcc19df4144afec835dd
Andreas Gampe [Mon, 5 Oct 2015 18:34:19 +0000 (18:34 +0000)]
am
002117f9: Merge "MIPS64: Code cleanup."
* commit '
002117f95896ffa5db74bee808ae61e876b6e8b0':
MIPS64: Code cleanup.
Andreas Gampe [Mon, 5 Oct 2015 18:30:05 +0000 (18:30 +0000)]
Merge "MIPS64: Code cleanup."
Hiroshi Yamauchi [Mon, 5 Oct 2015 17:40:59 +0000 (17:40 +0000)]
am
4b6d025b: Merge "Make it possible to change the read barrier type as build config."
* commit '
4b6d025b914e82652ca72e2917b70b2231ead13f':
Make it possible to change the read barrier type as build config.
Hiroshi Yamauchi [Mon, 5 Oct 2015 17:34:29 +0000 (17:34 +0000)]
Merge "Make it possible to change the read barrier type as build config."
Andreas Gampe [Mon, 5 Oct 2015 16:58:14 +0000 (16:58 +0000)]
am
0a051ef5: Merge "ART: Add more deopt tests"
* commit '
0a051ef572327013fa30e68f3c1f9a7591316970':
ART: Add more deopt tests
Andreas Gampe [Mon, 5 Oct 2015 16:51:14 +0000 (16:51 +0000)]
Merge "ART: Add more deopt tests"
Andreas Gampe [Mon, 5 Oct 2015 16:29:34 +0000 (16:29 +0000)]
am
adb6fbac: Merge "ART: Add CheckJNI lock checking"
* commit '
adb6fbac5223873d99bdf19797cc070e3ca43758':
ART: Add CheckJNI lock checking
Andreas Gampe [Mon, 5 Oct 2015 15:59:06 +0000 (15:59 +0000)]
Merge "ART: Add CheckJNI lock checking"
Andreas Gampe [Mon, 28 Sep 2015 20:16:33 +0000 (13:16 -0700)]
ART: Add CheckJNI lock checking
JNI MonitorEnter and MonitorExit have similar rules to structured
locking. Count locks in CheckJNI mode.
Bug:
23502994
Change-Id: Ie3f53d3aa669a6bd0c7153c50c168116b43764d9
Andreas Gampe [Thu, 1 Oct 2015 00:13:59 +0000 (17:13 -0700)]
ART: Add more deopt tests
Extend libarttest with the ability to turn off asserts for method
state. Use this to put asserts into test functions, but turn them
off if the test wouldn't react as we want, e.g., when we're in
interpreter mode.
Extend run-test 449 by adding asserts for the method state for the
expected deopt cases. This tests both standard behavior, as well
as single-frame deoptimization.
Bug:
21611912
Change-Id: I27fa5e3e44d8c5eab57962d144c6aec96587bf45
Nicolas Geoffray [Mon, 5 Oct 2015 12:37:20 +0000 (12:37 +0000)]
am
1aba494d: Merge "Block callee save fp registers in debuggable."
* commit '
1aba494df441c31836e5b7d4d8e408420a93cb8d':
Block callee save fp registers in debuggable.
Nicolas Geoffray [Mon, 5 Oct 2015 12:32:25 +0000 (12:32 +0000)]
Merge "Block callee save fp registers in debuggable."
Nicolas Geoffray [Mon, 5 Oct 2015 10:15:37 +0000 (11:15 +0100)]
Block callee save fp registers in debuggable.
This is a simple but conservative implementation. We could
extend it by using the registers but still saving them before
a call and at method entry.
bug:
21057237
Change-Id: Ia2e9e0e2efae0b01625e0f4165d0535c4bf9ba62
Nicolas Geoffray [Mon, 5 Oct 2015 09:17:01 +0000 (09:17 +0000)]
am
d0f5b02e: Merge "Fix typo from previous commit."
* commit '
d0f5b02e197f6540cd285e505d6cf0e6bef0bb82':
Fix typo from previous commit.
Nicolas Geoffray [Mon, 5 Oct 2015 09:12:14 +0000 (09:12 +0000)]
Merge "Fix typo from previous commit."
Nicolas Geoffray [Mon, 5 Oct 2015 08:51:36 +0000 (09:51 +0100)]
Fix typo from previous commit.
core_dex2oat_dependency has a '|' dependency, so we should do :=
instead of += to force recompilation of the image.
Change-Id: Ic59b86666fa69038a67459e7be11c57c20bf815b
Nicolas Geoffray [Mon, 5 Oct 2015 07:43:39 +0000 (07:43 +0000)]
am
c8fb997c: Merge "Revert "Don\'t use floating point callee saves in debuggable.""
* commit '
c8fb997c694e3587f4b618b2a1727206b8d4a327':
Revert "Don't use floating point callee saves in debuggable."
Nicolas Geoffray [Mon, 5 Oct 2015 07:43:38 +0000 (07:43 +0000)]
am
8a50a4aa: Merge "Change IllegalAccess/IncompatibleClassChange order."
* commit '
8a50a4aa4636bdc3e0443ea94f5042db18c03ed2':
Change IllegalAccess/IncompatibleClassChange order.
Nicolas Geoffray [Mon, 5 Oct 2015 07:41:02 +0000 (07:41 +0000)]
Merge "Revert "Don't use floating point callee saves in debuggable.""
Nicolas Geoffray [Mon, 5 Oct 2015 07:40:35 +0000 (07:40 +0000)]
Revert "Don't use floating point callee saves in debuggable."
bug:
24602865
bug:
24605078
This reverts commit
88a95ba893fcda974d492917dd77a9b11693dbf2.
Change-Id: Iba97eeab5c2ba725f66cc138f740dac337344828
Nicolas Geoffray [Mon, 5 Oct 2015 07:38:17 +0000 (07:38 +0000)]
Merge "Change IllegalAccess/IncompatibleClassChange order."
Calin Juravle [Sat, 3 Oct 2015 02:49:12 +0000 (02:49 +0000)]
am
d4ca43bb: Merge "Add aarch64 and mips64 support for testing 64 bit field set."
* commit '
d4ca43bbdca1632eca6891758ad103305f2e7d32':
Add aarch64 and mips64 support for testing 64 bit field set.
Calin Juravle [Sat, 3 Oct 2015 02:45:06 +0000 (02:45 +0000)]
Merge "Add aarch64 and mips64 support for testing 64 bit field set."
Calin Juravle [Fri, 2 Oct 2015 22:56:06 +0000 (23:56 +0100)]
Add aarch64 and mips64 support for testing 64 bit field set.
Change-Id: Ibc4a9aecca19a7c8bee5404730d64fbeda9bb2e2
Alex Light [Fri, 2 Oct 2015 21:46:12 +0000 (21:46 +0000)]
am
089fabf4: Merge "Move getPublicFieldRecursive to native JNI"
* commit '
089fabf4d39e59016d92b20e930b86398892534b':
Move getPublicFieldRecursive to native JNI
Alex Light [Fri, 2 Oct 2015 21:40:34 +0000 (21:40 +0000)]
Merge "Move getPublicFieldRecursive to native JNI"
Mathieu Chartier [Fri, 2 Oct 2015 21:01:41 +0000 (21:01 +0000)]
am
a3ac4d4c: Merge "Perform write barrier on declaring class when adding instrumentation"
* commit '
a3ac4d4c39ad3b14392d8fc564cef71655250d1e':
Perform write barrier on declaring class when adding instrumentation
Mathieu Chartier [Fri, 2 Oct 2015 20:53:48 +0000 (20:53 +0000)]
Merge "Perform write barrier on declaring class when adding instrumentation"
Mathieu Chartier [Fri, 2 Oct 2015 20:08:39 +0000 (13:08 -0700)]
Perform write barrier on declaring class when adding instrumentation
Since the instrumentation is marked from the declaring class we need
to mark the card so that mod-union tables and card rescanning know
about the update.
This fixes some moving GC crashes on eng builds.
Bug:
24133607
(cherry picked from commit
b5bba5966045258fd8b755fb65e381cd7fb9c311)
Change-Id: Ibe8430e32e161d33ce0a6782e8dc252e5c86c8da
Hiroshi Yamauchi [Fri, 2 Oct 2015 20:41:34 +0000 (13:41 -0700)]
Make it possible to change the read barrier type as build config.
Bug:
12687968
Change-Id: Ib43dab4d4e68a5a962347fcc2163c3100cb5b760
Richard Uhler [Fri, 2 Oct 2015 19:59:36 +0000 (19:59 +0000)]
am
a5b63f2c: Merge "Generate an hprof file to test ahat."
* commit '
a5b63f2c46b1a5bf0452032dd51198adfb3aa309':
Generate an hprof file to test ahat.
Richard Uhler [Fri, 2 Oct 2015 19:52:39 +0000 (19:52 +0000)]
Merge "Generate an hprof file to test ahat."
Mathieu Chartier [Fri, 2 Oct 2015 16:45:51 +0000 (16:45 +0000)]
am
42888b28: Merge "Change DecodeWeakGlobal to DecodeJObject for class unloading"
* commit '
42888b28d2a0f112187c906296d4b28674c8bee2':
Change DecodeWeakGlobal to DecodeJObject for class unloading
Mathieu Chartier [Fri, 2 Oct 2015 16:40:06 +0000 (16:40 +0000)]
Merge "Change DecodeWeakGlobal to DecodeJObject for class unloading"
Nicolas Geoffray [Fri, 2 Oct 2015 16:14:53 +0000 (17:14 +0100)]
Change IllegalAccess/IncompatibleClassChange order.
This is to have the same order as ClassLinker::ResolveMethod. In
a JIT environment, hitting the dex cache would not make it to the
expected IllegalAccessError and we would throw the wrong exception.
Change-Id: Ifc70f1a93260a24e952fa7a659be1be5bdc666de