OSDN Git Service
Andreas Gampe [Mon, 26 Sep 2016 19:56:19 +0000 (19:56 +0000)]
Merge "ART: Use libbase logging"
am:
a4850b0fa1
Change-Id: Id19ac0187a9213fe6b2bd2135f994e60e772dc90
Treehugger Robot [Mon, 26 Sep 2016 19:45:22 +0000 (19:45 +0000)]
Merge "ART: Use libbase logging"
Andreas Gampe [Tue, 13 Sep 2016 17:47:28 +0000 (10:47 -0700)]
ART: Use libbase logging
Move most of our logging infrastructure over to system/core/base.
Retain VLOG.
Using unified Android infrastructure has two main advantages. First,
it reduces the complexity/maintenance burden in ART. Second, it
allows to detach logging for the cases where we do not want or need
a runtime, e.g., dexdump, the disassembler, etc. As a part of the
latter, libbase is also supported for all hosts (including Windows).
From a developer viewpoint, there are minor behavior changes for the
LOG statements (see above), but otherwise usage is the same. Explicit
severity enum items are in the android::base namespace now.
Bug:
31338270
Test: m test-art-host
Change-Id: I5abcb2f45f5b03d49951874c48544f72a283a91b
David Sehr [Mon, 26 Sep 2016 14:42:26 +0000 (14:42 +0000)]
Merge "Fix CTS crash from DexFile refactoring"
am:
0cfe19af3b
Change-Id: Ifd5c3e906c3175ba25dc179d6378be0f1aa80c84
David Sehr [Mon, 26 Sep 2016 14:34:49 +0000 (14:34 +0000)]
Merge "Fix CTS crash from DexFile refactoring"
Nicolas Geoffray [Mon, 26 Sep 2016 12:45:49 +0000 (12:45 +0000)]
Merge "Compensate in compiler for verifier shortcomings."
am:
3cc69a8944
Change-Id: I7b485879dbaee0feea345d2834fef348405eec83
Treehugger Robot [Mon, 26 Sep 2016 12:39:16 +0000 (12:39 +0000)]
Merge "Compensate in compiler for verifier shortcomings."
Nicolas Geoffray [Fri, 23 Sep 2016 14:40:41 +0000 (15:40 +0100)]
Compensate in compiler for verifier shortcomings.
The verifier does not differentiate zero and null, so a move-object
of zero can be used as a non-object later on.
Change the compiler to ignore the object conversion when the input
is zero or a phi (which might just hold zeros). The type propagation
will then do proper inferencing of the types.
Also remove some stalled comments in ssa_builder.cc.
bug:
31313170
test: dex2oat
b31313170.apk
test: run-test 800
test: m test-art-host-run-test
Change-Id: I579d667415a7decf8ff2c2238dae4c13eec5d0e0
Sebastien Hertz [Mon, 26 Sep 2016 07:13:56 +0000 (07:13 +0000)]
Merge "Add DCE check to test 458-checker-instruct-simplification"
am:
a1d66b9050
Change-Id: Ib44b71f95409e604f7c73ed68c1d8df0b39b853f
Sebastien Hertz [Mon, 26 Sep 2016 07:09:43 +0000 (07:09 +0000)]
Merge "Add DCE check to test 458-checker-instruct-simplification"
Dimitry Ivanov [Sat, 24 Sep 2016 01:36:43 +0000 (01:36 +0000)]
Merge "Use liblog for liblog (instead of libcutils)"
am:
ad1f0ad512
Change-Id: Ifdfc800cfba522e9bf9465682f435935702f8f06
Treehugger Robot [Sat, 24 Sep 2016 01:31:25 +0000 (01:31 +0000)]
Merge "Use liblog for liblog (instead of libcutils)"
Mathieu Chartier [Sat, 24 Sep 2016 00:44:09 +0000 (00:44 +0000)]
Merge "Smarter image layout"
am:
48ec36f8a0
Change-Id: I1c5001b9f1d891f67fa36fced91b049936ab64d7
Treehugger Robot [Sat, 24 Sep 2016 00:37:51 +0000 (00:37 +0000)]
Merge "Smarter image layout"
Dimitry Ivanov [Fri, 23 Sep 2016 23:52:05 +0000 (16:52 -0700)]
Use liblog for liblog (instead of libcutils)
Because one wouldn't use libcutils if there is a liblog.
Bug: http://b/
31289077
Bug: http://b/
27171986
Test: remove liblog from libcutils and make
Change-Id: I5e7eb3a67a483835933e1b5587d43b697e39ceac
Mathieu Chartier [Tue, 20 Sep 2016 22:33:31 +0000 (15:33 -0700)]
Smarter image layout
Put strings in the dex file that resolves them.
Depth first traversal with overrides for class and dex cache. The
work list keeps track of what oat_index with each pushed item. This
means the static fields of a class will usually be in the same image.
Added layout test to image_test to make sure things are somewhat
reasonably attributed.
Bug:
28640955
Test: test-art-host
(cherry picked from commit
4e9c4e746617bad6a012d799d2f5cf9e01d24ea2)
Change-Id: I67a536c33aeed603b252d8e0f75622c9efbf2559
David Sehr [Thu, 22 Sep 2016 21:05:37 +0000 (14:05 -0700)]
Fix CTS crash from DexFile refactoring
Avoid path to nullptr access introduced by the previous refactoring.
Bug:
22322814
Change-Id: Id8874b26c072a11b0494e8126f8b0602a7c5b9e8
Test: m test-art-host, cts-tradefed run cts --skip-preconditions --skip-device-info --module vm-tests-tf
Robert Sesek [Fri, 23 Sep 2016 17:09:56 +0000 (17:09 +0000)]
Merge "Add CanWriteToDalvikCache() check before writing a boot marker or image cache."
am:
c16672a026
Change-Id: I1e7e21dcac13cfdc42d7efdeae44a14971099dc7
Treehugger Robot [Fri, 23 Sep 2016 17:05:40 +0000 (17:05 +0000)]
Merge "Add CanWriteToDalvikCache() check before writing a boot marker or image cache."
Aart Bik [Fri, 23 Sep 2016 15:22:21 +0000 (15:22 +0000)]
Merge "Minor jfuzz improvements."
am:
304533ed84
Change-Id: I951fc02aad45d18502139610345e8f16b9c2ebf7
Aart Bik [Fri, 23 Sep 2016 15:18:21 +0000 (15:18 +0000)]
Merge "Minor jfuzz improvements."
Sebastien Hertz [Fri, 23 Sep 2016 14:51:42 +0000 (16:51 +0200)]
Add DCE check to test 458-checker-instruct-simplification
Follow-up to
9837caff9cbfb61e3dabc6fbecb398d4d659c017 by checking
that dead code is actually removed.
Test: make -j32 test-art-host
Change-Id: Ic7848be893c6fe5e65f5bcdd525597072bf67857
Nicolas Geoffray [Fri, 23 Sep 2016 13:21:44 +0000 (13:21 +0000)]
Merge "Fix mips build after sharpening change."
am:
ae3016324f
Change-Id: I70fcc86a9c2bbd1ecc8e4ac7cb0f5429305b88a7
Treehugger Robot [Fri, 23 Sep 2016 13:17:32 +0000 (13:17 +0000)]
Merge "Fix mips build after sharpening change."
Nicolas Geoffray [Fri, 23 Sep 2016 11:37:48 +0000 (12:37 +0100)]
Fix mips build after sharpening change.
test: m build-art-target
Change-Id: Ie1866a944be351878c7f860c640923bc0029f697
Nicolas Geoffray [Fri, 23 Sep 2016 09:54:02 +0000 (09:54 +0000)]
Merge "Clean-up sharpening and compiler driver."
am:
cbb651fdf2
Change-Id: I5f0a556f72934a00dc24a0bdfb634d5baa0362e5
Treehugger Robot [Fri, 23 Sep 2016 09:49:47 +0000 (09:49 +0000)]
Merge "Clean-up sharpening and compiler driver."
Nicolas Geoffray [Fri, 23 Sep 2016 08:23:26 +0000 (08:23 +0000)]
Merge "Use android_root instead of hard coded /system in test script."
am:
411caada9b
Change-Id: I75157ade60a8f1088707a15b275cf3be8ab13025
Nicolas Geoffray [Fri, 23 Sep 2016 08:19:08 +0000 (08:19 +0000)]
Merge "Use android_root instead of hard coded /system in test script."
Nicolas Geoffray [Thu, 22 Sep 2016 12:17:41 +0000 (13:17 +0100)]
Clean-up sharpening and compiler driver.
Remove dependency on compiler driver for sharpening
and dex2dex (the methods called on the compiler driver were
doing unnecessary work), and remove the now unused methods
in compiler driver.
Also remove test that is now invalid, as sharpening always
succeeds.
test: m test-art-host m test-art-target
Change-Id: I54e91c6839bd5b0b86182f2f43ba5d2c112ef908
Wojciech Staszkiewicz [Fri, 23 Sep 2016 06:40:50 +0000 (06:40 +0000)]
Merge "Prepare run_jfuzz_test.py to report bugs"
am:
ca8bad9136
Change-Id: Iaa785870e47a5a9498def3e2a5a5271442456cd6
Treehugger Robot [Fri, 23 Sep 2016 06:36:10 +0000 (06:36 +0000)]
Merge "Prepare run_jfuzz_test.py to report bugs"
Alex Light [Fri, 23 Sep 2016 00:48:44 +0000 (00:48 +0000)]
Merge "Disable test 902-hello-transformation on target"
am:
35505bfe62
Change-Id: Ib06711ac0e6d7dd4a8d1d961ffbea6efd7726e65
Treehugger Robot [Fri, 23 Sep 2016 00:43:24 +0000 (00:43 +0000)]
Merge "Disable test 902-hello-transformation on target"
Aart Bik [Thu, 22 Sep 2016 20:50:11 +0000 (13:50 -0700)]
Minor jfuzz improvements.
Rationale:
Added simple class hierarchy to jfuzz output (still rather
rudimentary, but at least covers all method invocation kinds).
Also cleaned up the array dimensions logic.
Finally, increased granularity of time-based seeding.
Test: ./tools/jfuzz/run_jfuzz_test.py
Change-Id: I6582a75e5be593ba56146e1cd56f801e85f051c5
Alex Light [Thu, 22 Sep 2016 21:54:33 +0000 (14:54 -0700)]
Disable test 902-hello-transformation on target
This test doesn't work on device at the moment due to restrictions on
the android linker.
Bug:
31681198
Test: mma -j40 test-art-target-run-test-902-hello-transformation
Change-Id: I0ce72aa938a5c274083bcb0c60be5370a2bb02c3
Nicolas Geoffray [Thu, 22 Sep 2016 21:55:58 +0000 (22:55 +0100)]
Use android_root instead of hard coded /system in test script.
The buildbot uses its own ANDROID_ROOT.
Spotted while debugging 902 test failures on target.
Change-Id: I9b2047ce510e93f205771f7384f644450b0325e6
Wojciech Staszkiewicz [Wed, 21 Sep 2016 22:12:54 +0000 (15:12 -0700)]
Prepare run_jfuzz_test.py to report bugs
Adds --report_script and --fuzz_arg switches.
Report script is called for every divergence with title of
divergence, a comment and potentially bisection search output file.
Fuzz args are passed to jfuzz. They can be used to reproduce
previously discovered divergence.
Also add a -v switch to jfuzz. If present jfuzz will print its
version and exit.
Test: ./tools/jfuzz/run_jfuzz_test.py --report_script
$HOME/report_issue.py --fuzz_arg='-s
1470736838'
Change-Id: I25fd305304edfe21071a81d6e1b1b47ae8703007
Sen Jiang [Thu, 22 Sep 2016 17:54:51 +0000 (17:54 +0000)]
Merge "Pass --root to cpplint."
am:
79bd5992ae
Change-Id: I8b10e75da388670fbb45f37e02543590e16bc5c1
Sen Jiang [Thu, 22 Sep 2016 17:49:44 +0000 (17:49 +0000)]
Merge "Pass --root to cpplint."
Roland Levillain [Thu, 22 Sep 2016 12:03:32 +0000 (12:03 +0000)]
Merge "Revert "Revert "ARM: VIXL32: Add an initial code generator that passes codegen_tests."""
am:
9e5f321be4
Change-Id: If37b172c62b3bb1671dacb9ce72325101f9203b0
Roland Levillain [Thu, 22 Sep 2016 11:55:19 +0000 (11:55 +0000)]
Merge "Revert "Revert "ARM: VIXL32: Add an initial code generator that passes codegen_tests."""
Scott Wakeling [Thu, 22 Sep 2016 09:24:38 +0000 (10:24 +0100)]
Revert "Revert "ARM: VIXL32: Add an initial code generator that passes codegen_tests.""
This VIXL32-based code generator is not enabled in the optimizing
compiler by default. Changes in codegen_test.cc test it in parallel with
the existing ARM backend.
This patch provides a base for further work, the new backend will not
be enabled in the optimizing compiler until parity is proven with the
current ARM backend and assembler.
Test: gtest-codegen_test on host and target
This reverts commit
7863a2152865a12ad9593d8caad32698264153c1.
Change-Id: Ia09627bac22e78732ca982d207dc0b00bda435bb
Benoit Lamarche [Thu, 22 Sep 2016 09:41:12 +0000 (09:41 +0000)]
Merge "Ensure Jack generates annotations for test 005-annotations"
am:
7e242e2972
Change-Id: I8796f2a962efb1c2d610178f326a8a23de07a025
Benoit Lamarche [Thu, 22 Sep 2016 09:40:57 +0000 (09:40 +0000)]
Merge "Update art tests"
am:
4670b99a26
Change-Id: I73a4f08f0bee709b2168616d980fcfcd04a87375
Benoit Lamarche [Thu, 22 Sep 2016 09:34:26 +0000 (09:34 +0000)]
Merge "Ensure Jack generates annotations for test 005-annotations"
Benoit Lamarche [Thu, 22 Sep 2016 09:34:26 +0000 (09:34 +0000)]
Merge "Update art tests"
Dan Albert [Thu, 22 Sep 2016 08:18:31 +0000 (08:18 +0000)]
Merge "Don't warn for frame size in tests."
am:
45026e4548
Change-Id: I7fc12cda5a729607a7ad2a52208241d94d525d4e
Aart Bik [Thu, 22 Sep 2016 08:18:16 +0000 (08:18 +0000)]
Merge "Renaming tool: jfuzz"
am:
eb82e99525
Change-Id: I4d4603d0c2d47dac3232265342836d9dd3fed705
Mathieu Chartier [Thu, 22 Sep 2016 08:18:01 +0000 (08:18 +0000)]
Merge "Make image test multi image"
am:
764f38f939
Change-Id: Ib5e074340af35292d903c798fe8a00fc99a610f9
Alex Light [Thu, 22 Sep 2016 08:17:46 +0000 (08:17 +0000)]
Merge "Get a basic modification of dex file working"
am:
4b55b4b39a
Change-Id: I7c015be6efb9a7f824f91212ea3d3865f4e19ec3
Treehugger Robot [Thu, 22 Sep 2016 05:38:51 +0000 (05:38 +0000)]
Merge "Don't warn for frame size in tests."
Treehugger Robot [Thu, 22 Sep 2016 05:16:42 +0000 (05:16 +0000)]
Merge "Renaming tool: jfuzz"
Treehugger Robot [Thu, 22 Sep 2016 03:43:55 +0000 (03:43 +0000)]
Merge "Make image test multi image"
Mathieu Chartier [Wed, 21 Sep 2016 22:24:18 +0000 (15:24 -0700)]
Make image test multi image
Required for testing multi image layout in future CLs.
Bug:
28640955
Test: clean-oat-host, test-art-host, device booting
(cherry picked from commit
25adcfb7dc81131add3a0a681ae18bced6f7a0e0)
Change-Id: I14809f56e711b4a87e01056c327eddbbd087f4ee
Aart Bik [Wed, 21 Sep 2016 22:45:18 +0000 (15:45 -0700)]
Renaming tool: jfuzz
Test: run_jfuzz_test.py
Change-Id: I0efa31c3f1c30344c796a9077488e7e467d2456e
Treehugger Robot [Thu, 22 Sep 2016 01:06:27 +0000 (01:06 +0000)]
Merge "Get a basic modification of dex file working"
Igor Murashkin [Thu, 22 Sep 2016 00:45:30 +0000 (00:45 +0000)]
Merge "jni: Implement generic JNI support for @CriticalNative/@FastNative"
am:
524dfe8086
Change-Id: Ibaaedfb421087af6fc2bca83335ed04d8e1a6f96
Treehugger Robot [Thu, 22 Sep 2016 00:37:06 +0000 (00:37 +0000)]
Merge "jni: Implement generic JNI support for @CriticalNative/@FastNative"
Sen Jiang [Wed, 21 Sep 2016 23:58:11 +0000 (16:58 -0700)]
Pass --root to cpplint.
cpplint looks for .git to detect root, but in gitc, there's no art/.git
unless I repo start in art/ first, but I'm not working on art and
checkbuild fails in gitc because of this.
Bug: None
Test: mma in art/ in gitc
Change-Id: I6d418979a9bdceefc7a2c19297a7cc9aacb3e83f
Colin Cross [Wed, 21 Sep 2016 23:11:03 +0000 (23:11 +0000)]
Merge "Reimplement ART_NDEBUG_OPT_FLAG"
am:
16cb669007
Change-Id: I267b386a43ce1bb76d837336b82e2a74865c007b
Treehugger Robot [Wed, 21 Sep 2016 22:55:25 +0000 (22:55 +0000)]
Merge "Reimplement ART_NDEBUG_OPT_FLAG"
Alex Light [Tue, 23 Aug 2016 22:05:12 +0000 (15:05 -0700)]
Get a basic modification of dex file working
This allows the modification of a single classes methods through
transformation. One must ensure that the provided dex file only
contains one function and does not add or remove any methods or fields
and does not change the inheritance hierarchy in any way. The provided
dex file must verify and there must be no frames of the old code
present on any thread. These constraints are not checked or verified.
Breaking them might cause undefined behavior in all parts of the
runtime. Code that has been inlined in any way might not be replaced.
This feature is extremely experimental.
Bug:
31455788
Test: ./test/run-test --host 902-hello-transformation
Change-Id: I35133d24f6cdafdd2af9dc9863e15ba8493fc50e
Aart Bik [Wed, 21 Sep 2016 22:01:20 +0000 (22:01 +0000)]
Merge "Implemented first version of java/dex fuzz testing script."
am:
a51a135f11
Change-Id: Ib279fe9a90a39f272de296a8a68e474c37942a9d
Dan Albert [Wed, 21 Sep 2016 21:56:51 +0000 (14:56 -0700)]
Don't warn for frame size in tests.
The libc++ update I'm working on trips this (seems to be related to
string constructors now being inlined, but I can't say for sure). ART
itself is still under the limits.
Test: mm
Bug: None
Change-Id: Ic23c3e3aadc8db625767d8ecc727aec84f1e4603
Treehugger Robot [Wed, 21 Sep 2016 21:55:59 +0000 (21:55 +0000)]
Merge "Implemented first version of java/dex fuzz testing script."
Igor Murashkin [Tue, 13 Sep 2016 22:57:37 +0000 (15:57 -0700)]
jni: Implement generic JNI support for @CriticalNative/@FastNative
Also:
* Extend existing test cases to check generic JNI for the above.
* Re-enable previously blacklisted @CriticalNative JNI run-tests.
Bug:
31400248
Change-Id: I436ed00c8b8880e936a0c3483bc0dc251f0c0ce2
Colin Cross [Wed, 21 Sep 2016 20:23:53 +0000 (13:23 -0700)]
Reimplement ART_NDEBUG_OPT_FLAG
Use ART_NDEBUG_OPT_FLAG or ART_DEBUG_OPT_FLAG to override the default -O
compiler arguments.
Fixes:
31653144
Test: mmma -j art
Test: m -j dex2oat dex2oatd ART_NDEBUG_OPT_FLAG=-O1 ART_DEBUG_OPT_FLAG=-O0
Change-Id: I9d48d94f5e262148ddac5c70068144a645ac9566
Colin Cross [Wed, 21 Sep 2016 19:35:49 +0000 (19:35 +0000)]
Merge "Remove unused build code"
am:
32e2826a02
Change-Id: I50ca63f7e274fbd840f16219e7a74e717f20b690
Colin Cross [Wed, 21 Sep 2016 19:32:01 +0000 (19:32 +0000)]
Merge "Remove unused build code"
Nicolas Geoffray [Wed, 21 Sep 2016 16:54:51 +0000 (16:54 +0000)]
Merge "Revert "ARM: VIXL32: Add an initial code generator that passes codegen_tests.""
am:
be0f728348
Change-Id: I1985b4b78d949d2b6066fd4712b597a899b424a7
David Sehr [Wed, 21 Sep 2016 16:54:37 +0000 (16:54 +0000)]
Merge "Refactor Dex open methods"
am:
ce092d0e37
Change-Id: I21202751731387d3eb3c41d26fc182b46557f8ce
David Brazdil [Wed, 21 Sep 2016 16:54:16 +0000 (16:54 +0000)]
Merge "Write VerifierDeps into VDEX."
am:
85bf9def7f
Change-Id: I3c42cabe73265c6cae5a59a7f81e9f42afafb1bd
David Brazdil [Wed, 21 Sep 2016 16:54:15 +0000 (16:54 +0000)]
Write VerifierDeps into VDEX.
am:
5d5a36bddb
Change-Id: Ia7052d356c2a80689f23fce38ef08fac9cb85db0
Nicolas Geoffray [Wed, 21 Sep 2016 16:53:31 +0000 (16:53 +0000)]
Merge "Revert "ARM: VIXL32: Add an initial code generator that passes codegen_tests.""
Treehugger Robot [Wed, 21 Sep 2016 16:53:26 +0000 (16:53 +0000)]
Merge "Refactor Dex open methods"
Nicolas Geoffray [Wed, 21 Sep 2016 16:53:03 +0000 (16:53 +0000)]
Revert "ARM: VIXL32: Add an initial code generator that passes codegen_tests."
Failing with:
art/compiler/optimizing/code_generator_arm_vixl.cc:396:47: error: too few arguments to function call, expected 3, have 2
ValidateInvokeRuntime(instruction, slow_path);
This reverts commit
b138dfbd76f9d8b64fb9dbaf1a7c25e2549b2a8c.
Change-Id: Idccfe076f5905ea92ecbe3afbc7c8c64ecda94be
Treehugger Robot [Wed, 21 Sep 2016 16:51:57 +0000 (16:51 +0000)]
Merge "Write VerifierDeps into VDEX."
Roland Levillain [Wed, 21 Sep 2016 16:35:43 +0000 (16:35 +0000)]
Merge "ARM: VIXL32: Add an initial code generator that passes codegen_tests."
am:
d26a0a64d0
Change-Id: I75172c710cdebd8f5b7fa1c7c19407ad6b0946a8
Roland Levillain [Wed, 21 Sep 2016 16:32:59 +0000 (16:32 +0000)]
Merge "ARM: VIXL32: Add an initial code generator that passes codegen_tests."
Aart Bik [Tue, 20 Sep 2016 21:34:13 +0000 (14:34 -0700)]
Implemented first version of java/dex fuzz testing script.
Test: run_dex_fuzz_test.py
Change-Id: I94bd6c39d8219bcf3ba0150f5537a9690f2820b5
Neil Fuller [Wed, 21 Sep 2016 16:18:48 +0000 (16:18 +0000)]
Merge "Collapse ART's AbstractMethod class into Executable"
am:
7b0d9228e9
Change-Id: I8db4d6e25bb9a14fac0940b779852dd3bc4d4031
Neil Fuller [Wed, 21 Sep 2016 16:16:53 +0000 (16:16 +0000)]
Collapse ART's AbstractMethod class into Executable
am:
0e8443995a
Change-Id: I69bcb686be32b3266af2c0491bca0937788f502a
Neil Fuller [Wed, 21 Sep 2016 16:01:56 +0000 (16:01 +0000)]
Merge "Collapse ART's AbstractMethod class into Executable"
David Brazdil [Wed, 14 Sep 2016 14:34:10 +0000 (15:34 +0100)]
Write VerifierDeps into VDEX.
This patch serializes VerifierDeps data and writes them into VDEX.
It also extends the VDEX header with sizes of the DEX and verifier
dependencies sections.
Bug:
30937355
Change-Id: I5aa5fc5eb8678533117138e445b757fa771973fb
Robert Sesek [Mon, 15 Aug 2016 19:21:09 +0000 (15:21 -0400)]
Add CanWriteToDalvikCache() check before writing a boot marker or image cache.
A new zygote process, the webview_zygote, will spawn isolated_app children,
but the process itself does not run as root and cannot write to the dalvik
cache. In order to not print SELinux avc errors, check for file-write
permission when testing to see if a boot marker or cache image or should be
written.
Test: m test-art
Test: angler boots
Bug:
21643067
Change-Id: I9f797fe7332a21ef4c6b83d2210b1673af09de1b
David Sehr [Mon, 19 Sep 2016 22:02:18 +0000 (15:02 -0700)]
Refactor Dex open methods
Consolidate dex opening around a simpler single interface in DexFile.
Making this change prior to moving all but the simplest interface out of
dex_file.{cc,h}.
Bug:
22322814
Change-Id: I4c55019912a19a1c90f9022c20f5b8b954fc7a47
Test: test-art-{host,target}
Roland Levillain [Wed, 21 Sep 2016 14:52:02 +0000 (14:52 +0000)]
Merge "Re-enable jsr166.LinkedTransferQueueTest tests on the CC configuration."
am:
abc41cb0e4
Change-Id: I2adeb9f913f3bf744ec657ecd0ca4655519d6a20
Roland Levillain [Wed, 21 Sep 2016 14:47:03 +0000 (14:47 +0000)]
Merge "Re-enable jsr166.LinkedTransferQueueTest tests on the CC configuration."
Roland Levillain [Wed, 21 Sep 2016 12:48:26 +0000 (13:48 +0100)]
Re-enable jsr166.LinkedTransferQueueTest tests on the CC configuration.
Test: art/tools/run-libcore-tests.sh --mode=host --variant=X32 --debug
Bug:
25883050
Bug:
12687968
Change-Id: I2eb40d70882cb3a6a3b5534c92d37a4b31b89859
Sebastien Hertz [Mon, 1 Aug 2016 09:09:50 +0000 (11:09 +0200)]
Update art tests
Jack generates different code compared to the previous release so
some tests need to be updated. For instance, Jack transform '!cond'
into 'cond xor 1'.
The test 463-checker-boolean-simplifier still tests the if/else
pattern using smali.
(cherry picked from commit
e4d28c502486afe58a0e156b8fefb621a622cec2)
Bug:
29493697
Test: lunch aosp_bullhead-userdebug && make -j32
Test: make -j32 test-art-host && make -j32 test-art-target
Test: art/tools/run-jdwp-tests.sh --mode=host
Change-Id: Ief8ac3e9a4bcaa35c99e57161961d630333d3b3c
Neil Fuller [Thu, 8 Sep 2016 12:43:31 +0000 (13:43 +0100)]
Collapse ART's AbstractMethod class into Executable
After the OpenJDK 8 pull there is now a common base class
for Method and Constructor that can be used instead.
Methods that are abstract on Executable but on Android
were implemented in AbstractMethod are now consistently
renamed to "{method}Internal", declared final and
given package-protected access.
For consistency with all other private, natively
implemented methods, the method getDeclaredAnnotations()
has been renamed getDeclaredAnnotationsNative().
Bug:
28666126
Bug:
31052885
Test: make test-art-host and cts run of CtsLibcoreTestCases
Change-Id: Ibfe6af6a47fe0cfffd0859ffbe58980aeb84e053
David Sehr [Tue, 20 Sep 2016 23:17:47 +0000 (23:17 +0000)]
Merge "Fix the target art method address within a method object"
am:
c4cb3d532d
Change-Id: I2940983654411585f66c8094b84f2933cac365e1
David Sehr [Tue, 20 Sep 2016 23:15:18 +0000 (23:15 +0000)]
Merge "Fix the target art method address within a method object"
Colin Cross [Tue, 20 Sep 2016 16:54:58 +0000 (09:54 -0700)]
Remove unused build code
All of the native code in art that used the custom build logic is built
with soong now, remove the make build code, leaving the definitions that
are still used by the test runner.
Test: m -j test-art-host
Test: m -j test-art-target
Change-Id: Iaba34a5c52be007bea153401375f4d0ae3ffce06
Wojciech Staszkiewicz [Tue, 20 Sep 2016 22:03:01 +0000 (22:03 +0000)]
Merge "Rework logcat handling"
am:
f6dc081999
Change-Id: Ic3ecfcb9a142852c3fbe5ecabbb2843bc5492d36
Treehugger Robot [Tue, 20 Sep 2016 22:00:19 +0000 (22:00 +0000)]
Merge "Rework logcat handling"
Alex Light [Tue, 20 Sep 2016 21:55:29 +0000 (21:55 +0000)]
Merge "Rename several tests to be easier to read."
am:
ce644e8446
Change-Id: I54279c04857f228ae18895feebf68c8faaf83fee
Treehugger Robot [Tue, 20 Sep 2016 21:52:18 +0000 (21:52 +0000)]
Merge "Rename several tests to be easier to read."
Jeff Hao [Tue, 20 Sep 2016 21:02:49 +0000 (21:02 +0000)]
Merge "Dexlayout changes to support offset/size output of items."
am:
d050ec91c0
Change-Id: I4ee9dde68080152e8a8b95f46ce5e29dd3d9276e