OSDN Git Service
Neil Fuller [Tue, 19 May 2015 14:30:58 +0000 (15:30 +0100)]
Modification to the way boot classpath resources are loaded
Associated with a libcore change to VMClassLoader.java.
Change-Id: Id11dce94b52104697cb6a83227f3063d211f99fa
Jeff Hao [Fri, 15 May 2015 01:02:56 +0000 (01:02 +0000)]
Merge "In hprof, use an address within string for char array of empty string."
Jeff Hao [Fri, 15 May 2015 00:19:15 +0000 (17:19 -0700)]
In hprof, use an address within string for char array of empty string.
Bug:
21089461
(cherry picked from commit I203345caf74fba2e9bf0549256147d84d1bb829e)
Change-Id: I38d1bc0d303558ab535ec4c3aa17a046fcb055a1
Kenny Root [Fri, 15 May 2015 00:48:10 +0000 (00:48 +0000)]
Merge changes I2ea008b7,Ibd7a643d
* changes:
Add new style String operations during compilation init
Fix non-range String init calls
Kenny Root [Thu, 14 May 2015 22:58:17 +0000 (15:58 -0700)]
Add new style String operations during compilation init
This allows some class initializers that deal with Strings to run during
compilation. This includes the current implementation of
java.security.Security because it reads the "java.security" resource.
(cherry picked from commit
a298e6daf8a11a780f061f2177ac3e75b8dd5e55)
Bug:
21036900
Change-Id: I2ea008b774d4ed359e155318e0d06c1566186c34
Kenny Root [Thu, 14 May 2015 23:48:22 +0000 (16:48 -0700)]
Fix non-range String init calls
When the String constructor was called via invoke-direct, it is changed
to the new StringFactory which is static. That means that the args need
to be shifted by one to deal with the change from non-static to static.
However, the non-range version of the invoke-direct was not shifted
correctly causing unstarted runtime initialization to get the wrong
first_dest_reg argument.
(cherry picked from commit
788a0a157cb138c33882511ff09afacde99443b7)
Bug:
21036900
Change-Id: Ibd7a643d877514ea396d7e4ab0dea327207cb78f
Jeff Hao [Thu, 14 May 2015 23:09:02 +0000 (23:09 +0000)]
Merge "In hprof, set string class instance size to that of an empty string."
Hiroshi Yamauchi [Thu, 14 May 2015 21:55:43 +0000 (21:55 +0000)]
Merge "Remove doublequoted command to adb sh -c."
Jeff Hao [Wed, 13 May 2015 01:58:32 +0000 (18:58 -0700)]
In hprof, set string class instance size to that of an empty string.
Bug:
21066704
(cherry-picked from commit
c99b900283296663a37bffe06ae5ca6453748e16)
Change-Id: I91fc397f8ea6bdec654eae51b82528ba5843532c
Hiroshi Yamauchi [Thu, 14 May 2015 20:42:06 +0000 (13:42 -0700)]
Remove doublequoted command to adb sh -c.
Change-Id: I0e0fceedf927df25b8d6b0cf235f43f928cb3534
Hiroshi Yamauchi [Thu, 14 May 2015 18:54:48 +0000 (18:54 +0000)]
Merge "Print field info on mark sweep invalid ref crash."
Vladimir Marko [Thu, 14 May 2015 18:48:24 +0000 (18:48 +0000)]
Merge "Quick: Fix marking high words in DCE."
Hiroshi Yamauchi [Thu, 14 May 2015 04:14:22 +0000 (21:14 -0700)]
Print field info on mark sweep invalid ref crash.
Bug:
20557050
Change-Id: I3abb7a44e3b7ed3256653824fd1705aac5f7d72c
Vladimir Marko [Thu, 14 May 2015 10:47:39 +0000 (11:47 +0100)]
Quick: Fix marking high words in DCE.
This CL properly fixes the high word marking and reverts
https://android-review.googlesource.com/150352
which was just covering up the underlying issue. A unit test
for the encountered issue is provided, though it does not
expose the deficiency in the cover-up CL.
Bug:
20640451
Change-Id: Ia19a1134610e271ebbab5679ac0bd0cb0223d462
Nicolas Geoffray [Thu, 14 May 2015 14:06:15 +0000 (14:06 +0000)]
Merge "Revert "Revert "Remove junit from our core image."""
Nicolas Geoffray [Thu, 14 May 2015 14:05:34 +0000 (14:05 +0000)]
Revert "Revert "Remove junit from our core image.""
This reverts commit
7028d59fa70c7c8482975c4f9b42308c6959483b.
Change-Id: Ia005921af58595999b5b76001fbd16dfb484ab35
Nicolas Geoffray [Thu, 14 May 2015 14:05:10 +0000 (14:05 +0000)]
Merge "Revert "Revert "Do not pass junit.jar to vogar."""
Nicolas Geoffray [Thu, 14 May 2015 14:03:51 +0000 (14:03 +0000)]
Revert "Revert "Do not pass junit.jar to vogar.""
This reverts commit
5bf24f3d8633efda0b20126be411c2cfa4e75097.
Change-Id: I5512c57e7b725991468e9d08d8110df5809dc854
Vladimir Marko [Thu, 14 May 2015 13:31:52 +0000 (13:31 +0000)]
Merge "ART: Do not relocate app program headers in patchoat."
Roland Levillain [Thu, 14 May 2015 12:42:43 +0000 (12:42 +0000)]
Merge "[optimizing] Fold HTypeConversion of constants"
Vladimir Marko [Wed, 13 May 2015 18:06:30 +0000 (19:06 +0100)]
ART: Do not relocate app program headers in patchoat.
Change the check whether to relocate program headers in
patchoat to simply look whether there is a PT_LOAD section
with p_vaddr == 0. If there is, don't relocate the headers,
it should be an app. Otherwise, it's a boot image and needs
to be relocated.
Add overflow checking to ElfFileImpl<>::GetLoadedSize().
Bug:
21047854
Change-Id: Ie6737f338687296b6dbf4bb3b36358501dfb1587
Nicolas Geoffray [Thu, 14 May 2015 06:18:39 +0000 (06:18 +0000)]
Merge "Revert "Do not pass junit.jar to vogar.""
Nicolas Geoffray [Thu, 14 May 2015 06:18:25 +0000 (06:18 +0000)]
Revert "Do not pass junit.jar to vogar."
Will re-land after fiing vogar.
This reverts commit
3185c8da1dc2c2497168817c083b3c9587ba0883.
Change-Id: I6f5ed14aa3f7deb768195c0797125a34c6255d85
Andreas Gampe [Thu, 14 May 2015 01:10:32 +0000 (01:10 +0000)]
Merge "ART: Fix unused return-value in test"
Andreas Gampe [Thu, 14 May 2015 00:00:41 +0000 (17:00 -0700)]
ART: Fix unused return-value in test
Check the return value of system() call.
Change-Id: I1f5f9621f6a39029b9df5b0d4ab0e230ba6c79a3
Chih-Hung Hsieh [Thu, 14 May 2015 00:22:02 +0000 (00:22 +0000)]
Merge "Undo arm64 workaround."
Nicolas Geoffray [Wed, 13 May 2015 22:05:52 +0000 (22:05 +0000)]
Merge "Revert "Remove junit from our core image.""
Nicolas Geoffray [Wed, 13 May 2015 22:05:40 +0000 (22:05 +0000)]
Revert "Remove junit from our core image."
To put us back green. Will re-land when vogar is cleaned up.
This reverts commit
0ad65a3c794b18101def5096d8ed151382c9d5aa.
Change-Id: I24a58bd87f133132d7774104eb8f77d6bbd6292b
Nicolas Geoffray [Wed, 13 May 2015 21:38:15 +0000 (21:38 +0000)]
Merge "Revert "New failure due to a junit/vogar difference.""
Nicolas Geoffray [Wed, 13 May 2015 21:37:44 +0000 (21:37 +0000)]
Revert "New failure due to a junit/vogar difference."
This reverts commit
203a5555957f4c56c4a5cc7ffcb99600c8ab557e.
Change-Id: I51c3aa7275ab43b4adaf8728245612b8416c8284
Mathieu Chartier [Wed, 13 May 2015 21:27:01 +0000 (21:27 +0000)]
Merge "Also print class for NoSuchFieldException"
Nicolas Geoffray [Wed, 13 May 2015 21:20:03 +0000 (21:20 +0000)]
Merge "New failure due to a junit/vogar difference."
Nicolas Geoffray [Wed, 13 May 2015 21:18:12 +0000 (22:18 +0100)]
New failure due to a junit/vogar difference.
Change-Id: I2148c56dd67406d719778ac41b6691fbad2614d3
Mathieu Chartier [Wed, 13 May 2015 20:13:24 +0000 (13:13 -0700)]
Also print class for NoSuchFieldException
Example message:
Caused by: java.lang.NoSuchFieldException: No field value in class Ljava/lang/String;
Added test.
(cherry picked from commit
3beb245da9392818e3154d47593f82cf0ef69aac)
Bug:
20881251
Bug:
21027454
Change-Id: I4043cbf26c3077952b6c151da0d0edd980da26b1
Mark Mendell [Wed, 6 May 2015 14:55:34 +0000 (10:55 -0400)]
[optimizing] Fold HTypeConversion of constants
While looking into optimizing long shifts on x86, I found that the
compiler wasn't folding HTypeConversion of constants. Add simple
conversions of constants, taking care of float/double values
with NaNs and small/large values, ensuring Java conversion semantics.
Add checker cases to see that constant folding of HTypeConversion is
done.
Ensure 422-type-conversion type conversion routiness don't get
inlined to avoid compile time folding.
Change-Id: I5a4eb376b64bc4e41bf908af5875bed312efb228
Signed-off-by: Mark Mendell <mark.p.mendell@intel.com>
Nicolas Geoffray [Wed, 13 May 2015 16:49:46 +0000 (16:49 +0000)]
Merge "Remove junit from our core image."
Elliott Hughes [Wed, 13 May 2015 16:27:07 +0000 (16:27 +0000)]
Merge "Silence unused result warnings in art."
Nicolas Geoffray [Wed, 13 May 2015 14:02:55 +0000 (15:02 +0100)]
Remove junit from our core image.
It's not used, and when we run art with vogar, we get
incompatibilities. For example vogar's TestSuite class
is very different than junit's TestSuite.
Change-Id: I45c78d86c09c28b6136a6e50f6a08a746103794a
Nicolas Geoffray [Wed, 13 May 2015 10:16:44 +0000 (10:16 +0000)]
Merge "Do not pass junit.jar to vogar."
Nicolas Geoffray [Wed, 13 May 2015 10:03:19 +0000 (11:03 +0100)]
Do not pass junit.jar to vogar.
Not needed after https://android-review.googlesource.com/#/c/150563.
Also dex2oat now complains about duplicated classes, and fallbacks
to the interpreter if it sees any. Since vogar has its own junit,
dex2oat was complaining.
Change-Id: I579feb0b1a049af3fba664fd2d86c67c66c8eae1
Elliott Hughes [Wed, 13 May 2015 04:25:36 +0000 (21:25 -0700)]
Silence unused result warnings in art.
This lets us turn on _FORTIFY_SOURCE=2 for the host.
The logging change is basically a trick (since we're still ignoring the
result unless it's an EINTR failure).
The profiler change is in a function whose error checking is a mess; the
fd is leaked, and it's not clear what's supposed to happen about the flock
on failure. I didn't exit if the ftruncate fails because the rest of the
function just blunders on, and error handling here needs a deeper rethink.
Bug: http://b/
20558757
Change-Id: I7a2873fce08e37f4af826a04b4701d7ac6a8e3fa
Chih-Hung Hsieh [Tue, 12 May 2015 19:06:57 +0000 (12:06 -0700)]
Undo arm64 workaround.
Now we have new llvm to compile art for arm64 without -fno-vectorize.
BUG:
21080674
Change-Id: Id1b3a88ab9d4cf78b7f0dfd8cb435ed6e7ab7cb2
Mathieu Chartier [Tue, 12 May 2015 22:17:47 +0000 (22:17 +0000)]
Merge "Hold heap bitmap lock in Heap::GetObjectsAllocated"
Mathieu Chartier [Tue, 12 May 2015 17:47:11 +0000 (10:47 -0700)]
Hold heap bitmap lock in Heap::GetObjectsAllocated
Fixes a race condition where add and remove space could cause a crash
when we iterated over the spaces.
TODO: Add a spaces lock or something to guard against this.
(cherry picked from commit
a395c0a492079d86b312c9edc796d63001576954)
Bug:
21031927
Change-Id: I7f0d558316f8e9d9f22ffd182e8666355bf50d47
Jeff Hao [Tue, 12 May 2015 21:46:16 +0000 (21:46 +0000)]
Merge "Add test for String init called from unresolvable class."
Vladimir Marko [Tue, 12 May 2015 21:37:35 +0000 (21:37 +0000)]
Merge "Quick: Fix DCE, clear high word flag in RemoveChange()."
Vladimir Marko [Tue, 12 May 2015 21:27:21 +0000 (22:27 +0100)]
Quick: Fix DCE, clear high word flag in RemoveChange().
Bug:
20640451
Change-Id: Ibab707ff8e60816b9871c3f4096c0bbbf535cbe8
Jeff Hao [Tue, 12 May 2015 01:39:28 +0000 (18:39 -0700)]
Add test for String init called from unresolvable class.
Bug:
20971268
(cherry-picked from
f450cf6b06255ead0a43a9e94dc2f2175e6f9849)
Change-Id: I810f599b38a46e738bcacb15ca3c4537e1fb7b77
Hiroshi Yamauchi [Tue, 12 May 2015 21:11:53 +0000 (21:11 +0000)]
Merge "Add notes about fast JNI calls."
Hiroshi Yamauchi [Tue, 12 May 2015 19:16:10 +0000 (12:16 -0700)]
Add notes about fast JNI calls.
Bug:
19665903
Change-Id: Ie0610aa17ab1365c08cb0b5b0931a8cefb65f252
Richard Uhler [Tue, 12 May 2015 19:36:48 +0000 (19:36 +0000)]
Merge "Fix bug in removal of *.flock files."
Andreas Gampe [Tue, 12 May 2015 18:26:24 +0000 (18:26 +0000)]
Merge "ART: arm indexOf intrinsics for the optimizing compiler"
Richard Uhler [Thu, 7 May 2015 17:19:35 +0000 (10:19 -0700)]
Fix bug in removal of *.flock files.
Bug:
20816098
Change-Id: I72ee32884f32af43a54518c9b9772f63957ab5de
Vladimir Marko [Tue, 12 May 2015 18:16:58 +0000 (18:16 +0000)]
Merge "Quick: Fix DCE to mark wide register overlaps correctly."
Hiroshi Yamauchi [Tue, 12 May 2015 17:48:26 +0000 (17:48 +0000)]
Merge "Re-enable 098-ddmc for the read barrier config."
Vladimir Marko [Tue, 12 May 2015 17:27:20 +0000 (18:27 +0100)]
Quick: Fix DCE to mark wide register overlaps correctly.
Previously we missed some cases of overlap with registers
coming from previous blocks.
Bug:
20640451
Change-Id: I4b32a7aaea2dea1b0b9560ae3459a4d903683f20
David Brazdil [Tue, 12 May 2015 17:14:21 +0000 (17:14 +0000)]
Merge "ART: Rediscover loops after deleting blocks in DCE"
David Brazdil [Tue, 12 May 2015 17:12:57 +0000 (17:12 +0000)]
Merge "ART: Split Checker into smaller files"
David Brazdil [Tue, 12 May 2015 17:06:38 +0000 (18:06 +0100)]
ART: Split Checker into smaller files
Checker code has become too messy and incomprehensible. This patch
splits it into more manageable and better structured units.
Functionality remains unchanged.
Resubmission of change I870c69827d2be2d09196a51382a3f47f31cd2ba3 due
to omission of file 'tools/checker/file_format/common.py'.
Change-Id: I277a4aa65a2e3b54f0e89901fdb9f289f55a325f
David Brazdil [Tue, 12 May 2015 16:56:00 +0000 (16:56 +0000)]
Merge "Revert "ART: Split Checker into smaller files""
David Brazdil [Tue, 12 May 2015 16:55:01 +0000 (16:55 +0000)]
Revert "ART: Split Checker into smaller files"
This reverts commit
a490be5dd95982f77ff1447bea9ee06604038a96.
Change-Id: Ic3b7cf172200caced9ae2f10d2f200447e6801ee
David Brazdil [Tue, 12 May 2015 16:11:55 +0000 (16:11 +0000)]
Merge "ART: Split Checker into smaller files"
David Brazdil [Tue, 28 Apr 2015 12:53:59 +0000 (13:53 +0100)]
ART: Split Checker into smaller files
Checker code has become too messy and incomprehensible. This patch
splits it into more manageable and better structured units.
Functionality remains unchanged.
Change-Id: I870c69827d2be2d09196a51382a3f47f31cd2ba3
Andreas Gampe [Fri, 8 May 2015 05:31:55 +0000 (22:31 -0700)]
ART: arm indexOf intrinsics for the optimizing compiler
Add intrinsics implementations for indexOf in the optimizing
compiler. These are mostly ported from Quick.
Bug:
20889065
Change-Id: I18ee849d41187a381f99529669e6f97040aaacf6
Roland Levillain [Tue, 12 May 2015 14:01:03 +0000 (14:01 +0000)]
Merge "Small correction in Optimizing's ARM64 code generator."
Calin Juravle [Tue, 12 May 2015 12:41:16 +0000 (12:41 +0000)]
Merge "Revert "Add new rule to the graph checker.""
Calin Juravle [Tue, 12 May 2015 12:40:07 +0000 (12:40 +0000)]
Revert "Add new rule to the graph checker."
This reverts commit
9d50775046a51941f86cced03593c61c89ae615e.
Change-Id: I9533116bbaef5fd5d2944c4ebebd2f01b0047e34
Calin Juravle [Tue, 12 May 2015 11:53:49 +0000 (11:53 +0000)]
Merge "Add new rule to the graph checker."
David Brazdil [Thu, 7 May 2015 08:59:30 +0000 (09:59 +0100)]
ART: Rediscover loops after deleting blocks in DCE
The way DCE currently updates loop information does not cover all
cases. This patch removes the logic, resets loop information of live
blocks to pre-SSA state and reanalyzes the affected loops.
Change-Id: I0b996a70235b95a8db0de9a23a03f71db57a21b8
Roland Levillain [Tue, 12 May 2015 09:47:34 +0000 (09:47 +0000)]
Merge "Simplify floating-point comparisons with NaN in Optimizing."
David Brazdil [Tue, 12 May 2015 09:43:17 +0000 (09:43 +0000)]
Merge "ART: Enable Checker annotations in smali files"
David Brazdil [Tue, 12 May 2015 09:37:59 +0000 (10:37 +0100)]
ART: Enable Checker annotations in smali files
Change-Id: I8eeb76154b5aa5506fc477d38cb56cae168cdc90
Nicolas Geoffray [Tue, 12 May 2015 08:28:33 +0000 (08:28 +0000)]
Merge "Update test expectations."
Nicolas Geoffray [Tue, 12 May 2015 08:27:19 +0000 (09:27 +0100)]
Update test expectations.
Change-Id: Ic0eb5e656fb81e3e8754131296715c75a6faf358
Hiroshi Yamauchi [Tue, 12 May 2015 00:37:19 +0000 (17:37 -0700)]
Re-enable 098-ddmc for the read barrier config.
Bug:
20720510
Bug:
12687968
Change-Id: I6e5c61a88bfce15231c1476bc0edc28ae53d081f
Sebastien Hertz [Mon, 11 May 2015 18:58:31 +0000 (18:58 +0000)]
Merge "Remove unused StackHandleScope"
Hiroshi Yamauchi [Mon, 11 May 2015 18:04:09 +0000 (18:04 +0000)]
Merge "Insert a read barrier in the JNI bridge."
Richard Uhler [Mon, 11 May 2015 17:46:44 +0000 (17:46 +0000)]
Merge "Fix typo in VLOG message."
Richard Uhler [Mon, 11 May 2015 17:46:06 +0000 (17:46 +0000)]
Merge "Add more diagnostics info to flaky oat file assistant test."
Andreas Gampe [Mon, 11 May 2015 17:42:21 +0000 (17:42 +0000)]
Merge "ART: x86 indexOf intrinsics for the optimizing compiler"
Andreas Gampe [Thu, 7 May 2015 21:46:15 +0000 (14:46 -0700)]
ART: x86 indexOf intrinsics for the optimizing compiler
Add intrinsics implementations for indexOf in the optimizing
compiler. These are mostly ported from Quick. Add instruction
support to assemblers where necessary.
Change-Id: Ife90ed0245532a5c436a26fe84715dc357f353c8
Calin Juravle [Mon, 11 May 2015 17:25:51 +0000 (18:25 +0100)]
Add new rule to the graph checker.
Phis typed as `reference` should not have equivalents after building the
SSA.
Change-Id: I9cac189362583ef7c9c7defd3da7338f419f2f94
Sebastien Hertz [Mon, 11 May 2015 15:53:27 +0000 (17:53 +0200)]
Remove unused StackHandleScope
It is causing crashes when there is no current thread (because it has
been detached from the runtime). It happens when we sanity check the
stack during runtime shutdown after stopping method tracing.
Bug:
20993343
Change-Id: I549664932f513a01339e5b1c34b3ddc5744888c3
Richard Uhler [Mon, 11 May 2015 16:36:57 +0000 (09:36 -0700)]
Fix typo in VLOG message.
Change-Id: Iaf4ce1787816afce947c6e963df19d20ef5f5e1b
Richard Uhler [Mon, 11 May 2015 16:32:47 +0000 (09:32 -0700)]
Add more diagnostics info to flaky oat file assistant test.
Change-Id: Ifd0029d389ba7585a819c01fc9cc846681d0a349
Nicolas Geoffray [Mon, 11 May 2015 15:29:41 +0000 (15:29 +0000)]
Merge "Add a flag to StackVisitor for inlining."
Nicolas Geoffray [Wed, 6 May 2015 10:34:34 +0000 (11:34 +0100)]
Add a flag to StackVisitor for inlining.
The flag tells whether the stack walk needs to include inlined
Java frames.
This does not do anything just yet, as we're not inlining anyways.
Change-Id: I716e25094fe56fa335ca1f9a398c1bcdba478e73
Roland Levillain [Mon, 11 May 2015 13:37:09 +0000 (13:37 +0000)]
Merge "[optimizing] Improve 32 bit long shift by 1."
Nicolas Geoffray [Mon, 11 May 2015 13:18:05 +0000 (13:18 +0000)]
Merge "Add a parent environment to HEnvironment."
Nicolas Geoffray [Thu, 7 May 2015 10:57:35 +0000 (11:57 +0100)]
Add a parent environment to HEnvironment.
This code has no functionality change. It adds a placeholder
for chaining inlined frames.
Change-Id: I5ec57335af76ee406052345b947aad98a6a4423a
Mark Mendell [Wed, 6 May 2015 01:34:03 +0000 (21:34 -0400)]
[optimizing] Improve 32 bit long shift by 1.
Also change FOO << 1 to FOO+FOO in the instruction simplifier. This is
an architecture independent simplification, which helps 'long << 1' for
32 bit architectures.
Generate an add/adc for long << 1 in x86, in case something is generated
after the simplifier.
Add test cases for the simplification.
Change-Id: I0d512331ef13cc4ccf10c80f11c370a10ed02294
Signed-off-by: Mark Mendell <mark.p.mendell@intel.com>
Nicolas Geoffray [Sat, 9 May 2015 14:17:51 +0000 (14:17 +0000)]
Merge "[optimizing] Tune some x86_64 moves"
Mathieu Chartier [Sat, 9 May 2015 00:07:34 +0000 (00:07 +0000)]
Merge "Don't allow JIT to compile native methods"
Mathieu Chartier [Sat, 9 May 2015 00:05:01 +0000 (17:05 -0700)]
Don't allow JIT to compile native methods
Change-Id: I12722309ba52c430e23ab862b29f7a48383f00d2
Andreas Gampe [Fri, 8 May 2015 23:22:24 +0000 (23:22 +0000)]
Merge "Add stub_test implementation for mips & mips64"
Andreas Gampe [Fri, 8 May 2015 23:21:03 +0000 (23:21 +0000)]
Merge "Fix stub_test for Mips64"
Goran Jakovljevic [Thu, 23 Apr 2015 13:27:23 +0000 (15:27 +0200)]
Fix stub_test for Mips64
Force ENTRY macro to load GP. Instead .cpload (used for o32 abi,
not working for n64) use .cpsetup to set up GP and save previous
GP value.
Fix expectations in GetSet32Static.
Change-Id: Ie97e32fa2fee7a6e8bae6bc36e78976b8be62b79
Mathieu Chartier [Fri, 8 May 2015 23:19:41 +0000 (23:19 +0000)]
Merge "Check IsReferenceVReg during deopt"
Mathieu Chartier [Fri, 8 May 2015 21:19:26 +0000 (14:19 -0700)]
Check IsReferenceVReg during deopt
Required since the quick GC maps may not agree with the verifier
ones. Without this check we may copy stale object references into
the shadow frame.
(cherry picked from commit
f00baf56ef647684888a407dbb6adadd704a2039)
Bug:
20736048
Change-Id: I7783c8a8ee45cf601b08b4c38f1dec7f7d11380c
Vladimir Marko [Fri, 8 May 2015 21:26:37 +0000 (21:26 +0000)]
Merge "ART: Merge entries with same name and protect in MemMap dump."