git.osdn.net Git - android-x86/art.git/log

Calin Juravle [Tue, 18 Apr 2017 23:36:45 +0000 (23:36 +0000)]

Merge "Invoke dex2oat explictly before dalvikvm" am: 77ced6adfd
am: b618586399

Change-Id: I695ae1237d5206e441d82cf48d95ca74d2a70b2a

commit | commitdiff | tree

Calin Juravle [Tue, 18 Apr 2017 23:35:15 +0000 (23:35 +0000)]

Merge "Invoke dex2oat explictly before dalvikvm"
am: 77ced6adfd

Change-Id: I60b418c83278e135064e9d657d5a75d95619d854

commit | commitdiff | tree

Calin Juravle [Tue, 18 Apr 2017 23:20:16 +0000 (23:20 +0000)]

Merge "Invoke dex2oat explictly before dalvikvm"

commit | commitdiff | tree

Alex Light [Tue, 18 Apr 2017 22:58:24 +0000 (22:58 +0000)]

Merge "Fix obsolete method change check." am: 494505a9de
am: fa385ddeaa

Change-Id: I31b67abe5830cf24edbe7eb0c3191f6ac984733b

commit | commitdiff | tree

Alex Light [Tue, 18 Apr 2017 22:53:54 +0000 (22:53 +0000)]

Merge "Fix obsolete method change check."
am: 494505a9de

Change-Id: Ie3dac35eb222fb3662b2588576ca71c7a029495a

commit | commitdiff | tree

Treehugger Robot [Tue, 18 Apr 2017 22:42:58 +0000 (22:42 +0000)]

Merge "Fix obsolete method change check."

commit | commitdiff | tree

Calin Juravle [Wed, 12 Apr 2017 02:04:28 +0000 (19:04 -0700)]

Invoke dex2oat explictly before dalvikvm

The goal is to stop relying on dex2oat being run when dex files are
loaded.

Test: ./out/host/linux-x86/bin/art --profile -Ximage:$PWD/out/host/linux-x86/framework/core.art -Xusejit:true -Xcompiler-option --compiler-filter=speed -Xcompiler-option --compiler-backend=Optimizing -verbose:oat -Djava.library.path=$PWD/out/x86_64/host/linux-x86/lib64 -cp $PWD/generated/benchmarks.dex benchmarks.ExoPlayerBench.java.ExoPlayerBench

Bug: 36824842
Change-Id: I9f4a1384cdc91502edea08402ee984c57ff8c37d

commit | commitdiff | tree

Alex Light [Tue, 18 Apr 2017 20:03:31 +0000 (13:03 -0700)]

Fix obsolete method change check.

We were incorrectly checking for changes in the obsolete-method map.
This could cause issues if a class was redefined multiple times.

Bug: 37475600

Test: ./test.py --host -j40
Test: cts-tradefed run cts-dev --module CtsJvmtiRedefineClassesHostTestCases

Change-Id: Icf39d5154c0e48461405b700bf1fa20830195fc1

commit | commitdiff | tree

Roland Levillain [Tue, 18 Apr 2017 18:33:39 +0000 (18:33 +0000)]

Merge "Make ART build/test configurations use the CC collector by default." am: 741a81af44
am: e692b7db5a

Change-Id: I171f391688967c00861c83ed4965eab135bae5d8

commit | commitdiff | tree

Mathieu Chartier [Tue, 18 Apr 2017 18:33:24 +0000 (18:33 +0000)]

Merge "Differentiate between native alloc and normal background GC" am: e4e7d601ef
am: 197bc62104

Change-Id: I19fc5b3038a09cc096cc272e2c53343cc80f66ae

commit | commitdiff | tree

Andreas Gampe [Tue, 18 Apr 2017 18:33:09 +0000 (18:33 +0000)]

Merge "ART: Make less lock-level noise on abort" am: 2888e85164
am: a41f563e62

Change-Id: I099770d25ac0e2105cb3cc91407b0ac1b4fc0297

commit | commitdiff | tree

Roland Levillain [Tue, 18 Apr 2017 18:28:13 +0000 (18:28 +0000)]

Merge "Make ART build/test configurations use the CC collector by default."
am: 741a81af44

