OSDN Git Service
Brian Carlstrom [Wed, 27 Aug 2014 19:25:08 +0000 (19:25 +0000)]
am
a0a0da29: Merge "Really fix tests."
* commit '
a0a0da29e7d4d5c1bd471c49f1a4b6ec98fb767a':
Really fix tests.
Brian Carlstrom [Wed, 27 Aug 2014 19:01:17 +0000 (19:01 +0000)]
Merge "Really fix tests."
Alex Light [Wed, 27 Aug 2014 18:13:47 +0000 (11:13 -0700)]
Really fix tests.
Remove extra line in Android.run-test.mk.
Update junit code in 082 and 021.
Set correct bootclasspath for --no-image.
Make host core.art depend on dex files being installed.
Make 118 pass in the correct bootclasspath.
Bug:
17290452
Change-Id: I415eddfa3632ec7eda927abe95925202de193749
Ian Rogers [Wed, 27 Aug 2014 18:29:39 +0000 (18:29 +0000)]
am
469f2ee9: Merge "Various run-test makefile fixes."
* commit '
469f2ee9a3c3d77f0352faed19d8c83c7397a638':
Various run-test makefile fixes.
Ian Rogers [Wed, 27 Aug 2014 18:11:01 +0000 (18:11 +0000)]
Merge "Various run-test makefile fixes."
Ian Rogers [Wed, 27 Aug 2014 17:54:11 +0000 (10:54 -0700)]
Various run-test makefile fixes.
Reduce number of test combinations based on global flags, rather than just
specific tests, to keep known broken list as small as possible.
Fix dist goal known broken definition.
Fix naming of rules in define-test-art-run-test to match the make target.
Undefine more variables after use.
Change-Id: I4b4eadd37fc1f816bc61d78c5866bfcee7b60244
Ian Rogers [Wed, 27 Aug 2014 04:03:23 +0000 (04:03 +0000)]
am
270c3e6f: Merge "Fix builds where dist_goal is defined."
* commit '
270c3e6f95f047595a37ac15eb0734573377347d':
Fix builds where dist_goal is defined.
Ian Rogers [Wed, 27 Aug 2014 03:40:19 +0000 (03:40 +0000)]
Merge "Fix builds where dist_goal is defined."
Ian Rogers [Wed, 27 Aug 2014 03:39:04 +0000 (20:39 -0700)]
Fix builds where dist_goal is defined.
Change-Id: I93b3fb468cf760aa84d792b2651cdde366fc6033
Ian Rogers [Wed, 27 Aug 2014 03:25:09 +0000 (03:25 +0000)]
am
3d159704: Merge "Fix test build targets."
* commit '
3d159704d1f03d120cef8ad67a7a65f436fe8d00':
Fix test build targets.
Ian Rogers [Wed, 27 Aug 2014 03:01:34 +0000 (03:01 +0000)]
Merge "Fix test build targets."
Ian Rogers [Wed, 27 Aug 2014 02:59:52 +0000 (19:59 -0700)]
Fix test build targets.
Missing includes for libarttest.
Missed merge for adding IMAGE_TYPES to known broken tests.
Change-Id: I64227b3410bac9a1de8e0efd3b89eab78cd3cf5b
Ian Rogers [Wed, 27 Aug 2014 02:41:22 +0000 (02:41 +0000)]
am
ff092c2d: Merge changes Id3113019,I89c26a90
* commit '
ff092c2d5f672979c97f4c3b9d165e609ccf7ce0':
Add run-test support for running without a working patchoat/dex2oat
Support booting without functioning boot.oat/art patchoat.
Mathieu Chartier [Wed, 27 Aug 2014 02:41:15 +0000 (02:41 +0000)]
am
709368e6: Merge "Reduce interpret-only compile time."
* commit '
709368e616791209b02d39adb6da5e55782cb45f':
Reduce interpret-only compile time.
Ian Rogers [Wed, 27 Aug 2014 02:41:13 +0000 (02:41 +0000)]
am
2cdd2f2f: Merge "ART: Added dirty flag to optimizations"
* commit '
2cdd2f2f4c18de88c0daeddec362c0471d823b0b':
ART: Added dirty flag to optimizations
Ian Rogers [Wed, 27 Aug 2014 02:41:11 +0000 (02:41 +0000)]
am
ab66df8b: Merge "ART: Add capability for a pass to have options"
* commit '
ab66df8bc9e32133cec45c56f2c17d6d705bfb21':
ART: Add capability for a pass to have options
Ian Rogers [Wed, 27 Aug 2014 01:05:55 +0000 (01:05 +0000)]
Merge changes Id3113019,I89c26a90
* changes:
Add run-test support for running without a working patchoat/dex2oat
Support booting without functioning boot.oat/art patchoat.
Mathieu Chartier [Wed, 27 Aug 2014 00:37:27 +0000 (00:37 +0000)]
Merge "Reduce interpret-only compile time."
Ian Rogers [Wed, 27 Aug 2014 00:36:31 +0000 (00:36 +0000)]
Merge "ART: Added dirty flag to optimizations"
Alex Light [Mon, 25 Aug 2014 20:25:56 +0000 (13:25 -0700)]
Add run-test support for running without a working patchoat/dex2oat
Also add it to the test-art target.
Bug:
17262039
Change-Id: Id31130194c46df66fc48852d6f8884f14cb08db4
Ian Rogers [Wed, 27 Aug 2014 00:26:00 +0000 (00:26 +0000)]
Merge "ART: Add capability for a pass to have options"
Razvan A Lupusoru [Thu, 3 Jul 2014 01:16:51 +0000 (18:16 -0700)]
ART: Add capability for a pass to have options
This patch adds capability to have pass options. These are needed when a pass
has multiple flags that can be tweaked. The user is now allowed to pass those
options via command line.
Since passes are treated as singletons and they are immutable, the overridden
options provided by user are set on the compilation unit. Doing this way also
allows a selectivity system to tweak the option per compilation instead of
doing it globally (due to the single pass existing).
The following command line flags have been added:
--print-pass-options - This prints all passes that have options along with
their defaults.
--pass-options= - This is used to pass the overridden options in format of
PassName:PassOption:PassOptionSetting
Change-Id: Ib5156f5d2ff51a0c64c4ea0fa050bd2170663417
Signed-off-by: Razvan A Lupusoru <razvan.a.lupusoru@intel.com>
Signed-off-by: Jean Christophe Beyler <jean.christophe.beyler@intel.com>
Ian Rogers [Wed, 27 Aug 2014 00:12:08 +0000 (00:12 +0000)]
am
a9ffc181: Merge "Use loops to build combinations of run-tests."
* commit '
a9ffc181c61f5634753bf1039ed50bf22c800fde':
Use loops to build combinations of run-tests.
Jean Christophe Beyler [Fri, 18 Jul 2014 22:33:57 +0000 (15:33 -0700)]
ART: Added dirty flag to optimizations
- Added a dirty flag to the PassMEDataHolder and use it to determine
if we want to perform the post-optimization passes or not.
Change-Id: I59a85f5198f9224d5fe8893397bfaf68a978d8f1
Signed-off-by: Jean Christophe Beyler <jean.christophe.beyler@intel.com>
Alex Light [Sat, 23 Aug 2014 00:49:35 +0000 (17:49 -0700)]
Support booting without functioning boot.oat/art patchoat.
Bug:
17000769
Change-Id: I89c26a905af12ea288742368c2c038afd57a879a
Ian Rogers [Tue, 26 Aug 2014 23:37:01 +0000 (23:37 +0000)]
Merge "Use loops to build combinations of run-tests."
Ian Rogers [Tue, 26 Aug 2014 23:36:08 +0000 (23:36 +0000)]
am
061d3103: Merge "ART: Add non-temporal store support"
* commit '
061d3103991ab4c9a98a14228cbd4c8654da1ac8':
ART: Add non-temporal store support
Ian Rogers [Tue, 19 Aug 2014 23:52:36 +0000 (16:52 -0700)]
Use loops to build combinations of run-tests.
Add a JNI force copy test.
Split tracing from GC, relocation from prebuilding.
As the combinations of tests is sufficiently large to cause make serious work,
only build rules for tests that will be executed. Default to small number of
tests rather than full. Use ART_TEST_FULL=true to override.
Change-Id: Ic25431f29071b840d2e2295be6853511c0b52cfa
Ian Rogers [Tue, 26 Aug 2014 22:55:27 +0000 (22:55 +0000)]
Merge "ART: Add non-temporal store support"
Mathieu Chartier [Tue, 19 Aug 2014 21:29:46 +0000 (14:29 -0700)]
Reduce interpret-only compile time.
Before:
39.04user 5.18system 0:29.24elapsed 151%CPU (0avgtext+0avgdata 164176maxresident)k
38.87user 5.16system 0:29.14elapsed 151%CPU (0avgtext+0avgdata 164144maxresident)k
After:
36.26user 3.25system 0:27.00elapsed 146%CPU (0avgtext+0avgdata 162592maxresident)k
36.25user 3.28system 0:26.28elapsed 150%CPU (0avgtext+0avgdata 162688maxresident)k
Disabled implicit stack protection for the compiler, this reduces page faults.
Added support for not timing every method compilation and verification. NanoTime is
slow and adds ~2 seconds of real time. This is currently enabled since people want
to know which methods are slow to compile.
Bug:
16853450
Change-Id: I349ffb3f36db8c437137387aa6914dc17d743f09
Jean Christophe Beyler [Fri, 25 Jul 2014 19:32:18 +0000 (12:32 -0700)]
ART: Add non-temporal store support
Added non-temporal store support as a hint from the ME.
Added the implementation of the memory barrier
extended instruction that supports non-temporal stores
by explicitly serializing all previous store-to-memory instructions.
Change-Id: I8205a92083f9725253d8ce893671a133a0b6849d
Signed-off-by: Jean Christophe Beyler <jean.christophe.beyler@intel.com>
Signed-off-by: Chao-ying Fu <chao-ying.fu@intel.com>
Mathieu Chartier [Tue, 26 Aug 2014 18:24:56 +0000 (18:24 +0000)]
am
0038fcaa: Merge "Fix race condition in TransitionCollector."
* commit '
0038fcaa6f2457f5de5544fc93cd57a305e466de':
Fix race condition in TransitionCollector.
Mathieu Chartier [Tue, 26 Aug 2014 18:24:00 +0000 (18:24 +0000)]
am
652e3a16: am
f59b605f: Merge "Fix race condition in TransitionCollector." into lmp-dev
* commit '
652e3a164fe1348de573dcdb4d79926592117bcd':
Fix race condition in TransitionCollector.
Stephen Kyle [Tue, 26 Aug 2014 18:23:59 +0000 (18:23 +0000)]
am
d6a4d7d8: am
ccb1a5d4: ART: Reject field accesses to non-reference vregs.
* commit '
d6a4d7d8856785c79ba24426abcc0c684dc901f1':
ART: Reject field accesses to non-reference vregs.
Andreas Gampe [Tue, 26 Aug 2014 18:14:02 +0000 (18:14 +0000)]
am
0b05ec67: Merge "ART: Improve error message on oat writer failure"
* commit '
0b05ec674139c2b2e0914b0bb0e1898f93a9c852':
ART: Improve error message on oat writer failure
Mathieu Chartier [Tue, 26 Aug 2014 18:12:29 +0000 (18:12 +0000)]
am
f59b605f: Merge "Fix race condition in TransitionCollector." into lmp-dev
* commit '
f59b605f82c0e2b7bfc6019ee7bd650628f50d3a':
Fix race condition in TransitionCollector.
Stephen Kyle [Tue, 26 Aug 2014 18:12:28 +0000 (18:12 +0000)]
am
ccb1a5d4: ART: Reject field accesses to non-reference vregs.
* commit '
ccb1a5d46bc1b4ee888e74775f5c1291d600ff54':
ART: Reject field accesses to non-reference vregs.
Mathieu Chartier [Tue, 26 Aug 2014 18:03:03 +0000 (18:03 +0000)]
Merge "Fix race condition in TransitionCollector."
Mathieu Chartier [Sat, 23 Aug 2014 20:56:03 +0000 (13:56 -0700)]
Fix race condition in TransitionCollector.
There was a minor race condition that could happen if multiple
threads called TransitionCollector at the same time. Starting out
in CMS:
Thread 1: TransitionCollector(SS).
Thread 2: TransitionCollector(CMS) sees that it is already CMS so
has copying_transition == false. But then thread 2 changes to SS.
Thread 1 resumes but incorrectly doesn't check the
disable_moving_gc_count_ possibly resulting in errors if
disable_moving_gc_count_ != 0 due to JNI since we are going from
SS -> CMS and are goign to move objects.
(cherry picked from commit
de2233bbf64c7dde96513a729f6a97aebc2f0424)
Change-Id: I2fdda85f7cb7cbb0df3d1466a3c74853c5304c1b
Mathieu Chartier [Tue, 26 Aug 2014 18:01:37 +0000 (18:01 +0000)]
Merge "Fix race condition in TransitionCollector." into lmp-dev
Andreas Gampe [Tue, 26 Aug 2014 17:55:56 +0000 (17:55 +0000)]
Merge "ART: Improve error message on oat writer failure"
Andreas Gampe [Tue, 22 Jul 2014 05:56:08 +0000 (22:56 -0700)]
ART: Improve error message on oat writer failure
Try to log the pending exception to help resolve issues.
Bug:
16406811
Change-Id: I035ae9e59a5ee02b9e90c35c0644ec088d3c7d12
Ian Rogers [Tue, 26 Aug 2014 17:49:14 +0000 (17:49 +0000)]
am
3b6711fa: Merge "Fix usage of literals within a macro."
* commit '
3b6711faf7b0b10eaa6c48ba854160bcecd00166':
Fix usage of literals within a macro.
Ian Rogers [Tue, 26 Aug 2014 17:36:09 +0000 (17:36 +0000)]
Merge "Fix usage of literals within a macro."
Mathieu Chartier [Sat, 23 Aug 2014 20:56:03 +0000 (13:56 -0700)]
Fix race condition in TransitionCollector.
There was a minor race condition that could happen if multiple
threads called TransitionCollector at the same time. Starting out
in CMS:
Thread 1: TransitionCollector(SS).
Thread 2: TransitionCollector(CMS) sees that it is already CMS so
has copying_transition == false. But then thread 2 changes to SS.
Thread 1 resumes but incorrectly doesn't check the
disable_moving_gc_count_ possibly resulting in errors if
disable_moving_gc_count_ != 0 due to JNI since we are going from
SS -> CMS and are goign to move objects.
Bug:
17189964
Change-Id: I4f0d002717516b81355d66f26e0e8ebe3958348d
Stephen Kyle [Fri, 22 Aug 2014 14:03:07 +0000 (15:03 +0100)]
ART: Reject field accesses to non-reference vregs.
The verifier will now reject any iget/iput insts
that do not have a reference object in vB.
Bug:
17207857
Signed-off-by: Stuart Monteith <stuart.monteith@arm.com>
(cherry picked from commit
695c5982eeddee18c643cc2f94c9d78fa75599ab)
Change-Id: I3790b8687673643bb142549d74f36a3e2978bf13
Ian Rogers [Tue, 26 Aug 2014 17:34:09 +0000 (10:34 -0700)]
Fix usage of literals within a macro.
Macs handle arguments in macros as $num meaning literals must be $$num.
Change-Id: Ia30c7ef4e089561e9f23f353d7080e800b117d70
Mathieu Chartier [Tue, 26 Aug 2014 17:29:19 +0000 (17:29 +0000)]
am
2f1f3b26: Merge "Map heap maps at a lower address."
* commit '
2f1f3b26e360ed5362a3e6655ed0acdccea3a6a7':
Map heap maps at a lower address.
Andreas Gampe [Tue, 26 Aug 2014 17:29:18 +0000 (17:29 +0000)]
am
b7fbafda: Merge "ART: kSuper also has IncompatibleClassChangeError"
* commit '
b7fbafdac8cf0ff8f860e6e85646d6c88d3914ed':
ART: kSuper also has IncompatibleClassChangeError
Andreas Gampe [Tue, 26 Aug 2014 17:29:17 +0000 (17:29 +0000)]
am
654881ff: Merge "ART: Fix IncompatibleClassChange check for ArtMethod"
* commit '
654881ffd780066fe1160320059ae629416b4652':
ART: Fix IncompatibleClassChange check for ArtMethod
Mathieu Chartier [Tue, 26 Aug 2014 17:28:59 +0000 (17:28 +0000)]
am
f35ffc5a: am
506bcfc6: Merge "Map heap maps at a lower address." into lmp-dev
* commit '
f35ffc5ab4e7e51878745e6fa1ce03feb5fd188f':
Map heap maps at a lower address.
Andreas Gampe [Tue, 26 Aug 2014 17:23:30 +0000 (17:23 +0000)]
am
847adc4f: am
b2634e97: Merge "ART: kSuper also has IncompatibleClassChangeError" into lmp-dev
* commit '
847adc4f5eeef1b64569905ad7f1c65505fd3bc1':
ART: kSuper also has IncompatibleClassChangeError
Andreas Gampe [Tue, 26 Aug 2014 17:23:29 +0000 (17:23 +0000)]
am
4110847a: am
7f28597b: Merge "ART: Fix IncompatibleClassChange check for ArtMethod" into lmp-dev
* commit '
4110847a3074d38fe206f071fcf5b856008ccbbd':
ART: Fix IncompatibleClassChange check for ArtMethod
Mathieu Chartier [Tue, 26 Aug 2014 17:23:17 +0000 (17:23 +0000)]
am
506bcfc6: Merge "Map heap maps at a lower address." into lmp-dev
* commit '
506bcfc66454555f792fbc7893ff3b2877c9b288':
Map heap maps at a lower address.
Mathieu Chartier [Tue, 26 Aug 2014 17:17:09 +0000 (17:17 +0000)]
Merge "Map heap maps at a lower address."
Mathieu Chartier [Mon, 25 Aug 2014 23:32:41 +0000 (16:32 -0700)]
Map heap maps at a lower address.
We now map the heap mmaps at a lower address in case the app needs
larger continuous address space.
Bug:
16502380
(cherry picked from commit
18bacb60e09fa8aa20ae0a1d7a4a8968d4913fb0)
Change-Id: I66447f853e439448c72923e2d1c657c94c5f1543
Mathieu Chartier [Tue, 26 Aug 2014 17:15:20 +0000 (17:15 +0000)]
Merge "Map heap maps at a lower address." into lmp-dev
Andreas Gampe [Tue, 26 Aug 2014 17:14:50 +0000 (17:14 +0000)]
am
b2634e97: Merge "ART: kSuper also has IncompatibleClassChangeError" into lmp-dev
* commit '
b2634e9790a7099cf84d3509afe7af18f4349f11':
ART: kSuper also has IncompatibleClassChangeError
Andreas Gampe [Tue, 26 Aug 2014 17:14:49 +0000 (17:14 +0000)]
am
7f28597b: Merge "ART: Fix IncompatibleClassChange check for ArtMethod" into lmp-dev
* commit '
7f28597bfa4b5e11911e4d4caa13fe2ab234a53e':
ART: Fix IncompatibleClassChange check for ArtMethod
Andreas Gampe [Tue, 26 Aug 2014 17:11:38 +0000 (17:11 +0000)]
Merge "ART: kSuper also has IncompatibleClassChangeError"
Andreas Gampe [Tue, 26 Aug 2014 03:55:01 +0000 (20:55 -0700)]
ART: kSuper also has IncompatibleClassChangeError
When resolving methods, kSuper can also have
IncompatibleClassChangeError.
Bug:
17266767
(cherry picked from commit
9cb8d7a9a5013dd1e6734d9643573a4750d869e2)
Change-Id: I5fafe03ad578f605825a3d0c89f1254a4a385b76
Andreas Gampe [Tue, 26 Aug 2014 17:10:28 +0000 (17:10 +0000)]
Merge "ART: kSuper also has IncompatibleClassChangeError" into lmp-dev
Andreas Gampe [Tue, 26 Aug 2014 17:09:59 +0000 (17:09 +0000)]
Merge "ART: Fix IncompatibleClassChange check for ArtMethod"
Andreas Gampe [Tue, 26 Aug 2014 03:46:31 +0000 (20:46 -0700)]
ART: Fix IncompatibleClassChange check for ArtMethod
In case of kSuper we should complain sometimes.
Bug:
17265201
(cherry picked from commit
249907fe09afd9243c9675a67b157b98378fa3cf)
Change-Id: Ifad903a750495963c7128296713fbd7c4add71cd
Andreas Gampe [Tue, 26 Aug 2014 17:04:14 +0000 (17:04 +0000)]
Merge "ART: Fix IncompatibleClassChange check for ArtMethod" into lmp-dev
buzbee [Tue, 26 Aug 2014 15:01:10 +0000 (15:01 +0000)]
am
3531973c: Merge "Quick compiler: fix DCHECK"
* commit '
3531973c770269d82ea36a65b5738b1587c4d513':
Quick compiler: fix DCHECK
buzbee [Tue, 26 Aug 2014 14:42:32 +0000 (14:42 +0000)]
Merge "Quick compiler: fix DCHECK"
Sebastien Hertz [Tue, 26 Aug 2014 14:42:28 +0000 (16:42 +0200)]
resolved conflicts for merge of
052c87cd to lmp-dev-plus-aosp
Change-Id: I8dcfe972e209996d26f9ac9c2028a0d6146fec1b
buzbee [Mon, 25 Aug 2014 16:34:03 +0000 (09:34 -0700)]
Quick compiler: fix DCHECK
Cherry-pick from internal 532582
A DCHECK intended to verify the soundness of the mapping between
a wide Dalvik value and a pair of temp registers incorrectly fired
when the temp register pair was associated with a wide temporary
(i.e. - when (SReg() == INVALID_SREG)).
In this particular situation, the wideness flag is meaningful only when
there is an associated valid vreg. Code rearranged to only perform
the DCHECK and reset the partner's wideness bit when we're dealing with
a live wide value.
b/
16484538
Change-Id: I3b8a7bebc5d918c65ea56ae8db0a8a5cd8003386
Sebastien Hertz [Tue, 26 Aug 2014 13:50:57 +0000 (13:50 +0000)]
am
83182ed4: Merge "Reduce lock contention when debugging" into lmp-dev
* commit '
83182ed48c55729cd34780fc598f269cc98af739':
Reduce lock contention when debugging
Sebastien Hertz [Tue, 26 Aug 2014 13:43:17 +0000 (13:43 +0000)]
Merge "Reduce lock contention when debugging" into lmp-dev
buzbee [Tue, 26 Aug 2014 13:15:57 +0000 (13:15 +0000)]
am
5c36e461: am
cb50ed40: Merge "Quick compiler: fix DCHECK" into lmp-dev
* commit '
5c36e4619c88ce059211f69638c4d690905b7995':
Quick compiler: fix DCHECK
buzbee [Tue, 26 Aug 2014 13:09:04 +0000 (13:09 +0000)]
am
cb50ed40: Merge "Quick compiler: fix DCHECK" into lmp-dev
* commit '
cb50ed40fc39a1c1786e57f5c839a3cd230e1744':
Quick compiler: fix DCHECK
buzbee [Tue, 26 Aug 2014 12:58:44 +0000 (12:58 +0000)]
Merge "Quick compiler: fix DCHECK" into lmp-dev
Ang Li [Tue, 26 Aug 2014 11:30:30 +0000 (11:30 +0000)]
Merge branch 'lmp-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/art into lmp-dev-plus-aosp
Brian Carlstrom [Tue, 26 Aug 2014 11:29:42 +0000 (11:29 +0000)]
am
b7326b50: Merge "CheckAndClearResolveException should allow LinkageError"
* commit '
b7326b502dd5afe6d8eae60d5f85bde0a94c6956':
CheckAndClearResolveException should allow LinkageError
Mathieu Chartier [Tue, 26 Aug 2014 11:29:41 +0000 (11:29 +0000)]
am
5a1a39a6: Merge "Reduce GC log spam."
* commit '
5a1a39a67260704fbc76c9a6a58b330a2df6827a':
Reduce GC log spam.
Brian Carlstrom [Tue, 26 Aug 2014 11:29:26 +0000 (11:29 +0000)]
am
bd8921ca: am
118785c6: CheckAndClearResolveException should allow LinkageError
* commit '
bd8921ca0cdf5716d0ffe5d8b298d25bf46dcb89':
CheckAndClearResolveException should allow LinkageError
Brian Carlstrom [Tue, 26 Aug 2014 11:18:28 +0000 (11:18 +0000)]
am
118785c6: CheckAndClearResolveException should allow LinkageError
* commit '
118785c6f82ac1ec7074b5efe367b3dafd904940':
CheckAndClearResolveException should allow LinkageError
Brian Carlstrom [Tue, 26 Aug 2014 06:40:32 +0000 (06:40 +0000)]
Merge "CheckAndClearResolveException should allow LinkageError"
Brian Carlstrom [Tue, 26 Aug 2014 06:07:30 +0000 (23:07 -0700)]
CheckAndClearResolveException should allow LinkageError
Bug:
16565964
(cherry picked from commit
118785c6f82ac1ec7074b5efe367b3dafd904940)
Change-Id: I7bc170e7a9ee9bd19defdd20187ee36a2381bf5d
Brian Carlstrom [Tue, 26 Aug 2014 06:07:30 +0000 (23:07 -0700)]
CheckAndClearResolveException should allow LinkageError
Bug:
16565964
Change-Id: Ibf236c627519a5cdef9479b7bc21e931d5474abf
Mathieu Chartier [Tue, 26 Aug 2014 04:57:15 +0000 (04:57 +0000)]
am
213a5434: am
eac98d7c: Merge "Reduce GC log spam." into lmp-dev
* commit '
213a543484ad437389ba325b62567f95d273d8d2':
Reduce GC log spam.
Alex Light [Tue, 26 Aug 2014 04:52:24 +0000 (04:52 +0000)]
am
6b33bed4: am
0699fbf7: Reduce log spam by changing a LOG(INFO) to VLOG(startup)
* commit '
6b33bed442b9152e3a707792d633c3b4d316ebc0':
Reduce log spam by changing a LOG(INFO) to VLOG(startup)
Alex Light [Tue, 26 Aug 2014 04:52:23 +0000 (04:52 +0000)]
am
0e73bdac: (-s ours) am
507e6180: Support running without a boot image.
* commit '
0e73bdac10d1d5aa27351a90a01d516c101f36b1':
Support running without a boot image.
Mathieu Chartier [Tue, 26 Aug 2014 04:17:42 +0000 (04:17 +0000)]
am
0b50629a: Merge "Fixed typo in entrypoint stub."
* commit '
0b50629a79a387b4ab2066610c4803aae046ab30':
Fixed typo in entrypoint stub.
Hiroshi Yamauchi [Tue, 26 Aug 2014 04:17:40 +0000 (04:17 +0000)]
am
32b49871: Merge "Remove an intermediate field array in ClassLinker::InitializeClass."
* commit '
32b498713a11958bac2af0f51b2b49ef88f4bd07':
Remove an intermediate field array in ClassLinker::InitializeClass.
Andreas Gampe [Tue, 26 Aug 2014 03:55:01 +0000 (20:55 -0700)]
ART: kSuper also has IncompatibleClassChangeError
When resolving methods, kSuper can also have
IncompatibleClassChangeError.
Bug:
17266767
Change-Id: I5fafe03ad578f605825a3d0c89f1254a4a385b76
Andreas Gampe [Tue, 26 Aug 2014 03:46:31 +0000 (20:46 -0700)]
ART: Fix IncompatibleClassChange check for ArtMethod
In case of kSuper we should complain sometimes.
Bug:
17265201
Change-Id: Ifad903a750495963c7128296713fbd7c4add71cd
Mathieu Chartier [Tue, 26 Aug 2014 03:42:19 +0000 (03:42 +0000)]
am
eac98d7c: Merge "Reduce GC log spam." into lmp-dev
* commit '
eac98d7cb0f84c664d22deebf1ae5062730d7a31':
Reduce GC log spam.
Mathieu Chartier [Tue, 26 Aug 2014 03:31:59 +0000 (03:31 +0000)]
Merge "Reduce GC log spam."
Mathieu Chartier [Tue, 26 Aug 2014 02:46:57 +0000 (19:46 -0700)]
Reduce GC log spam.
Homogeneous compaction and collector transitions now print to
VLOG(gc) instead of LOG(INFO).
Bug:
17166556
(cherry picked from commit
0ab56e95e203806dae347056d3331a3e6037457d)
Change-Id: I33157ca27da86cbb741759bb0bda6d38d1f5bfcd
Mathieu Chartier [Tue, 26 Aug 2014 03:30:33 +0000 (03:30 +0000)]
Merge "Reduce GC log spam." into lmp-dev
Mathieu Chartier [Tue, 26 Aug 2014 02:46:57 +0000 (19:46 -0700)]
Reduce GC log spam.
Homogeneous compaction and collector transitions now print to
VLOG(gc) instead of LOG(INFO).
Bug:
17166556
Change-Id: I5d54acf36a9b2763922e6329596a2f191d45535c
Mathieu Chartier [Tue, 26 Aug 2014 01:30:04 +0000 (01:30 +0000)]
Merge "Fixed typo in entrypoint stub."
Fred Shih [Tue, 26 Aug 2014 01:19:50 +0000 (18:19 -0700)]
Fixed typo in entrypoint stub.
Fixed typo for x86 stub causing mac build failure.
Change-Id: I5e063fb87c598c2d9beb22f6d5b97b7fd4df9b84
Hiroshi Yamauchi [Tue, 26 Aug 2014 00:27:55 +0000 (00:27 +0000)]
Merge "Remove an intermediate field array in ClassLinker::InitializeClass."
Ian Rogers [Tue, 26 Aug 2014 00:13:11 +0000 (00:13 +0000)]
am
1ff1747e: Merge "ART: Extending FlagsOf"
* commit '
1ff1747e71f0e1b3dbb181b52c2b4880bfa019fc':
ART: Extending FlagsOf
Mathieu Chartier [Mon, 25 Aug 2014 23:32:41 +0000 (16:32 -0700)]
Map heap maps at a lower address.
We now map the heap mmaps at a lower address in case the app needs
larger continuous address space.
Bug:
16502380
Change-Id: I2cc11d0c207c0eae8db0c5025a48b11119c5a802
Hiroshi Yamauchi [Fri, 22 Aug 2014 19:12:56 +0000 (12:12 -0700)]
Remove an intermediate field array in ClassLinker::InitializeClass.
This improves on CL 105090 by removing the need for the intermediate
field array by iterating two iterators in parallel.
Bug:
12687968
Change-Id: I32d4570948a9d39ccb1c20a02e18b48f15ed0738