OSDN Git Service

android-x86/art.git
7 years agoMerge "Revert "Revert "Load the array class in the compiler for allocations.""" am...
Nicolas Geoffray [Thu, 19 Jan 2017 11:31:10 +0000 (11:31 +0000)]
Merge "Revert "Revert "Load the array class in the compiler for allocations.""" am: 2f670ccba0 am: 24adeb9496
am: 2b5b73e370

Change-Id: I97ddc4ad0b47800fafd2cbd528a268827161aa37

7 years agoMerge "Revert "Revert "Load the array class in the compiler for allocations.""" am...
Nicolas Geoffray [Thu, 19 Jan 2017 11:26:39 +0000 (11:26 +0000)]
Merge "Revert "Revert "Load the array class in the compiler for allocations.""" am: 2f670ccba0
am: 24adeb9496

Change-Id: Id1016a81237319e3307274bb605a79bed6586996

7 years agoMerge "Revert "Revert "Load the array class in the compiler for allocations."""
Nicolas Geoffray [Thu, 19 Jan 2017 11:22:09 +0000 (11:22 +0000)]
Merge "Revert "Revert "Load the array class in the compiler for allocations."""
am: 2f670ccba0

Change-Id: I1657a9287cb391240dbd7762ee12ecb2adf2c8d6

7 years agoMerge "Revert "Revert "Load the array class in the compiler for allocations."""
Nicolas Geoffray [Thu, 19 Jan 2017 11:15:05 +0000 (11:15 +0000)]
Merge "Revert "Revert "Load the array class in the compiler for allocations."""

7 years agoMerge "Revert^3 "Remove unused code for patching oat files."" am: fcb6e39157 am:...
Richard Uhler [Thu, 19 Jan 2017 11:06:38 +0000 (11:06 +0000)]
Merge "Revert^3 "Remove unused code for patching oat files."" am: fcb6e39157 am: a6a31aa19e
am: 3bb5394647

Change-Id: I483cf8160bf1c545d80cdcf040a60985f8e11c21

7 years agoMerge "Revert^3 "Remove unused code for patching oat files."" am: fcb6e39157
Richard Uhler [Thu, 19 Jan 2017 11:04:09 +0000 (11:04 +0000)]
Merge "Revert^3 "Remove unused code for patching oat files."" am: fcb6e39157
am: a6a31aa19e

Change-Id: I241b079ec4fc8130e9f798957a1b6d345e38cb73

7 years agoMerge "Revert^3 "Remove unused code for patching oat files.""
Richard Uhler [Thu, 19 Jan 2017 11:01:37 +0000 (11:01 +0000)]
Merge "Revert^3 "Remove unused code for patching oat files.""
am: fcb6e39157

Change-Id: Ia38bf92b639e10460b33e7bb7e789bf58f7f06d9

7 years agoMerge "Revert^3 "Remove unused code for patching oat files.""
Richard Uhler [Thu, 19 Jan 2017 10:57:52 +0000 (10:57 +0000)]
Merge "Revert^3 "Remove unused code for patching oat files.""

7 years agoRevert^3 "Remove unused code for patching oat files."
Richard Uhler [Thu, 19 Jan 2017 10:53:59 +0000 (10:53 +0000)]
Revert^3 "Remove unused code for patching oat files."

This reverts commit e7ec8b25dd6ac1b8ad8a68f808048bd6a61138f0.
Because tests are failing.

Bug: 33192586

Change-Id: I3e575c6c037873195c2177241153e3646d58e8a6

7 years agoMerge "ART: Improve class initializer and constructor verification." am: 9e8c8ca2d4...
Orion Hodson [Thu, 19 Jan 2017 10:43:37 +0000 (10:43 +0000)]
Merge "ART: Improve class initializer and constructor verification." am: 9e8c8ca2d4 am: dc1a8b5d92
am: e82e0703ca

Change-Id: I5ebc3055847d022fc5678f185f2dcdcac7e30a3f

7 years agoMerge "ART: Improve class initializer and constructor verification." am: 9e8c8ca2d4
Orion Hodson [Thu, 19 Jan 2017 10:41:06 +0000 (10:41 +0000)]
Merge "ART: Improve class initializer and constructor verification." am: 9e8c8ca2d4
am: dc1a8b5d92

Change-Id: Ifa322f78b38c6b275aafa956c556fe0b6ac6bde8

7 years agoMerge "ART: Improve class initializer and constructor verification."
Orion Hodson [Thu, 19 Jan 2017 10:39:06 +0000 (10:39 +0000)]
Merge "ART: Improve class initializer and constructor verification."
am: 9e8c8ca2d4

Change-Id: I00c27affa667472bf42ff59692a346efdc732688

7 years agoMerge "ART: Improve class initializer and constructor verification."
Treehugger Robot [Thu, 19 Jan 2017 10:35:47 +0000 (10:35 +0000)]
Merge "ART: Improve class initializer and constructor verification."