Change-Id: Ica953a72f63c07fb551b75b2f0448bb1212d792f

commit | commitdiff | tree

Mathieu Chartier [Tue, 18 Apr 2017 18:27:53 +0000 (18:27 +0000)]

Merge "Differentiate between native alloc and normal background GC"
am: e4e7d601ef

Change-Id: I26f9a501d9da8b5d9cdefc08ae1a4fa394a533b6

commit | commitdiff | tree

Andreas Gampe [Tue, 18 Apr 2017 18:27:38 +0000 (18:27 +0000)]

Merge "ART: Make less lock-level noise on abort"
am: 2888e85164

Change-Id: I58b17056982de8e306ab6e0dfef430f74b5ec11f

commit | commitdiff | tree

Treehugger Robot [Tue, 18 Apr 2017 18:25:01 +0000 (18:25 +0000)]

Merge "Make ART build/test configurations use the CC collector by default."

commit | commitdiff | tree

Mathieu Chartier [Tue, 18 Apr 2017 18:24:00 +0000 (18:24 +0000)]

Merge "Differentiate between native alloc and normal background GC"

commit | commitdiff | tree

Treehugger Robot [Tue, 18 Apr 2017 18:21:41 +0000 (18:21 +0000)]

Merge "ART: Make less lock-level noise on abort"

commit | commitdiff | tree

Mathieu Chartier [Mon, 17 Apr 2017 22:24:43 +0000 (15:24 -0700)]

Differentiate between native alloc and normal background GC

Added a new GC cause kGcCauseForNativeAllocBackground.

Bug: 35872915

Test: test-art-host

Change-Id: I94e17f8bd53af29f2862b9910bd8abd2df97e229

commit | commitdiff | tree

Mathieu Chartier [Tue, 18 Apr 2017 17:22:17 +0000 (17:22 +0000)]

Merge "Use correct type for GetValueFromShadowFrame" am: c36a970fcd
am: d70097de7f

Change-Id: I08d16238a82fc03a39c96922b7236a00cadccce1

commit | commitdiff | tree

Roland Levillain [Tue, 18 Apr 2017 17:22:03 +0000 (17:22 +0000)]

Merge "Use WARN_UNUSED consistently in ART." am: b2410c931a
am: 8e9691c069

Change-Id: Ib4c2777edf7f7490191e92bc9b76dce90bda5e52

commit | commitdiff | tree

Mathieu Chartier [Tue, 18 Apr 2017 17:16:48 +0000 (17:16 +0000)]

Merge "Use correct type for GetValueFromShadowFrame"
am: c36a970fcd

Change-Id: I7ae578e671658c4790aaaf67aac22adfded9b5df

commit | commitdiff | tree

Roland Levillain [Tue, 18 Apr 2017 17:16:33 +0000 (17:16 +0000)]

Merge "Use WARN_UNUSED consistently in ART."
am: b2410c931a

Change-Id: I9bc56ed10c7c4b7d72b89f5cfc95ac964b3e4138

commit | commitdiff | tree

Mathieu Chartier [Tue, 18 Apr 2017 17:14:00 +0000 (17:14 +0000)]

Merge "Use correct type for GetValueFromShadowFrame"

commit | commitdiff | tree

Roland Levillain [Tue, 18 Apr 2017 17:06:25 +0000 (17:06 +0000)]

Merge "Use WARN_UNUSED consistently in ART."

commit | commitdiff | tree

Mathieu Chartier [Tue, 18 Apr 2017 03:12:29 +0000 (20:12 -0700)]

Use correct type for GetValueFromShadowFrame

The field type is not necessarily the input type for boxed
primitives. If the field type is < 32 bits, it means there will be
partial object pointer in the JValue. If a conversion check is
later needed in GetUnboxedTypeAndValue, it will crash. The fix is
to use the PTypes.

Bug: 37446461
Test: test-art-host
Change-Id: I0c4b405f0c13910523b98a87ef12b9f302a5e241

commit | commitdiff | tree

Sebastien Hertz [Tue, 18 Apr 2017 16:27:30 +0000 (16:27 +0000)]

Merge "JDWP: fix Dbg::ResumeThread" am: 2203253254
am: e320fb8224

