OSDN Git Service
Vladimir Marko [Wed, 9 Dec 2015 16:28:45 +0000 (16:28 +0000)]
Merge "Clarify --boot-image help message" am:
f9a9f2bba7
am:
53b93389d1
* commit '
53b93389d189f39ce33b82c01f5cc527d591b507':
Clarify --boot-image help message
Vladimir Marko [Wed, 9 Dec 2015 16:26:30 +0000 (16:26 +0000)]
Merge "Clarify --boot-image help message"
am:
f9a9f2bba7
* commit '
f9a9f2bba730a4f47aa84d2b97d3f52f6a73ac1f':
Clarify --boot-image help message
Vladimir Marko [Wed, 9 Dec 2015 16:20:34 +0000 (16:20 +0000)]
Merge "Clarify --boot-image help message"
Vladimir Marko [Wed, 9 Dec 2015 16:00:33 +0000 (16:00 +0000)]
Merge "ART: Reduce the instructions generated by packed switch." am:
2c1164c2ae
am:
917ec0f541
* commit '
917ec0f541eb802cdbf13b5a86e1cb8098d2eb06':
ART: Reduce the instructions generated by packed switch.
Vladimir Marko [Wed, 9 Dec 2015 15:58:12 +0000 (15:58 +0000)]
Merge "ART: Reduce the instructions generated by packed switch."
am:
2c1164c2ae
* commit '
2c1164c2aea94e4dfc5bf21785557240c832bcd2':
ART: Reduce the instructions generated by packed switch.
Vladimir Marko [Wed, 9 Dec 2015 15:53:42 +0000 (15:53 +0000)]
Merge "ART: Reduce the instructions generated by packed switch."
Vladimir Marko [Wed, 9 Dec 2015 15:50:57 +0000 (07:50 -0800)]
Merge "ART: Add FdFile::Copy() to copy data from another file." am:
976af0a291
am:
7678a1a060
* commit '
7678a1a0609cc9e0ed25cea5b473d3f098c09338':
ART: Add FdFile::Copy() to copy data from another file.
Vladimir Marko [Wed, 9 Dec 2015 15:48:07 +0000 (15:48 +0000)]
Merge "ART: Add FdFile::Copy() to copy data from another file."
am:
976af0a291
* commit '
976af0a2914f20b65830b1ed9ac8ab45055f35a5':
ART: Add FdFile::Copy() to copy data from another file.
Vladimir Marko [Wed, 9 Dec 2015 15:43:50 +0000 (15:43 +0000)]
Merge "ART: Add FdFile::Copy() to copy data from another file."
Vladimir Marko [Tue, 8 Dec 2015 19:25:49 +0000 (19:25 +0000)]
ART: Add FdFile::Copy() to copy data from another file.
Also move utilities for inspecting file magic numbers to
base/file_magic.{h,cc} and drop the unused IsOatMagic().
Change-Id: I2cc4dd18a5e8b9738fb386c8057faad3722bdd68
Kevin Brodsky [Tue, 24 Nov 2015 14:24:34 +0000 (14:24 +0000)]
Clarify --boot-image help message
Make dex2oat print the same help as e.g. oatdump regarding
--boot-image and clarify the example, this is particularly important
as the automatic addition of the arch to the path is quite
counterintuitive.
Change-Id: I234b498d5deca99bb988a9c24ff9febc6349eb9e
Przemyslaw Szczepaniak [Wed, 9 Dec 2015 09:57:36 +0000 (09:57 +0000)]
New regression test in 042-new-instance
Test that Constructor#newInstance uses its caller
frame for the accessibility check.
Bug:
25817515
Change-Id: If8743ac39281db3378da93f793489c1e8f7ea15a
(cherry picked from commit
7a980a2f6af2f0cd83c1ab223a7736a18a8ccde3)
Andreas Gampe [Wed, 9 Dec 2015 03:28:07 +0000 (03:28 +0000)]
Merge "MIPS64: Enable StringCompareTo and StringIndexOf stub tests" am:
533ffe5369
am:
93f39f4226
* commit '
93f39f42268b5bcdf4e034644b90089a2f730f88':
MIPS64: Enable StringCompareTo and StringIndexOf stub tests
Andreas Gampe [Wed, 9 Dec 2015 03:25:09 +0000 (03:25 +0000)]
Merge "MIPS64: Enable StringCompareTo and StringIndexOf stub tests"
am:
533ffe5369
* commit '
533ffe5369cdaeb8ab7986b1fefece32351c0366':
MIPS64: Enable StringCompareTo and StringIndexOf stub tests
Andreas Gampe [Wed, 9 Dec 2015 03:19:33 +0000 (03:19 +0000)]
Merge "MIPS64: Enable StringCompareTo and StringIndexOf stub tests"
Andreas Gampe [Tue, 8 Dec 2015 22:44:57 +0000 (22:44 +0000)]
Merge "ART: Check invoke-interface earlier in verifier" am:
eb5ddd7b02
am:
782ffa9f4f
* commit '
782ffa9f4fda3f8c9f23aef798d25703d02015a4':
ART: Check invoke-interface earlier in verifier
Andreas Gampe [Tue, 8 Dec 2015 22:42:10 +0000 (22:42 +0000)]
Merge "ART: Check invoke-interface earlier in verifier"
am:
eb5ddd7b02
* commit '
eb5ddd7b02ce2d25d4f28f85a13aac628526e1c1':
ART: Check invoke-interface earlier in verifier
Andreas Gampe [Tue, 8 Dec 2015 22:33:23 +0000 (22:33 +0000)]
Merge "ART: Check invoke-interface earlier in verifier"
Zheng Xu [Mon, 7 Dec 2015 09:17:03 +0000 (17:17 +0800)]
ART: Reduce the instructions generated by packed switch.
Implement Vladimir Marko's suggestion. The new compare/jump series
reduce the number of instructions from (2*n+1) to (1.5*n+3).
Generate normal compare/jump series when numEntries <= 3.
Generate optimal compare/jump series when numEntries <= threshold.
Generate jump tables otherwise.
Change-Id: I425547b6787057c7fa84e71f17c145b63b208633
Andreas Gampe [Fri, 4 Dec 2015 01:27:32 +0000 (17:27 -0800)]
ART: Check invoke-interface earlier in verifier
Invoke-interface should only be called on an interface method.
Move the check earlier, as otherwise we'll try to resolve and
potentially inject a method into the dex cache.
Also templatize ResolveMethod with a version always checking
the invoke type, and on a cache miss check whether type target
type is an interface when an interface invoke type was given.
Bug:
21869691
Change-Id: Ica27158f675b5aa223d9229248189612f4706832
Vladimir Marko [Tue, 8 Dec 2015 16:25:47 +0000 (16:25 +0000)]
Merge "Allow initializing runtime with parsed options." am:
e0d25b156e am:
2433d4e17c
am:
0b81f1715d
* commit '
0b81f1715d6af9f98f982d6511e48973aa5a836a':
Allow initializing runtime with parsed options.
Vladimir Marko [Tue, 8 Dec 2015 16:22:45 +0000 (08:22 -0800)]
Merge "Allow initializing runtime with parsed options." am:
e0d25b156e
am:
2433d4e17c
* commit '
2433d4e17c3006b8262a0d9421e201fc84777208':
Allow initializing runtime with parsed options.
Vladimir Marko [Tue, 8 Dec 2015 16:19:20 +0000 (16:19 +0000)]
Merge "Allow initializing runtime with parsed options."
am:
e0d25b156e
* commit '
e0d25b156ef12b23afa2a6493ae703ec82e23475':
Allow initializing runtime with parsed options.
Vladimir Marko [Tue, 8 Dec 2015 16:15:24 +0000 (16:15 +0000)]
Merge "Allow initializing runtime with parsed options."
Roland Levillain [Tue, 8 Dec 2015 14:05:28 +0000 (06:05 -0800)]
Merge "Fix test-art-target-sync when ART_TEST_ANDROID_ROOT is used." am:
763fd2d3d1 am:
74af075f11
am:
641c83a864
* commit '
641c83a8645ef9fd99dca06ec30bae8449b959c7':
Fix test-art-target-sync when ART_TEST_ANDROID_ROOT is used.
Roland Levillain [Tue, 8 Dec 2015 14:02:32 +0000 (14:02 +0000)]
Merge "Fix test-art-target-sync when ART_TEST_ANDROID_ROOT is used." am:
763fd2d3d1
am:
74af075f11
* commit '
74af075f11e23918edc25c86fb2f1d8209cf94fc':
Fix test-art-target-sync when ART_TEST_ANDROID_ROOT is used.
Roland Levillain [Tue, 8 Dec 2015 13:59:35 +0000 (13:59 +0000)]
Merge "Fix test-art-target-sync when ART_TEST_ANDROID_ROOT is used."
am:
763fd2d3d1
* commit '
763fd2d3d131898cad6295a19ae9a30e22ce5f2a':
Fix test-art-target-sync when ART_TEST_ANDROID_ROOT is used.
Roland Levillain [Tue, 8 Dec 2015 13:55:39 +0000 (13:55 +0000)]
Merge "Fix test-art-target-sync when ART_TEST_ANDROID_ROOT is used."
Roland Levillain [Tue, 8 Dec 2015 11:23:02 +0000 (11:23 +0000)]
Fix test-art-target-sync when ART_TEST_ANDROID_ROOT is used.
The semantics of "adb push" have changed since the time
system/core was pinned in the master-art manifest.
Bug:
26051370
Change-Id: I3ee6f2694168b0cdc8c8ac37f77fd443879275dc
Vladimir Marko [Tue, 8 Dec 2015 13:53:11 +0000 (05:53 -0800)]
Merge "ART: Instruction dumper should handle out-of-bound index for const-string" am:
8dd7165745 am:
436abf7c1b
am:
0121555032
* commit '
0121555032ff156fb96e957517cb92416ec2af69':
ART: Instruction dumper should handle out-of-bound index for const-string
Vladimir Marko [Tue, 8 Dec 2015 13:49:45 +0000 (13:49 +0000)]
Merge "ART: Instruction dumper should handle out-of-bound index for const-string" am:
8dd7165745
am:
436abf7c1b
* commit '
436abf7c1baad0ee38203cabd4f9deba71b949e5':
ART: Instruction dumper should handle out-of-bound index for const-string
Vladimir Marko [Tue, 8 Dec 2015 13:46:52 +0000 (05:46 -0800)]
Merge "ART: Instruction dumper should handle out-of-bound index for const-string"
am:
8dd7165745
* commit '
8dd7165745520e339b60d2ae5631894819790f7d':
ART: Instruction dumper should handle out-of-bound index for const-string
Vladimir Marko [Tue, 8 Dec 2015 13:42:52 +0000 (13:42 +0000)]
Merge "ART: Instruction dumper should handle out-of-bound index for const-string"
David Brazdil [Tue, 8 Dec 2015 13:16:00 +0000 (13:16 +0000)]
Merge "ART: Enable all optimizations except LSE under try/catch" am:
95f05a89a6 am:
17f715c0bd
am:
da44a389fb
* commit '
da44a389fbf5794ef2a6da445e80f92e0d6878f3':
ART: Enable all optimizations except LSE under try/catch
David Brazdil [Tue, 8 Dec 2015 13:13:05 +0000 (05:13 -0800)]
Merge "ART: Enable all optimizations except LSE under try/catch" am:
95f05a89a6
am:
17f715c0bd
* commit '
17f715c0bd89fe6565ba2e3a7270990488c7049e':
ART: Enable all optimizations except LSE under try/catch
David Brazdil [Tue, 8 Dec 2015 13:09:45 +0000 (13:09 +0000)]
Merge "ART: Enable all optimizations except LSE under try/catch"
am:
95f05a89a6
* commit '
95f05a89a682f40151cd843f2110b02c35434635':
ART: Enable all optimizations except LSE under try/catch
David Brazdil [Tue, 8 Dec 2015 13:05:22 +0000 (13:05 +0000)]
Merge "ART: Enable all optimizations except LSE under try/catch"
David Brazdil [Mon, 7 Dec 2015 10:04:40 +0000 (10:04 +0000)]
ART: Enable all optimizations except LSE under try/catch
Dynamic BCE now updates try/catch information during basic block
manipulation and can be enabled. The last missing optimization is LSE.
This patch removes all special-casing from optimizing_compiler.cc and
bails inside LSE instead.
Change-Id: Ie0c6fde7295880ea55d35571455a617fce2b7580
Serdjuk, Nikolay Y [Mon, 7 Dec 2015 08:45:44 +0000 (14:45 +0600)]
ART: Instruction dumper should handle out-of-bound index for const-string
If const-string refers to out-of-bound index then we should handle it
similarly to PrettyField, PrettyMethod and PrettyType.
Change-Id: Ib6b1e20169e4b47c1cdb7dda80320ed21d61cfe3
Signed-off-by: Serdjuk, Nikolay Y <nikolay.y.serdjuk@intel.com>
Hiroshi Yamauchi [Tue, 8 Dec 2015 02:20:43 +0000 (18:20 -0800)]
Merge "Replace proxy class names with deterministic ones for test output." am:
e8be90a673 am:
6df522ec3d
am:
b81df0fab3
* commit '
b81df0fab343821c0cb3f6e627fd0f65ded8ffee':
Replace proxy class names with deterministic ones for test output.
Andreas Gampe [Tue, 8 Dec 2015 02:19:34 +0000 (18:19 -0800)]
Merge "ART: Fix PACKED size of tls_ptr_size." am:
9f62af0e1c am:
96c37a70b6
am:
9edaaa4cdf
* commit '
9edaaa4cdfd4a9765e67807bb82edd4c2ded4ae0':
ART: Fix PACKED size of tls_ptr_size.
Mathieu Chartier [Tue, 8 Dec 2015 02:19:26 +0000 (18:19 -0800)]
Merge "Combine class sets when writing a class table" am:
3cf8583a2f am:
781a197c45
am:
97947a81d5
* commit '
97947a81d5ad0cccfeec080ba3d0497b066cd296':
Combine class sets when writing a class table
Richard Uhler [Tue, 8 Dec 2015 02:19:19 +0000 (18:19 -0800)]
Merge "Annotate root objects and show their types." am:
0e72abfae7 am:
ec698a4bb9
am:
70192c5bee
* commit '
70192c5beefaa60efbc74d1b3178dfe41694ae91':
Annotate root objects and show their types.
Hiroshi Yamauchi [Tue, 8 Dec 2015 02:13:04 +0000 (02:13 +0000)]
Merge "Replace proxy class names with deterministic ones for test output." am:
e8be90a673
am:
6df522ec3d
* commit '
6df522ec3d4a2c7ff57d28d3802ec46263c3f2fa':
Replace proxy class names with deterministic ones for test output.
Hiroshi Yamauchi [Tue, 8 Dec 2015 02:08:36 +0000 (02:08 +0000)]
Merge "Replace proxy class names with deterministic ones for test output."
am:
e8be90a673
* commit '
e8be90a673feb573d53277f42282955cbf7f58e9':
Replace proxy class names with deterministic ones for test output.
Hiroshi Yamauchi [Tue, 8 Dec 2015 02:02:40 +0000 (02:02 +0000)]
Merge "Replace proxy class names with deterministic ones for test output."
Hiroshi Yamauchi [Sat, 5 Dec 2015 00:18:49 +0000 (16:18 -0800)]
Replace proxy class names with deterministic ones for test output.
This should avoid potentially flaky test failures in 005-annotations
and 044-proxy.
(cherrypick commit
bc7f8080d1f5d0138cb83cba73a747d43d62c23c)
Bug:
25838574
Bug:
12687968
Change-Id: I08765abd82e41258ce4d1d8bb9dffce70c8b6689
Roland Levillain [Tue, 8 Dec 2015 00:06:27 +0000 (00:06 +0000)]
Merge "Revert "Fix the ART Buildbots using the master-art manifest."" am:
526377fe8d am:
867c60b2a1
am:
50f37073f8
* commit '
50f37073f8b198476373197a9dbaf4adda2402ff':
Revert "Fix the ART Buildbots using the master-art manifest."
Roland Levillain [Tue, 8 Dec 2015 00:06:14 +0000 (00:06 +0000)]
Merge "Fix the ART Buildbots using the master-art manifest." am:
a2964d5ab5 am:
0be457fd49
am:
42061a6e4f
* commit '
42061a6e4f1e6b9e7f1ef94281f45e888b32545a':
Fix the ART Buildbots using the master-art manifest.
Roland Levillain [Tue, 8 Dec 2015 00:00:55 +0000 (00:00 +0000)]
Merge "Annotate Boolean literals more uniformly in Optimizing\'s intrinsics." am:
a6756069c4 am:
c78124a016
am:
f502fad8de
* commit '
f502fad8dee335d74b3695cdc551efd6cea29484':
Annotate Boolean literals more uniformly in Optimizing's intrinsics.
Roland Levillain [Tue, 8 Dec 2015 00:00:48 +0000 (00:00 +0000)]
Merge "Fix art::x86::IntrinsicLocationsBuilderX86::VisitUnsafeGetLong." am:
038f4f2f4d am:
daff07a8ab
am:
4168253fdb
* commit '
4168253fdb0099a16dde2104e470014d97469689':
Fix art::x86::IntrinsicLocationsBuilderX86::VisitUnsafeGetLong.
Andreas Gampe [Mon, 7 Dec 2015 23:34:47 +0000 (15:34 -0800)]
Merge "ART: Fix PACKED size of tls_ptr_size." am:
9f62af0e1c
am:
96c37a70b6
* commit '
96c37a70b61360ec0e4aeb9d67b6de08cf131021':
ART: Fix PACKED size of tls_ptr_size.
Mathieu Chartier [Mon, 7 Dec 2015 23:34:38 +0000 (15:34 -0800)]
Merge "Combine class sets when writing a class table" am:
3cf8583a2f
am:
781a197c45
* commit '
781a197c4585f1c61662066e7c937133bf7e0d07':
Combine class sets when writing a class table
Richard Uhler [Mon, 7 Dec 2015 23:34:24 +0000 (15:34 -0800)]
Merge "Annotate root objects and show their types." am:
0e72abfae7
am:
ec698a4bb9
* commit '
ec698a4bb94298aa5b6d0d66f31a42d1a5674abb':
Annotate root objects and show their types.
Roland Levillain [Mon, 7 Dec 2015 23:33:58 +0000 (23:33 +0000)]
Merge "Revert "Fix the ART Buildbots using the master-art manifest."" am:
526377fe8d
am:
867c60b2a1
* commit '
867c60b2a1c1470ba999207cd0ba426a1e28ceee':
Revert "Fix the ART Buildbots using the master-art manifest."
Roland Levillain [Mon, 7 Dec 2015 23:33:44 +0000 (23:33 +0000)]
Merge "Fix the ART Buildbots using the master-art manifest." am:
a2964d5ab5
am:
0be457fd49
* commit '
0be457fd498a47d34a2ad00d53b72898f497afa4':
Fix the ART Buildbots using the master-art manifest.
Roland Levillain [Mon, 7 Dec 2015 23:33:34 +0000 (23:33 +0000)]
Merge "Annotate Boolean literals more uniformly in Optimizing\'s intrinsics." am:
a6756069c4
am:
c78124a016
* commit '
c78124a016326f9d4bf98e0464df62ffbf8b1a0f':
Annotate Boolean literals more uniformly in Optimizing's intrinsics.
Roland Levillain [Mon, 7 Dec 2015 23:33:21 +0000 (23:33 +0000)]
Merge "Fix art::x86::IntrinsicLocationsBuilderX86::VisitUnsafeGetLong." am:
038f4f2f4d
am:
daff07a8ab
* commit '
daff07a8ab3fd3fc93db4865ac7eb7bbd7dcf282':
Fix art::x86::IntrinsicLocationsBuilderX86::VisitUnsafeGetLong.
Andreas Gampe [Mon, 7 Dec 2015 23:27:19 +0000 (15:27 -0800)]
Merge "ART: Fix PACKED size of tls_ptr_size."
am:
9f62af0e1c
* commit '
9f62af0e1cd770ec3e98f0d1a83a1193e2493cac':
ART: Fix PACKED size of tls_ptr_size.
Andreas Gampe [Mon, 7 Dec 2015 23:20:18 +0000 (23:20 +0000)]
Merge "ART: Fix PACKED size of tls_ptr_size."
Mathieu Chartier [Mon, 7 Dec 2015 23:19:19 +0000 (23:19 +0000)]
Merge "Combine class sets when writing a class table"
am:
3cf8583a2f
* commit '
3cf8583a2fe1a2793b4c67098df62f4362b47f0c':
Combine class sets when writing a class table
Richard Uhler [Mon, 7 Dec 2015 23:18:40 +0000 (23:18 +0000)]
Merge "Annotate root objects and show their types."
am:
0e72abfae7
* commit '
0e72abfae75e0072679c425b7a4fb6344e1de550':
Annotate root objects and show their types.
Roland Levillain [Mon, 7 Dec 2015 23:11:33 +0000 (23:11 +0000)]
Merge "Revert "Fix the ART Buildbots using the master-art manifest.""
am:
526377fe8d
* commit '
526377fe8d49803654966887be08140dbed2acd8':
Revert "Fix the ART Buildbots using the master-art manifest."
Roland Levillain [Mon, 7 Dec 2015 23:11:26 +0000 (23:11 +0000)]
Merge "Fix the ART Buildbots using the master-art manifest."
am:
a2964d5ab5
* commit '
a2964d5ab5c1a7158a15bb899bc99d59236b3ac5':
Fix the ART Buildbots using the master-art manifest.
Roland Levillain [Mon, 7 Dec 2015 23:11:17 +0000 (23:11 +0000)]
Merge "Annotate Boolean literals more uniformly in Optimizing\'s intrinsics."
am:
a6756069c4
* commit '
a6756069c4363a231928b040ff0c86c80acdb9b9':
Annotate Boolean literals more uniformly in Optimizing's intrinsics.
Roland Levillain [Mon, 7 Dec 2015 23:11:08 +0000 (23:11 +0000)]
Merge "Fix art::x86::IntrinsicLocationsBuilderX86::VisitUnsafeGetLong."
am:
038f4f2f4d
* commit '
038f4f2f4de2def9a1d59a6f1b0162b1c2200c32':
Fix art::x86::IntrinsicLocationsBuilderX86::VisitUnsafeGetLong.
Mathieu Chartier [Mon, 7 Dec 2015 21:08:49 +0000 (21:08 +0000)]
Merge "Combine class sets when writing a class table"
Richard Uhler [Mon, 7 Dec 2015 20:27:52 +0000 (20:27 +0000)]
Merge "Annotate root objects and show their types."
Hiroshi Yamauchi [Mon, 7 Dec 2015 18:53:32 +0000 (18:53 +0000)]
Merge "Revert "Disable tests causing random failures with Enso and read barriers.""
Hiroshi Yamauchi [Sat, 5 Dec 2015 00:19:39 +0000 (16:19 -0800)]
Revert "Disable tests causing random failures with Enso and read barriers."
CL 827405 should fix the flaky failures.
Bug:
25838574
Bug:
12687968
This reverts commit
97290796b06fb49b88efee8b992b9b7defa53d00.
Change-Id: I7e8213eb2c8d6489051e187f6f36204be072d738
Hiroshi Yamauchi [Mon, 7 Dec 2015 18:48:17 +0000 (18:48 +0000)]
Merge "Replace proxy class names with deterministic ones for test output."
Roland Levillain [Mon, 7 Dec 2015 12:38:49 +0000 (12:38 +0000)]
Merge "Revert "Fix the ART Buildbots using the master-art manifest.""
Roland Levillain [Mon, 7 Dec 2015 12:38:24 +0000 (12:38 +0000)]
Revert "Fix the ART Buildbots using the master-art manifest."
Reverting as repo syncing later won't work, as this symlink is an untracked file.
Bug:
26051370
This reverts commit
f1389288c6f642e16b5d9a06ef43f982dfeeb30d.
Change-Id: Idd41955710b4d3d5809e4f6bf963ed3a4cead126
Vladimir Marko [Fri, 4 Dec 2015 14:19:04 +0000 (14:19 +0000)]
Allow initializing runtime with parsed options.
Needed by upcoming refactoring of dex2oat to allow
early writing of dex files to the oat file.
Change-Id: Ia13c26132846801522f181f51f64035d625e8416
Roland Levillain [Mon, 7 Dec 2015 12:19:07 +0000 (12:19 +0000)]
Merge "Fix the ART Buildbots using the master-art manifest."
Roland Levillain [Mon, 7 Dec 2015 12:04:03 +0000 (12:04 +0000)]
Fix the ART Buildbots using the master-art manifest.
When system/core/base/include/android-base is missing, create it as a
symlink to system/core/base/include/base.
This change is very brittle and is only to unblock the ART Buildbots.
It should be a temporary solution while we come up with something
better.
Bug:
26051370
Change-Id: Ie412fbf170e2cd260f77caaeb7af0b2e399ef3ab
Roland Levillain [Mon, 7 Dec 2015 11:15:14 +0000 (11:15 +0000)]
Merge "Annotate Boolean literals more uniformly in Optimizing's intrinsics."
Roland Levillain [Fri, 4 Dec 2015 14:33:02 +0000 (14:33 +0000)]
Annotate Boolean literals more uniformly in Optimizing's intrinsics.
Change-Id: Ida40309b4bc170a18b4e5db552b77f021a7b89df
Roland Levillain [Mon, 7 Dec 2015 10:19:40 +0000 (10:19 +0000)]
Merge "Fix art::x86::IntrinsicLocationsBuilderX86::VisitUnsafeGetLong."
Andreas Gampe [Sat, 5 Dec 2015 02:16:06 +0000 (18:16 -0800)]
Merge "MIPS32: Bit rotation intrinsics" am:
5bde68ff34 am:
03e6cb6628
am:
5e024a4958
* commit '
5e024a49585aa4016a378ab3cfbef79a6f0185ae':
MIPS32: Bit rotation intrinsics
Andreas Gampe [Sat, 5 Dec 2015 02:12:51 +0000 (18:12 -0800)]
Merge "MIPS32: int java.lang.*.numberOfTrailingZeros" am:
fdacff89f5 am:
1f1899a73d
am:
c70f48c2de
* commit '
c70f48c2de617b6503503df8c26767c02f629b24':
MIPS32: int java.lang.*.numberOfTrailingZeros
Andreas Gampe [Sat, 5 Dec 2015 02:12:44 +0000 (02:12 +0000)]
Merge "MIPS32: Bit rotation intrinsics" am:
5bde68ff34
am:
03e6cb6628
* commit '
03e6cb662846c762d2d5c701752e8c4c6b1b204c':
MIPS32: Bit rotation intrinsics
Andreas Gampe [Sat, 5 Dec 2015 02:12:42 +0000 (18:12 -0800)]
Merge "MIPS32: int java.lang.*.numberOfLeadingZeros" am:
e15f6e2d26 am:
203cab2091
am:
eadacb6c70
* commit '
eadacb6c70b5a098bc0e4b474f601de597b38f1f':
MIPS32: int java.lang.*.numberOfLeadingZeros
Andreas Gampe [Sat, 5 Dec 2015 02:08:45 +0000 (18:08 -0800)]
Merge "MIPS32: int java.lang.*.numberOfTrailingZeros" am:
fdacff89f5
am:
1f1899a73d
* commit '
1f1899a73dc4ee7b521e760414a47e1723b566af':
MIPS32: int java.lang.*.numberOfTrailingZeros
Andreas Gampe [Sat, 5 Dec 2015 02:08:37 +0000 (18:08 -0800)]
Merge "MIPS32: Bit rotation intrinsics"
am:
5bde68ff34
* commit '
5bde68ff34aeb84a1fc84734bcd31471d9a9717c':
MIPS32: Bit rotation intrinsics
Andreas Gampe [Sat, 5 Dec 2015 02:08:35 +0000 (18:08 -0800)]
Merge "MIPS32: int java.lang.*.numberOfLeadingZeros" am:
e15f6e2d26
am:
203cab2091
* commit '
203cab2091f9ac1d0a472f9a453b22bbc8ca4103':
MIPS32: int java.lang.*.numberOfLeadingZeros
Andreas Gampe [Sat, 5 Dec 2015 02:08:06 +0000 (02:08 +0000)]
Merge "MIPS32: Bit rotation intrinsics"
Andreas Gampe [Sat, 5 Dec 2015 02:05:28 +0000 (18:05 -0800)]
Merge "MIPS32: int java.lang.*.numberOfTrailingZeros"
am:
fdacff89f5
* commit '
fdacff89f5b5c276254beb5643fda5df16ba7dd3':
MIPS32: int java.lang.*.numberOfTrailingZeros
Andreas Gampe [Sat, 5 Dec 2015 02:05:18 +0000 (18:05 -0800)]
Merge "MIPS32: int java.lang.*.numberOfLeadingZeros"
am:
e15f6e2d26
* commit '
e15f6e2d262c53ae616b70024a743604f21b7c42':
MIPS32: int java.lang.*.numberOfLeadingZeros
Andreas Gampe [Sat, 5 Dec 2015 02:04:14 +0000 (02:04 +0000)]
Merge "MIPS32: int java.lang.*.numberOfTrailingZeros"
Andreas Gampe [Sat, 5 Dec 2015 02:02:13 +0000 (02:02 +0000)]
Merge "MIPS32: int java.lang.*.numberOfLeadingZeros"
Hiroshi Yamauchi [Sat, 5 Dec 2015 00:18:49 +0000 (16:18 -0800)]
Replace proxy class names with deterministic ones for test output.
This should avoid potentially flaky test failures in 005-annotations
and 044-proxy.
Bug:
25838574
Bug:
12687968
Change-Id: I08765abd82e41258ce4d1d8bb9dffce70c8b6689
Alex Light [Sat, 5 Dec 2015 00:04:49 +0000 (16:04 -0800)]
resolve merge conflicts of
a7bb84c80d to master.
Change-Id: I53a4bd8649ed5d249ecd3c4d064e82b58a213114
Mathieu Chartier [Fri, 4 Dec 2015 23:07:48 +0000 (15:07 -0800)]
Combine class sets when writing a class table
Reduces the boot.art size since we allocate a new class set with the
default load factor. The load factor in the combined class table is
higher to pruning classes, this reduces the size of the boot image.
Also fixes the hypothetical case where the class table being written
has multiple class sets.
Boot.art size
Before:
8122368
After:
8044544
Slight cleanup in patchoat.cc.
Bug:
22858531
Change-Id: I31b3ea2004ece6f6c853ee906074bb2792dee958
Alex Light [Fri, 4 Dec 2015 22:28:28 +0000 (14:28 -0800)]
Merge "Make test 100 not depend on undefined ordering." am:
bf0e73604f
am:
51394e2cf4
* commit '
51394e2cf47f5e8878849ce8a18da42a5a3d4182':
Make test 100 not depend on undefined ordering.
Alex Light [Fri, 4 Dec 2015 22:24:47 +0000 (22:24 +0000)]
Merge "Make test 100 not depend on undefined ordering."
am:
bf0e73604f
* commit '
bf0e73604f836e3b8f7d6481e83110c3426350b6':
Make test 100 not depend on undefined ordering.
Alex Light [Fri, 4 Dec 2015 22:21:23 +0000 (22:21 +0000)]
Merge "Make test 100 not depend on undefined ordering."
Mathieu Chartier [Fri, 4 Dec 2015 22:05:10 +0000 (14:05 -0800)]
Merge "Store class tables in the image" am:
a616b4e086 am:
e8d71c13ad
am:
c0206e1a89
* commit '
c0206e1a89fc996425f2b4b440d98a7425be6e1e':
Store class tables in the image
Alex Light [Fri, 4 Dec 2015 22:04:52 +0000 (14:04 -0800)]
Make test 100 not depend on undefined ordering.
Test 100 tested the officially unspecified ordering of the return
values of various reflection methods. This makes the test only check
the values contained in the array but not the order.
Change-Id: I775646321831f28f722d1db97335231df03ff923
Mathieu Chartier [Fri, 4 Dec 2015 22:01:50 +0000 (14:01 -0800)]
Merge "Store class tables in the image" am:
a616b4e086
am:
e8d71c13ad
* commit '
e8d71c13ad2e9660c9acf51bbe571f1ceaec7120':
Store class tables in the image
OSDN Git Service