7 years agoMerge "Revert "Revert "Remove unused code for patching oat files.""" am: ee64b4d83a...
Richard Uhler [Thu, 19 Jan 2017 09:49:03 +0000 (09:49 +0000)]
Merge "Revert "Revert "Remove unused code for patching oat files.""" am: ee64b4d83a am: cb41e2692e
am: 2e5baf01c9

Change-Id: Ib24e2fd5c8cfd2b31d0687ebf46750a914a471ad

7 years agoMerge "Revert "Revert "Remove unused code for patching oat files.""" am: ee64b4d83a
Richard Uhler [Thu, 19 Jan 2017 09:47:04 +0000 (09:47 +0000)]
Merge "Revert "Revert "Remove unused code for patching oat files.""" am: ee64b4d83a
am: cb41e2692e

Change-Id: I32af4bac8ea061eea75b3609b98e2dde611d14fc

7 years agoMerge "Revert "Revert "Remove unused code for patching oat files."""
Richard Uhler [Thu, 19 Jan 2017 09:45:03 +0000 (09:45 +0000)]
Merge "Revert "Revert "Remove unused code for patching oat files."""
am: ee64b4d83a

Change-Id: I2b61ea5c8bc7518544ca7a42dda18a22553c6533

7 years agoMerge "Revert "Revert "Remove unused code for patching oat files."""
Treehugger Robot [Thu, 19 Jan 2017 09:40:34 +0000 (09:40 +0000)]
Merge "Revert "Revert "Remove unused code for patching oat files."""

7 years agoRevert "Revert "Load the array class in the compiler for allocations.""
Nicolas Geoffray [Thu, 19 Jan 2017 08:59:37 +0000 (08:59 +0000)]
Revert "Revert "Load the array class in the compiler for allocations.""

This reverts commit fee255039e30c1c3dfc70c426c3d176221c3cdf9.

Change-Id: I02b45f9a659d872feeb35df40b42c1be9878413a

7 years agoMerge "Revert "ART: Start RuntimeCallbacks"" am: 44751efea1 am: 16ff8f0e3f
Nicolas Geoffray [Thu, 19 Jan 2017 09:11:32 +0000 (09:11 +0000)]
Merge "Revert "ART: Start RuntimeCallbacks"" am: 44751efea1 am: 16ff8f0e3f
am: 2fc54ef72b

Change-Id: I06f8325b037902150f659dd33f0d048024285052

7 years agoMerge "Revert "ART: Start RuntimeCallbacks"" am: 44751efea1
Nicolas Geoffray [Thu, 19 Jan 2017 09:09:01 +0000 (09:09 +0000)]
Merge "Revert "ART: Start RuntimeCallbacks"" am: 44751efea1
am: 16ff8f0e3f

Change-Id: I42658d82ec641ab557b0dd7886461abced6032b2

7 years agoMerge "Revert "ART: Start RuntimeCallbacks""
Nicolas Geoffray [Thu, 19 Jan 2017 09:07:01 +0000 (09:07 +0000)]
Merge "Revert "ART: Start RuntimeCallbacks""
am: 44751efea1

Change-Id: I4345c4a2ae676c1a9d66f478a3bd6e369bfbd4ef

7 years agoMerge "Revert "ART: Start RuntimeCallbacks""
Nicolas Geoffray [Thu, 19 Jan 2017 09:03:12 +0000 (09:03 +0000)]
Merge "Revert "ART: Start RuntimeCallbacks""

7 years agoRevert "ART: Start RuntimeCallbacks"
Nicolas Geoffray [Thu, 19 Jan 2017 09:02:50 +0000 (09:02 +0000)]
Revert "ART: Start RuntimeCallbacks"

jdwp tests failing with:
    STDERR> dalvikvm32 E 01-18 23:14:50 12180 12198 thread-inl.h:137] holding "runtime callbacks lock" at point where thread suspension is expected

Bug: 31684920

This reverts commit 13093d455b8266338fd713b04261c58e9dc2b164.

Change-Id: I94e4154e273d006eecdd485607dcfd96392d6a00

7 years agoART: Improve class initializer and constructor verification.
Orion Hodson [Wed, 21 Sep 2016 14:41:06 +0000 (15:41 +0100)]
ART: Improve class initializer and constructor verification.

DEX file verifier checks additional properties of class initializers
and constructors:

(i) Names match expected <clinit> / <init>.
(ii) The method descriptor for <clinit> is ()V.
(iii) The return type of <init> is V.
(iV) No other names start with '<'.

Bug:  31313719
Change-Id: I60bffa6561e1bae353f97c42377ea556bfa790af
Test: m test-art-host-gtest-dex_file_verifier_test