Change-Id: I3a0d9ace36d8213dc35090ab750c449d5efcb281

commit | commitdiff | tree

Sebastien Hertz [Tue, 18 Apr 2017 16:22:31 +0000 (16:22 +0000)]

Merge "JDWP: fix Dbg::ResumeThread"
am: 2203253254

Change-Id: Ie4f5a2ce448d182eb306b59f718a52a86b999bf7

commit | commitdiff | tree

Sebastien Hertz [Tue, 18 Apr 2017 16:11:55 +0000 (16:11 +0000)]

Merge "JDWP: fix Dbg::ResumeThread"

commit | commitdiff | tree

Andreas Gampe [Tue, 18 Apr 2017 15:27:57 +0000 (15:27 +0000)]

Merge "ART: Call ThreadGroup.add in Thread::FinishStartup" am: 2aac653df7
am: 37bd1c0928

Change-Id: I9b8d740f661f3135b5c54df1482a1bef906c0d39

commit | commitdiff | tree

Andreas Gampe [Tue, 18 Apr 2017 15:22:26 +0000 (15:22 +0000)]

Merge "ART: Call ThreadGroup.add in Thread::FinishStartup"
am: 2aac653df7

Change-Id: Ia457840ddc3c96eb3271dde5e210db26df404a58

commit | commitdiff | tree

Treehugger Robot [Tue, 18 Apr 2017 15:12:58 +0000 (15:12 +0000)]

Merge "ART: Call ThreadGroup.add in Thread::FinishStartup"

commit | commitdiff | tree

Roland Levillain [Tue, 18 Apr 2017 12:51:15 +0000 (12:51 +0000)]

Merge "Fix ARM64 SystemArrayCopy intrinsic with large constant dest position." am: 1cae72e6cf
am: 918f1f4f14

Change-Id: I821cf312acf1dd0539f706da20000087a7b262b1

commit | commitdiff | tree

Roland Levillain [Tue, 18 Apr 2017 12:45:45 +0000 (12:45 +0000)]

Merge "Fix ARM64 SystemArrayCopy intrinsic with large constant dest position."
am: 1cae72e6cf

Change-Id: Id814f38204ec28bb5d84e5ec772d5caf79a7e274

commit | commitdiff | tree

Roland Levillain [Tue, 18 Apr 2017 12:37:10 +0000 (12:37 +0000)]

Merge "Fix ARM64 SystemArrayCopy intrinsic with large constant dest position."

commit | commitdiff | tree

Vladimir Marko [Tue, 18 Apr 2017 12:18:14 +0000 (12:18 +0000)]

Merge "Revert "Disable 160-read-barrier-stress temporarily"" am: e58b971b57
am: 03c1a76d68

Change-Id: I518d0ef1d2953d63ec510440516bf10d305a9afa

commit | commitdiff | tree

Vladimir Marko [Tue, 18 Apr 2017 12:13:13 +0000 (12:13 +0000)]

Merge "Revert "Disable 160-read-barrier-stress temporarily""
am: e58b971b57

Change-Id: I288940985c066629dd5ab2e9312997b89055098f

commit | commitdiff | tree

Vladimir Marko [Tue, 18 Apr 2017 12:06:55 +0000 (12:06 +0000)]

Merge "Revert "Disable 160-read-barrier-stress temporarily""

commit | commitdiff | tree

Vladimir Marko [Tue, 18 Apr 2017 11:41:11 +0000 (11:41 +0000)]

Merge "Fix Arena allocation tracking." am: 4cb99a13d2
am: c50078606a

Change-Id: I1e92d3aea02ed7a4c47175b300d394aa8440a42a

commit | commitdiff | tree

Vladimir Marko [Tue, 18 Apr 2017 11:35:41 +0000 (11:35 +0000)]

Merge "Fix Arena allocation tracking."
am: 4cb99a13d2

Change-Id: I4353655032f22837c55d4d221619126210b8aa47

commit | commitdiff | tree

Treehugger Robot [Tue, 18 Apr 2017 11:29:25 +0000 (11:29 +0000)]

Merge "Fix Arena allocation tracking."

commit | commitdiff | tree

Roland Levillain [Tue, 18 Apr 2017 11:01:58 +0000 (12:01 +0100)]

Use WARN_UNUSED consistently in ART.

Test: mmma art
Change-Id: I776840725f56258c45edfcfd165da61ab653f0b5

commit | commitdiff | tree

Roland Levillain [Thu, 13 Apr 2017 18:34:30 +0000 (19:34 +0100)]

Fix ARM64 SystemArrayCopy intrinsic with large constant dest position.

Make sure we do not deplete the whole VIXL scratch register pool, so
that VIXL can still use IP0 as a temporary when emitting
macro-instructions.

Test: art/test/testrunner/testrunner.py --optimizing --target --64
Bug: 37256530
Change-Id: I5da22e552297fad87db5763e2dab60ae6a7a43af

commit | commitdiff | tree

Vladimir Marko [Tue, 18 Apr 2017 09:47:12 +0000 (09:47 +0000)]

Revert "Disable 160-read-barrier-stress temporarily"

And reduce the number of fields in class ManyFields from
10000 to 5000 to reduce memory pressure on Jack. Split
the ManyFields class in a simple hierarchy to keep files
under 64KiB and allow compilation with javac.

Test: testrunner.py --host -j 48
Test: run-test --host --jvm 160-read-barrier-stress
Bug: 37335480

This reverts commit 101074999bd339c276eeaaf0538930d90a96657e.

Change-Id: I52217fd2c9d00a5b045a7faa6e4dc1438c7f93b1

commit | commitdiff | tree

Andreas Gampe [Tue, 18 Apr 2017 04:40:28 +0000 (21:40 -0700)]

ART: Make less lock-level noise on abort

The lock-level violations with the abort lock aren't really all
that interesting.

Test: m test-art-host
Change-Id: I8a5fc687009db914ec8f60d86068d87e71f8a894

commit | commitdiff | tree

Andreas Gampe [Tue, 18 Apr 2017 03:19:14 +0000 (20:19 -0700)]

ART: Call ThreadGroup.add in Thread::FinishStartup

ART should add the main thread to the main ThreadGroup. Behavior
of the Thread constructor changed.

Bug: 37444210
Test: art/test/testrunner/testrunner.py -b --host -t 051
Test: m test-art-host
Test: m build-art-host && art/tools/run-libcore-tests.sh --mode=host
Change-Id: I92cf2f9a6c5c3fdf385eb7925addc38b64fa4d98

commit | commitdiff | tree

Josh Gao [Tue, 18 Apr 2017 01:13:03 +0000 (01:13 +0000)]

Merge "sigchain: switch from __thread to pthread_setspecific." am: 36831abc29
am: ef349c728d

Change-Id: Ic603db8698b0e8d162f3dc2133a19481d48bb080

commit | commitdiff | tree

Josh Gao [Tue, 18 Apr 2017 01:08:05 +0000 (01:08 +0000)]

Merge "sigchain: switch from __thread to pthread_setspecific."
am: 36831abc29

Change-Id: Ie5567b3889bf9b2af37ef2e88296f392d7f86073

commit | commitdiff | tree

Treehugger Robot [Tue, 18 Apr 2017 00:58:38 +0000 (00:58 +0000)]

Merge "sigchain: switch from __thread to pthread_setspecific."

commit | commitdiff | tree

Josh Gao [Mon, 17 Apr 2017 22:58:36 +0000 (15:58 -0700)]

sigchain: switch from __thread to pthread_setspecific.

__thread is implemented via emutls on Android, which will result in the
thread local variable being allocated again and leaked if it gets used
after it has been destructed already (e.g. by a later destructor
calling sigprocmask, or triggering a signal handler).

Switch to pthread_setspecific, which doesn't suffer from this problem.

Bug: http://b/36871013
Test: ran dalvikvm on a class that spins creating threads
Change-Id: Ie5deab453be387490ba30a0010e12f60d736c8ad

commit | commitdiff | tree

Alex Light [Mon, 17 Apr 2017 22:00:47 +0000 (22:00 +0000)]

Merge "Enable some redefinition run-tests in CTS" am: 66f43b988a
am: 8fcbf927bc

Change-Id: Ia843f6631258a10f546e04c4b26ffa76d84b25dc