7 years agoMerge "Revert "Load the array class in the compiler for allocations."" am: b0355130e3...
Hiroshi Yamauchi [Thu, 19 Jan 2017 03:49:12 +0000 (03:49 +0000)]
Merge "Revert "Load the array class in the compiler for allocations."" am: b0355130e3 am: 94a4546721
am: 728e6e1f5e

Change-Id: I151dd99c0f63c9059a378c80f63d2284661c0c64

7 years agoMerge "Revert "Load the array class in the compiler for allocations."" am: b0355130e3
Hiroshi Yamauchi [Thu, 19 Jan 2017 03:46:40 +0000 (03:46 +0000)]
Merge "Revert "Load the array class in the compiler for allocations."" am: b0355130e3
am: 94a4546721

Change-Id: If55f290228e4372fabfa66bff2354ce85fa9efde

7 years agoMerge "Revert "Load the array class in the compiler for allocations.""
Hiroshi Yamauchi [Thu, 19 Jan 2017 03:44:11 +0000 (03:44 +0000)]
Merge "Revert "Load the array class in the compiler for allocations.""
am: b0355130e3

Change-Id: I4a49af6e60d2efe41dfaee395ca93fc7b0ceee52

7 years agoMerge "Revert "Load the array class in the compiler for allocations.""
Treehugger Robot [Thu, 19 Jan 2017 03:37:11 +0000 (03:37 +0000)]
Merge "Revert "Load the array class in the compiler for allocations.""

7 years agoMerge "ART: Note CC configuration down into oat files" am: 0157eee15c am: c12c72fb2e
Andreas Gampe [Thu, 19 Jan 2017 02:18:18 +0000 (02:18 +0000)]
Merge "ART: Note CC configuration down into oat files" am: 0157eee15c am: c12c72fb2e
am: a127488a9a

Change-Id: I97773abbad38a1db66b780cf1fa999e1412b547f

7 years agoART: Note CC configuration down into oat files am: f8cd890d86 am: 11d469d2b7
Andreas Gampe [Thu, 19 Jan 2017 02:18:05 +0000 (02:18 +0000)]
ART: Note CC configuration down into oat files am: f8cd890d86 am: 11d469d2b7
am: e3b5a59dd9

Change-Id: I61d2f79b99bd265909c251ac5cf45b6996f2a86b

7 years agoMerge "ART: Note CC configuration down into oat files" am: 0157eee15c
Andreas Gampe [Thu, 19 Jan 2017 02:16:17 +0000 (02:16 +0000)]
Merge "ART: Note CC configuration down into oat files" am: 0157eee15c
am: c12c72fb2e

Change-Id: Idbaa3fac5a34c7e09ef6fd94a89c87028c311369

7 years agoART: Note CC configuration down into oat files am: f8cd890d86
Andreas Gampe [Thu, 19 Jan 2017 02:16:04 +0000 (02:16 +0000)]
ART: Note CC configuration down into oat files am: f8cd890d86
am: 11d469d2b7

Change-Id: I925d6db4330962a5ebb90da1f16c5cd318940bb5

7 years agoMerge "ART: Note CC configuration down into oat files"
Andreas Gampe [Thu, 19 Jan 2017 02:14:05 +0000 (02:14 +0000)]
Merge "ART: Note CC configuration down into oat files"
am: 0157eee15c

Change-Id: I3f8c004ee7e39ee127630d627c88a35f84f413c2

7 years agoART: Note CC configuration down into oat files
Andreas Gampe [Thu, 19 Jan 2017 02:14:04 +0000 (02:14 +0000)]
ART: Note CC configuration down into oat files
am: f8cd890d86

Change-Id: I9576d4b8f9a2d86b83d6f77ef41ab51a48d022d9

7 years agoRevert "Load the array class in the compiler for allocations."
Hiroshi Yamauchi [Thu, 19 Jan 2017 02:11:15 +0000 (02:11 +0000)]
Revert "Load the array class in the compiler for allocations."

libcore test fails.

This reverts commit cc99df230feb46ba717252f002d0cc2da6828421.

Change-Id: I5bac595acd2b240886062e8c1f11f9095ff6a9ed

7 years agoMerge "ART: Note CC configuration down into oat files"
Treehugger Robot [Thu, 19 Jan 2017 02:10:20 +0000 (02:10 +0000)]
Merge "ART: Note CC configuration down into oat files"

7 years agoMerge "Split ArtJvmtiEvent::kClassFileLoadHook in two." am: 1a901eff5e am: 1fbb64b2d6
Alex Light [Thu, 19 Jan 2017 01:36:03 +0000 (01:36 +0000)]
Merge "Split ArtJvmtiEvent::kClassFileLoadHook in two." am: 1a901eff5e am: 1fbb64b2d6
am: 88e6837437

Change-Id: I4662ff07e998e49fcc85dbd09576057607834cdf