commit | commitdiff | tree

Andreas Gampe [Mon, 17 Apr 2017 22:00:22 +0000 (22:00 +0000)]

Merge "ART: Change run-test 913 array testing" am: 030b1066a6
am: 4a95b42347

Change-Id: I8dcc23d374acb91b882b59b5eeb0ab6ff843e138

commit | commitdiff | tree

Alex Light [Mon, 17 Apr 2017 21:56:17 +0000 (21:56 +0000)]

Merge "Enable some redefinition run-tests in CTS"
am: 66f43b988a

Change-Id: Ic0db769c4d17ed3996ac653c77fb136ed5278c57

commit | commitdiff | tree

Andreas Gampe [Mon, 17 Apr 2017 21:55:50 +0000 (21:55 +0000)]

Merge "ART: Change run-test 913 array testing"
am: 030b1066a6

Change-Id: I5848a08931e0ddb7124c0d11facdd581f7129b5d

commit | commitdiff | tree

Mathieu Chartier [Mon, 17 Apr 2017 21:46:22 +0000 (21:46 +0000)]

Merge "Disable read barrier thunks for heap poisoning" am: 3ace1f0ce2
am: 2c00094e63

Change-Id: I6612eb32f196b824bbf933f469a5c94d50faef2c

commit | commitdiff | tree

Treehugger Robot [Mon, 17 Apr 2017 21:45:18 +0000 (21:45 +0000)]

Merge "Enable some redefinition run-tests in CTS"

commit | commitdiff | tree

Treehugger Robot [Mon, 17 Apr 2017 21:42:46 +0000 (21:42 +0000)]

Merge "ART: Change run-test 913 array testing"

commit | commitdiff | tree

Mathieu Chartier [Mon, 17 Apr 2017 21:41:50 +0000 (21:41 +0000)]

Merge "Disable read barrier thunks for heap poisoning"
am: 3ace1f0ce2

Change-Id: I5f0e3606cb05968ef517ebf5f99d1d87e84babef

commit | commitdiff | tree

Calin Juravle [Mon, 17 Apr 2017 21:41:50 +0000 (21:41 +0000)]

Merge "Print runtime isa when invoking 'dalvikvm --showversion'" am: 445452cda0
am: cec16d0202

Change-Id: Ibf228e8f1ddc0513307ba1b0e5aee2a1e3a15b9d

commit | commitdiff | tree

Calin Juravle [Mon, 17 Apr 2017 21:36:52 +0000 (21:36 +0000)]

Merge "Print runtime isa when invoking 'dalvikvm --showversion'"
am: 445452cda0

Change-Id: I131eca067fb6e0bd8bb05c319785e005dc743e45

commit | commitdiff | tree

Treehugger Robot [Mon, 17 Apr 2017 21:35:48 +0000 (21:35 +0000)]

Merge "Disable read barrier thunks for heap poisoning"

commit | commitdiff | tree

Calin Juravle [Mon, 17 Apr 2017 21:26:47 +0000 (21:26 +0000)]

Merge "Print runtime isa when invoking 'dalvikvm --showversion'"

commit | commitdiff | tree

Alex Light [Fri, 14 Apr 2017 23:20:53 +0000 (16:20 -0700)]

Enable some redefinition run-tests in CTS

We added the tests to run-test-jvmti-java-library
target and made some small changes to tests to
ensure that everything works without linking to
libart.so.

Bug: 32072923
Test: ./test.py --host -j40
Change-Id: I8fdad180c77b125c22c043cd61305cee79801cc7

commit | commitdiff | tree

Andreas Gampe [Mon, 17 Apr 2017 19:46:36 +0000 (12:46 -0700)]

ART: Change run-test 913 array testing

Use an explicit array in the test. Ignore all arrays that are
untagged.

Bug: 32072923
Bug: 36727422
Test: m
Test: art/test.py --host -r -t 913
Change-Id: Idf7bc03ae81e3e645935c8809bf59636cfa3784a

commit | commitdiff | tree

Mathieu Chartier [Mon, 17 Apr 2017 19:50:45 +0000 (12:50 -0700)]

Disable read barrier thunks for heap poisoning

Logic to unpoison is not yet implemented, this causes SIGSEGVs in
various places.

Bug: 29516974
Bug: 30126666
Bug: 36141117

Test: ./test/testrunner/testrunner.py -j4 --optimizing --debuggable --ndebuggable --target --verbose
Change-Id: I8317a142d07af36090d5f05ce46100dfa07c17e7

commit | commitdiff | tree

Alex Light [Mon, 17 Apr 2017 19:12:11 +0000 (19:12 +0000)]

Merge "Use standard loading code in many tests" am: 4bb9a2b0b2
am: 4498ff2ce6

Change-Id: Ia95df397c9718bbcaa2c892583c7940c5b3b340e

commit | commitdiff | tree

Alex Light [Mon, 17 Apr 2017 19:07:40 +0000 (19:07 +0000)]

Merge "Use standard loading code in many tests"
am: 4bb9a2b0b2

Change-Id: Iecc67c50bb772624803149681bb89e8a6e672b7f

commit | commitdiff | tree

Treehugger Robot [Mon, 17 Apr 2017 18:59:40 +0000 (18:59 +0000)]

Merge "Use standard loading code in many tests"

commit | commitdiff | tree

Alex Light [Mon, 17 Apr 2017 17:29:02 +0000 (17:29 +0000)]

Merge "Remove native code from test 944 for CTS" am: 4a4e245a63
am: 685073b15d

Change-Id: Id2aa39f57f2378a1febce3d0e234a225691793df

commit | commitdiff | tree

Alex Light [Mon, 17 Apr 2017 17:24:33 +0000 (17:24 +0000)]

Merge "Remove native code from test 944 for CTS"
am: 4a4e245a63

Change-Id: Ide22ef4ab749731763334593bdf923358cc0542d

commit | commitdiff | tree

Treehugger Robot [Mon, 17 Apr 2017 17:19:05 +0000 (17:19 +0000)]

Merge "Remove native code from test 944 for CTS"

commit | commitdiff | tree

Alex Light [Mon, 17 Apr 2017 17:06:44 +0000 (10:06 -0700)]

Use standard loading code in many tests

In order to prepare for use in CTS tests make tests 902, 914, 915,
917, 919, 926, 930, 932, 940, 942, 945, 981 & 982 use standard OnLoad
functions. Final configuration is done during test initialization.

Bug: 32072923
Test: ./test/testrunner/testrunner.py --host -j40
Change-Id: I84b2e17d0e024255d2dc49452f3d74dfd64abd22

commit | commitdiff | tree

Aart Bik [Mon, 17 Apr 2017 16:46:32 +0000 (16:46 +0000)]

Merge "Fixed bug on pending environment use of termination condition. With regression test." am: 27fb1dc467
am: b0d6493751

Change-Id: Iba9b5b929145e5675520ab551eaee283f48ac6a6

commit | commitdiff | tree

Aart Bik [Mon, 17 Apr 2017 16:41:29 +0000 (16:41 +0000)]

Merge "Fixed bug on pending environment use of termination condition. With regression test."
am: 27fb1dc467

Change-Id: I606f6dadc4705179e501cebb90e47582387ad3f4

commit | commitdiff | tree

Aart Bik [Mon, 17 Apr 2017 16:34:52 +0000 (16:34 +0000)]

Merge "Fixed bug on pending environment use of termination condition. With regression test."

commit | commitdiff | tree

David Sehr [Mon, 17 Apr 2017 16:02:28 +0000 (16:02 +0000)]

Merge "Add art_defaults to dexlayout" am: 35fc819cd9
am: bb8db9c0db

Change-Id: I177d2ff4572919ca11771751e434166b816836a3

commit | commitdiff | tree

David Sehr [Mon, 17 Apr 2017 15:57:27 +0000 (15:57 +0000)]

Merge "Add art_defaults to dexlayout"
am: 35fc819cd9

Change-Id: Iaa201535063cac651911a0cf9650ddd8592e2915

commit | commitdiff | tree

David Sehr [Mon, 17 Apr 2017 15:49:41 +0000 (15:49 +0000)]

Merge "Add art_defaults to dexlayout"

commit | commitdiff | tree