7 years agoMerge "Split ArtJvmtiEvent::kClassFileLoadHook in two." am: 1a901eff5e
Alex Light [Thu, 19 Jan 2017 01:34:03 +0000 (01:34 +0000)]
Merge "Split ArtJvmtiEvent::kClassFileLoadHook in two." am: 1a901eff5e
am: 1fbb64b2d6

Change-Id: I140e8953475f478a1029c7013f415efdb7f1b110

7 years agoMerge "Split ArtJvmtiEvent::kClassFileLoadHook in two."
Alex Light [Thu, 19 Jan 2017 01:32:02 +0000 (01:32 +0000)]
Merge "Split ArtJvmtiEvent::kClassFileLoadHook in two."
am: 1a901eff5e

Change-Id: Ia6e13ca4b2dfa2258f29e806d3d10efe04b7248e

7 years agoMerge "Split ArtJvmtiEvent::kClassFileLoadHook in two."
Treehugger Robot [Thu, 19 Jan 2017 01:24:24 +0000 (01:24 +0000)]
Merge "Split ArtJvmtiEvent::kClassFileLoadHook in two."

7 years agoART: Note CC configuration down into oat files
Andreas Gampe [Thu, 19 Jan 2017 00:05:01 +0000 (16:05 -0800)]
ART: Note CC configuration down into oat files

To detect changes in configuration, write the runtime configuration
of ART_USE_READ_BARRIER into the oat file key-value store.

Bug: 34084559
Bug: 12687968
Test: m test-art-host
Test: m ART_USE_READ_BARRIER=true test-art-host
Change-Id: I0b2bd9aa5546538e2b4b669b0acc0a4bebfd7bf0

7 years agoMerge "ART: Start RuntimeCallbacks" am: a7e64f00df am: 7ad9d39198
Andreas Gampe [Wed, 18 Jan 2017 23:03:54 +0000 (23:03 +0000)]
Merge "ART: Start RuntimeCallbacks" am: a7e64f00df am: 7ad9d39198
am: 7f6193f4e7

Change-Id: I7966837489cf795dfae39e0b73a5b6e4ede9136c

7 years agoMerge "ART: Start RuntimeCallbacks" am: a7e64f00df
Andreas Gampe [Wed, 18 Jan 2017 23:01:24 +0000 (23:01 +0000)]
Merge "ART: Start RuntimeCallbacks" am: a7e64f00df
am: 7ad9d39198

Change-Id: I337f2b1051e87303e04d97ca66b5daa74fb92627

7 years agoMerge "ART: Start RuntimeCallbacks"
Andreas Gampe [Wed, 18 Jan 2017 22:59:22 +0000 (22:59 +0000)]
Merge "ART: Start RuntimeCallbacks"
am: a7e64f00df

Change-Id: I34c7a98c33de5e03ac61ac8f43e387691a231888

7 years agoMerge "ART: Start RuntimeCallbacks"
Treehugger Robot [Wed, 18 Jan 2017 22:52:26 +0000 (22:52 +0000)]
Merge "ART: Start RuntimeCallbacks"

7 years agoSplit ArtJvmtiEvent::kClassFileLoadHook in two.
Alex Light [Wed, 18 Jan 2017 19:17:47 +0000 (11:17 -0800)]
Split ArtJvmtiEvent::kClassFileLoadHook in two.

Since the ClassFileLoadHook event is sent to different environments
based on when it is invoked we split the event in two behind the
scenes. The event dispatcher is responsible for making sure that
either or both of the appropriate underlying events are invoked when a
JVMTI_EVENT_CLASS_FILE_LOAD_HOOK is sent.

We also make sure to modify the EventHandler so it sends the correct
events in the correct places when an environment changes its
capabilities.

Bug: 32369913
Bug: 31684920

Test: mma -j40 test-art-host

Change-Id: I82567fc66debe0b658e8d7fced6284a8c4355b7a

7 years agoMerge "Refactor jvmtiEvent so we can add to it." am: 5d61614eda am: ff6f65a21b
Alex Light [Wed, 18 Jan 2017 20:55:39 +0000 (20:55 +0000)]
Merge "Refactor jvmtiEvent so we can add to it." am: 5d61614eda am: ff6f65a21b
am: 98c650ccb7

Change-Id: Iabc31eabe4600b24b69141e24ee2d9bd92dd3092

7 years agoMerge "Refactor jvmtiEvent so we can add to it." am: 5d61614eda
Alex Light [Wed, 18 Jan 2017 20:53:08 +0000 (20:53 +0000)]
Merge "Refactor jvmtiEvent so we can add to it." am: 5d61614eda
am: ff6f65a21b

Change-Id: I3a17f525e750a5edbf34378919274f4b6287d200

7 years agoMerge "Refactor jvmtiEvent so we can add to it."
Alex Light [Wed, 18 Jan 2017 20:51:08 +0000 (20:51 +0000)]
Merge "Refactor jvmtiEvent so we can add to it."
am: 5d61614eda