Alex Light [Mon, 17 Apr 2017 15:36:14 +0000 (08:36 -0700)]

Remove native code from test 944 for CTS

Replaced native code in test 944 with java reflection based code.

Bug: 32072923
Test: ./test/testrunner/testrunner.py --host -j40 -t 944
Change-Id: I678d805936009a33ce8fe6b8570bfb788a8da72d

commit | commitdiff | tree

David Sehr [Sat, 15 Apr 2017 17:06:21 +0000 (10:06 -0700)]

Add art_defaults to dexlayout

The build rule defaults for dexlayout targets didn't include defaults
from the ART project. Because of this ART_TARGET_* weren't defined,
among other problems

Bug: 35800981
Test: make -j 40 test-art-host
Change-Id: Ic528bfc6b622fa9b4f5c0ddf883f15912641b720

commit | commitdiff | tree

Andreas Gampe [Sat, 15 Apr 2017 06:43:31 +0000 (06:43 +0000)]

Merge "ART: Tentative fix for stack count issue in test 913" am: 8af5efdb1d
am: fb449e46d6

Change-Id: I2bf5228e659dfeff032f1972eeecd8545d853bb9

commit | commitdiff | tree

Andreas Gampe [Sat, 15 Apr 2017 06:40:32 +0000 (06:40 +0000)]

Merge "ART: Tentative fix for stack count issue in test 913"
am: 8af5efdb1d

Change-Id: I0b902d209cb2381a3c3cee6508ff39cd0bd41983

commit | commitdiff | tree

Treehugger Robot [Sat, 15 Apr 2017 06:35:54 +0000 (06:35 +0000)]

Merge "ART: Tentative fix for stack count issue in test 913"

commit | commitdiff | tree

Andreas Gampe [Sat, 15 Apr 2017 04:49:33 +0000 (21:49 -0700)]

ART: Tentative fix for stack count issue in test 913

Use kCountTransition == kNo to also skip runtime methods in the
cur_depth_ count of a StackVisitor.

Currently this is only used in the VisitRoots function of Thread.
If the additional load is too expensive, we can make this dependent
on the requested precision (and thus revert "regular" visits to
the old scheme of also counting transitions between managed stack
frames and shadow frames, which is only an increment of a field).

Bug: 31385354
Bug: 32072923
Test: m test-art-host
Change-Id: Ief951585407dd6e03f8050774fe612e7b204247e

commit | commitdiff | tree

Andreas Gampe [Sat, 15 Apr 2017 02:51:15 +0000 (02:51 +0000)]

Merge "ART: Add debug code to run-test 913" am: 39d562895a
am: 6c1a074521

Change-Id: I9733cd04cb8ecc12c8068e888b24a5380545534c

commit | commitdiff | tree

Andreas Gampe [Sat, 15 Apr 2017 02:48:45 +0000 (02:48 +0000)]

Merge "ART: Add debug code to run-test 913"
am: 39d562895a

Change-Id: I4a40720e1c97fd0e80c5945bf370bcaec908c652

commit | commitdiff | tree

Treehugger Robot [Sat, 15 Apr 2017 02:43:14 +0000 (02:43 +0000)]

Merge "ART: Add debug code to run-test 913"

commit | commitdiff | tree

Alex Light [Sat, 15 Apr 2017 02:31:44 +0000 (02:31 +0000)]

Merge changes I5b05e23a,I9350b250,I1d66b42a am: 393a1fd02f
am: c622290608

Change-Id: Iaa537fab4e4aebd274276975c86a27149df2fca2

commit | commitdiff | tree

Alex Light [Sat, 15 Apr 2017 02:29:15 +0000 (02:29 +0000)]

Merge changes I5b05e23a,I9350b250,I1d66b42a
am: 393a1fd02f

Change-Id: If6e778443603c658483cf94d73ff9bec9bd4297f

commit | commitdiff | tree

Alex Light [Sat, 15 Apr 2017 02:20:48 +0000 (02:20 +0000)]

Merge changes I5b05e23a,I9350b250,I1d66b42a

* changes:
  More refactor for JVMTI redefinition run tests (3/3)
  More refactor for JVMTI redefinition run tests (2/3)
  More refactor for JVMTI redefinition run tests (1/3)