Change-Id: I44a8c4dc8556811cfab56759dd593599347eddc8

7 years agoMerge "Fix check failure in ConcurrentCopying::IssueEmptyCheckpoint()." am: 3f38eb44e...
Hiroshi Yamauchi [Wed, 18 Jan 2017 20:51:08 +0000 (20:51 +0000)]
Merge "Fix check failure in ConcurrentCopying::IssueEmptyCheckpoint()." am: 3f38eb44ee am: f970262387
am: 8887010354

Change-Id: Iea7a40378975c8f12fe6da403b4472c1c03e5964

7 years agoMerge "Fix check failure in ConcurrentCopying::IssueEmptyCheckpoint()." am: 3f38eb44ee
Hiroshi Yamauchi [Wed, 18 Jan 2017 20:49:08 +0000 (20:49 +0000)]
Merge "Fix check failure in ConcurrentCopying::IssueEmptyCheckpoint()." am: 3f38eb44ee
am: f970262387

Change-Id: I8aec9586df52364f8ea71aa52a00b07d504005ee

7 years agoMerge "Refactor jvmtiEvent so we can add to it."
Treehugger Robot [Wed, 18 Jan 2017 20:47:13 +0000 (20:47 +0000)]
Merge "Refactor jvmtiEvent so we can add to it."

7 years agoMerge "Fix check failure in ConcurrentCopying::IssueEmptyCheckpoint()."
Hiroshi Yamauchi [Wed, 18 Jan 2017 20:47:09 +0000 (20:47 +0000)]
Merge "Fix check failure in ConcurrentCopying::IssueEmptyCheckpoint()."
am: 3f38eb44ee

Change-Id: I853281d378a35f7021cb77f739baa61db1fe0542

7 years agoMerge "Fix check failure in ConcurrentCopying::IssueEmptyCheckpoint()."
Treehugger Robot [Wed, 18 Jan 2017 20:43:01 +0000 (20:43 +0000)]
Merge "Fix check failure in ConcurrentCopying::IssueEmptyCheckpoint()."

7 years agoART: Start RuntimeCallbacks
Andreas Gampe [Wed, 18 Jan 2017 05:40:35 +0000 (21:40 -0800)]
ART: Start RuntimeCallbacks

Add a central RuntimeCallbacks structure to handle certain interesting
runtime events.

In a first iteration, add ThreadLifecycleCallback with ThreadStart and
ThreadStop. Move Dbg over to ThreadLifecycleCallback.

Add a test.

Bug: 31684920
Test: m test-art-host-gtest-runtime_callbacks_test
Test: art/tools/run-jdwp-tests.sh --mode=host
Change-Id: Ie0f77739a563207bfb4f04374e72dc6935c40b4f

7 years agoMerge "ART: Disable test 901 on target" am: d79ae05256 am: 742add4df8
Andreas Gampe [Wed, 18 Jan 2017 19:35:34 +0000 (19:35 +0000)]
Merge "ART: Disable test 901 on target" am: d79ae05256 am: 742add4df8
am: 157b6dca0a

Change-Id: Ied57eb847b198e746c08f9701265d0467433796a

7 years agoMerge "ART: Disable test 901 on target" am: d79ae05256
Andreas Gampe [Wed, 18 Jan 2017 19:33:03 +0000 (19:33 +0000)]
Merge "ART: Disable test 901 on target" am: d79ae05256
am: 742add4df8

Change-Id: Ia3a7c2e21905a94382699c4c510ac0384eda267f

7 years agoMerge "ART: Disable test 901 on target"
Andreas Gampe [Wed, 18 Jan 2017 19:31:03 +0000 (19:31 +0000)]
Merge "ART: Disable test 901 on target"
am: d79ae05256

Change-Id: Ide403397b51e960cdcb8d912daf1515cd8924e46

7 years agoMerge "ART: Disable test 901 on target"
Treehugger Robot [Wed, 18 Jan 2017 19:26:44 +0000 (19:26 +0000)]
Merge "ART: Disable test 901 on target"

7 years agoMerge changes Ib9fafbac,I05d73734,I0e95b0cb am: 66d2d484a0 am: 334e207f02
Andreas Gampe [Wed, 18 Jan 2017 19:04:27 +0000 (19:04 +0000)]
Merge changes Ib9fafbac,I05d73734,I0e95b0cb am: 66d2d484a0 am: 334e207f02
am: 7364c6f616

Change-Id: Ifbefc766d5c3053b22df7230d829e478f1eaf3aa

7 years agoART: Add JNI API am: 6f8e4f0fc3 am: cf24be702e
Andreas Gampe [Wed, 18 Jan 2017 19:04:18 +0000 (19:04 +0000)]
ART: Add JNI API am: 6f8e4f0fc3 am: cf24be702e
am: 1bca8b6fdd

Change-Id: Ife5e79a9e3e4ecc1a1dcd0b797b00dce9dc0cfda

7 years agoRefactor jvmtiEvent so we can add to it.
Alex Light [Wed, 18 Jan 2017 18:27:06 +0000 (10:27 -0800)]
Refactor jvmtiEvent so we can add to it.

Change all code over to using ArtJvmtiEvent from jvmtiEvent so that we
have a way to add additional internal events if the need arises.

Bug: 32369913
Bug: 31684920

Test: mma -j40 test-art-host

Change-Id: I555475048d2e753db8adf317dc1f66d81533cde0

7 years agoART: Align jvmti.h with jni.h am: 0bd1a16e91 am: 21e8fa5333
Andreas Gampe [Wed, 18 Jan 2017 19:04:09 +0000 (19:04 +0000)]
ART: Align jvmti.h with jni.h am: 0bd1a16e91 am: 21e8fa5333
am: 2357c341e4

Change-Id: Ia4de60c63f94a5f6919955ac077088945ed25eff

7 years agoART: Add JNI function table manipulation am: c8089540cc am: 9db4ad49bc
Andreas Gampe [Wed, 18 Jan 2017 19:04:00 +0000 (19:04 +0000)]
ART: Add JNI function table manipulation am: c8089540cc am: 9db4ad49bc
am: e0140ebe0d

Change-Id: I8523bb124fca81725f94f81a1226551a667285f6

7 years agoMerge changes Ib9fafbac,I05d73734,I0e95b0cb am: 66d2d484a0
Andreas Gampe [Wed, 18 Jan 2017 19:02:28 +0000 (19:02 +0000)]
Merge changes Ib9fafbac,I05d73734,I0e95b0cb am: 66d2d484a0
am: 334e207f02

Change-Id: If4db97eba3471e0ce8543fddb7899e56cfe0b40c

7 years agoART: Add JNI API am: 6f8e4f0fc3
Andreas Gampe [Wed, 18 Jan 2017 19:02:19 +0000 (19:02 +0000)]
ART: Add JNI API am: 6f8e4f0fc3
am: cf24be702e

Change-Id: I50c94c9a3756e630f31392de8cb4c7afc3460b62

7 years agoART: Align jvmti.h with jni.h am: 0bd1a16e91
Andreas Gampe [Wed, 18 Jan 2017 19:02:10 +0000 (19:02 +0000)]
ART: Align jvmti.h with jni.h am: 0bd1a16e91
am: 21e8fa5333

Change-Id: I90627c07e003b808297a4c524ea102202c949415

7 years agoART: Add JNI function table manipulation am: c8089540cc
Andreas Gampe [Wed, 18 Jan 2017 19:02:01 +0000 (19:02 +0000)]
ART: Add JNI function table manipulation am: c8089540cc
am: 9db4ad49bc

Change-Id: I150a147e00a0a43f519e9cadb71dab6bc321eb50

7 years agoMerge changes Ib9fafbac,I05d73734,I0e95b0cb
Andreas Gampe [Wed, 18 Jan 2017 18:59:47 +0000 (18:59 +0000)]
Merge changes Ib9fafbac,I05d73734,I0e95b0cb
am: 66d2d484a0

Change-Id: I7474d04d0d4fa60330356c7b150e5dadc7af2540

7 years agoART: Add JNI API
Andreas Gampe [Wed, 18 Jan 2017 18:59:46 +0000 (18:59 +0000)]
ART: Add JNI API
am: 6f8e4f0fc3

Change-Id: I5ed8cbb5a205338d23f11aeb93dcb13eaa726a19

7 years agoART: Align jvmti.h with jni.h
Andreas Gampe [Wed, 18 Jan 2017 18:59:38 +0000 (18:59 +0000)]
ART: Align jvmti.h with jni.h
am: 0bd1a16e91

Change-Id: Iccada3f86267639aba62ce0d84672da30cd28184

7 years agoART: Add JNI function table manipulation
Andreas Gampe [Wed, 18 Jan 2017 18:59:29 +0000 (18:59 +0000)]
ART: Add JNI function table manipulation
am: c8089540cc

Change-Id: I646c38e901ceec9d0e76d9a0d1730a34033976ee

7 years agoMerge changes Ib9fafbac,I05d73734,I0e95b0cb
Treehugger Robot [Wed, 18 Jan 2017 18:54:49 +0000 (18:54 +0000)]
Merge changes Ib9fafbac,I05d73734,I0e95b0cb

* changes:
  ART: Add JNI API
  ART: Align jvmti.h with jni.h
  ART: Add JNI function table manipulation

7 years agoMerge "ART: Add Search API" am: d4a2827896 am: b5e249c82a
Andreas Gampe [Wed, 18 Jan 2017 18:03:40 +0000 (18:03 +0000)]
Merge "ART: Add Search API" am: d4a2827896 am: b5e249c82a
am: 4bc94c2740