commit | commitdiff | tree

Jeff Hao [Sat, 15 Apr 2017 01:13:09 +0000 (01:13 +0000)]

Merge "Add check that TypeIndex is valid in StringByTypeIdx." am: 1cda71a414
am: c785a921b7

Change-Id: I7ec526079d2892a0692342769a499b86ec909ca3

commit | commitdiff | tree

Jeff Hao [Sat, 15 Apr 2017 01:11:09 +0000 (01:11 +0000)]

Merge "Add check that TypeIndex is valid in StringByTypeIdx."
am: 1cda71a414

Change-Id: I505a522a49d67bd0bc42b1b2df2731da818f8700

commit | commitdiff | tree

Treehugger Robot [Sat, 15 Apr 2017 01:03:50 +0000 (01:03 +0000)]

Merge "Add check that TypeIndex is valid in StringByTypeIdx."

commit | commitdiff | tree

Jeff Hao [Fri, 14 Apr 2017 21:33:52 +0000 (14:33 -0700)]

Add check that TypeIndex is valid in StringByTypeIdx.

StringByTypeIdx should fail gracefully if given a bad TypeIndex. This
adds a check that the TypeIndex is valid before getting its TypeId.

This fixes a regression that removed this check when it was refactored
in this CL: https://android-review.googlesource.com/#/c/243493/

Bug: 37287051
Test: mm -j31 test-art-host-gtest-dex_file_test
Change-Id: Ib68cb8135011f5f30335251583e181b089982754

commit | commitdiff | tree

Calin Juravle [Thu, 13 Apr 2017 23:35:42 +0000 (16:35 -0700)]

Print runtime isa when invoking 'dalvikvm --showversion'

The runtime ISA is appended at the end, after the version number.

Test: dalvikvm --showversion
Bug: 36824842
Change-Id: I09bbe3bf06054fe237543b5f96e9480631ea0838

commit | commitdiff | tree

Alex Light [Fri, 14 Apr 2017 22:53:29 +0000 (22:53 +0000)]

Merge "Remove test skips associated with b/37240685" am: 452092b4c9
am: 3c79535742

Change-Id: Ib4f4c1dc47febde14a5868ed8b32c9f0fb7e54be

commit | commitdiff | tree

Alex Light [Fri, 14 Apr 2017 22:50:59 +0000 (22:50 +0000)]

Merge "Remove test skips associated with b/37240685"
am: 452092b4c9

Change-Id: I91a4ac9f600e4cf6f648f816bce68a002b55c17d

commit | commitdiff | tree

Treehugger Robot [Fri, 14 Apr 2017 22:47:55 +0000 (22:47 +0000)]

Merge "Remove test skips associated with b/37240685"

commit | commitdiff | tree

Alex Light [Fri, 14 Apr 2017 20:22:22 +0000 (13:22 -0700)]

More refactor for JVMTI redefinition run tests (3/3)

This adds in the Main.java files for the modified tests.

By doing the 3 CLs we keep git from getting confused about the history
of the files.

Bug: 32072923
Test: ./test.py --host -j40
Change-Id: I5b05e23aaf9e90101817ca01d1928a30f14cb7e5

commit | commitdiff | tree

Andreas Gampe [Fri, 14 Apr 2017 21:43:01 +0000 (14:43 -0700)]

ART: Add debug code to run-test 913

Try to figure out why we get wrong depth reporting by aborting in
a deep frame.

Bug: 32072923
Test: m
Test: art/test/testrunner/testrunner.py --host -t 913
Change-Id: Icea02ebdee0e5395a5935c58c80e6d7c82eb6c6d

commit | commitdiff | tree

Alex Light [Fri, 14 Apr 2017 20:20:12 +0000 (13:20 -0700)]

More refactor for JVMTI redefinition run tests (2/3)

Move refactored tests into their final places.

NOTE: BROKEN WITHOUT A FOLLOW-UP CL TO ADD NEW MAIN.JAVA FILES.
Bug: 32072923
Test: None
Change-Id: I9350b2505815c5d21816df4189482aee4868c91c

art

RSS Atom

About OSDN

Find Software

Develop Software

Help