Change-Id: I09fce41c51cd08938da844262ccd23598a2481f4

7 years agoMerge "ART: Add GetJLocationFormat" am: 24e2ded0f9 am: e0f3ca5461
Andreas Gampe [Wed, 18 Jan 2017 18:03:23 +0000 (18:03 +0000)]
Merge "ART: Add GetJLocationFormat" am: 24e2ded0f9 am: e0f3ca5461
am: 421d20dd99

Change-Id: Icf0d004ae975b81924f28bdc0a852006c46687f1

7 years agoART: Disable test 901 on target
Andreas Gampe [Wed, 18 Jan 2017 17:55:54 +0000 (09:55 -0800)]
ART: Disable test 901 on target

As this is now doing slightly more work, disable like the other
tests.

Bug: 31681198
Test: m test-art-target
Change-Id: I73c9f2da1024f8eabc67aba12659d34878cec1f1

7 years agoMerge "ART: Add Search API" am: d4a2827896
Andreas Gampe [Wed, 18 Jan 2017 17:39:34 +0000 (17:39 +0000)]
Merge "ART: Add Search API" am: d4a2827896
am: b5e249c82a

Change-Id: Ibd640108dbddfbfaa2344872d4d06cbc17da2906

7 years agoMerge "ART: Add GetJLocationFormat" am: 24e2ded0f9
Andreas Gampe [Wed, 18 Jan 2017 17:39:21 +0000 (17:39 +0000)]
Merge "ART: Add GetJLocationFormat" am: 24e2ded0f9
am: e0f3ca5461

Change-Id: Ie2b44b6342d01c3fb415ee5ae3b7c05cdc80edaa

7 years agoMerge "ART: Add Search API"
Andreas Gampe [Wed, 18 Jan 2017 17:33:06 +0000 (17:33 +0000)]
Merge "ART: Add Search API"
am: d4a2827896

Change-Id: I97932f86195bbcc79490dfdc6661b82c003afca2

7 years agoMerge "ART: Add GetJLocationFormat"
Andreas Gampe [Wed, 18 Jan 2017 17:32:51 +0000 (17:32 +0000)]
Merge "ART: Add GetJLocationFormat"
am: 24e2ded0f9

Change-Id: Idb6bef4d3f6d5f1af10059f11a3f48df5154a408

7 years agoART: Add JNI API
Andreas Gampe [Tue, 17 Jan 2017 02:18:14 +0000 (18:18 -0800)]
ART: Add JNI API

Add support for GetJNIFunctionTable and SetJNIFunctionTable. Add
tests.

Bug: 34343708
Test: m test-art-host-run-test-928-jni-table
Change-Id: Ib9fafbac2781c570aa6eacf5242afbbf6c3ee7a9

7 years agoART: Align jvmti.h with jni.h
Andreas Gampe [Tue, 17 Jan 2017 02:53:59 +0000 (18:53 -0800)]
ART: Align jvmti.h with jni.h

Android follows the JNI specification and names the JNI function
table without the underscore.

Bug: 34343708
Test: m test-art-host
Change-Id: I05d73734545f9077ad66aceb335bdc8a76603a71

7 years agoART: Add JNI function table manipulation
Andreas Gampe [Mon, 16 Jan 2017 20:41:12 +0000 (12:41 -0800)]
ART: Add JNI function table manipulation

Add support for a function table override. This will override the
decision between the regular and the CheckJNI function tables, if
set.

Bug: 34343708
Test: m test-art-host-gtest-jni_internal_test
Change-Id: I0e95b0cbd21f4efdcd8c3d312781d9aeeff54a1e

7 years agoMerge "ART: Add Search API"
Treehugger Robot [Wed, 18 Jan 2017 17:16:06 +0000 (17:16 +0000)]
Merge "ART: Add Search API"

7 years agoMerge "ART: Add GetJLocationFormat"
Treehugger Robot [Wed, 18 Jan 2017 17:15:41 +0000 (17:15 +0000)]
Merge "ART: Add GetJLocationFormat"

7 years agoMerge "Load the array class in the compiler for allocations." am: c3b7bf3bcc am:...
Nicolas Geoffray [Wed, 18 Jan 2017 16:17:16 +0000 (16:17 +0000)]
Merge "Load the array class in the compiler for allocations." am: c3b7bf3bcc am: 77e673a0e3
am: 5efe65c53f

Change-Id: I33a5c547c11681cf9fe82837c9d0376815cca326

7 years agoMerge "Fix Mips build." am: 2ee01bff00 am: 37d922f1d8
Nicolas Geoffray [Wed, 18 Jan 2017 16:17:01 +0000 (16:17 +0000)]
Merge "Fix Mips build." am: 2ee01bff00 am: 37d922f1d8
am: baf5382870

Change-Id: Iacb55a60454943fe3a874f177b369739bf99bf28

7 years agoMerge "Fix IP register usage in LoadClassSlowPathARMVIXL." am: 404b012061 am: 79d0521127
Vladimir Marko [Wed, 18 Jan 2017 16:16:46 +0000 (16:16 +0000)]
Merge "Fix IP register usage in LoadClassSlowPathARMVIXL." am: 404b012061 am: 79d0521127
am: 089c33b7b5

Change-Id: I034839dcd4edc80a40de467b95f518e2f65a800c

7 years agoMerge "Load the array class in the compiler for allocations." am: c3b7bf3bcc
Nicolas Geoffray [Wed, 18 Jan 2017 16:00:17 +0000 (16:00 +0000)]
Merge "Load the array class in the compiler for allocations." am: c3b7bf3bcc
am: 77e673a0e3

Change-Id: If2c045b207d83ad71d989960644ab6c2cdd56522

7 years agoMerge "Load the array class in the compiler for allocations."
Nicolas Geoffray [Wed, 18 Jan 2017 15:54:14 +0000 (15:54 +0000)]
Merge "Load the array class in the compiler for allocations."
am: c3b7bf3bcc

Change-Id: I3fa61cd9e27138c4a6fdbc0aff0fe0959c147bf2

7 years agoMerge "Load the array class in the compiler for allocations."
Nicolas Geoffray [Wed, 18 Jan 2017 15:43:07 +0000 (15:43 +0000)]
Merge "Load the array class in the compiler for allocations."

7 years agoRevert "Revert "Remove unused code for patching oat files.""
Richard Uhler [Wed, 18 Jan 2017 14:27:51 +0000 (14:27 +0000)]
Revert "Revert "Remove unused code for patching oat files.""

This reverts commit 78985875702c52657066da158c0246ef07115385.

Bug: 33192586
Test: m test-art-host
Test: m test-art-target
Test: device boots

Change-Id: I848b39a2b9b3c48beca2c68f9a316626a81abb39

7 years agoLoad the array class in the compiler for allocations.
Nicolas Geoffray [Tue, 17 Jan 2017 23:00:24 +0000 (23:00 +0000)]
Load the array class in the compiler for allocations.

Removing one other dependency for needing to pass
the current method, and having dex_cache_resolved_types_
in ArtMethod.

oat file increase:
- x64: 0.25%
- arm32: 0.30%
- x86: 0.28%

test: test-art-host, test-art-target
Change-Id: Ibca4fa00d3e31954db2ccb1f65a584b8c67cb230

7 years agoMerge "Fix Mips build." am: 2ee01bff00
Nicolas Geoffray [Wed, 18 Jan 2017 15:05:40 +0000 (15:05 +0000)]
Merge "Fix Mips build." am: 2ee01bff00
am: 37d922f1d8

Change-Id: I8dfbd4b2bd7021e94ed2a98dac132214b2f2ab0d

7 years agoMerge "Fix Mips build."
Nicolas Geoffray [Wed, 18 Jan 2017 15:00:41 +0000 (15:00 +0000)]
Merge "Fix Mips build."
am: 2ee01bff00

Change-Id: I53c80cf9ff1335e7751553e43654768affd584fe

7 years agoMerge "Fix Mips build."
Treehugger Robot [Wed, 18 Jan 2017 14:52:33 +0000 (14:52 +0000)]
Merge "Fix Mips build."

7 years agoMerge "Fix IP register usage in LoadClassSlowPathARMVIXL." am: 404b012061
Vladimir Marko [Wed, 18 Jan 2017 14:44:40 +0000 (14:44 +0000)]
Merge "Fix IP register usage in LoadClassSlowPathARMVIXL." am: 404b012061
am: 79d0521127

Change-Id: I8ac26e3a5d09fbe2f96c8f510b322129da69a550

7 years agoMerge "Fix IP register usage in LoadClassSlowPathARMVIXL."
Vladimir Marko [Wed, 18 Jan 2017 14:39:40 +0000 (14:39 +0000)]
Merge "Fix IP register usage in LoadClassSlowPathARMVIXL."
am: 404b012061

Change-Id: Id20492f64e0e41cc083cc1050c5305c4989bf62c

7 years agoMerge "Fix IP register usage in LoadClassSlowPathARMVIXL."
Treehugger Robot [Wed, 18 Jan 2017 14:28:59 +0000 (14:28 +0000)]
Merge "Fix IP register usage in LoadClassSlowPathARMVIXL."

7 years agoFix Mips build.
Nicolas Geoffray [Wed, 18 Jan 2017 13:30:00 +0000 (13:30 +0000)]
Fix Mips build.

Test: build mips
Change-Id: Icadff73d6a266bbdfd6cb67a66f04f559f28846d