From 9fb1ab1f6bb58bdaccef78bc81b3202d0121e2ed Mon Sep 17 00:00:00 2001 From: Alex Light Date: Tue, 5 Sep 2017 09:32:49 -0700 Subject: Revert "Revert "JVMTI Exception and ExceptionCatch events"" Fixed error where we were incorrectly not updating a ShadowFrame dex_pc causing deoptimization errors. Bug: 62821960 Bug: 65049545 Test: ./test.py --host -j50 Test: ./art/tools/run-libcore-tests.sh \ --mode=host --variant-X32 --debug This reverts commit 959742483885779f106e000df6dd422fc8657931. Change-Id: I91ab2bc3e645ddf0359c189b19a59a3ecf0d8921 --- test/1928-exception-event-exception/src/Main.java | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 test/1928-exception-event-exception/src/Main.java (limited to 'test/1928-exception-event-exception/src/Main.java') diff --git a/test/1928-exception-event-exception/src/Main.java b/test/1928-exception-event-exception/src/Main.java new file mode 100644 index 0000000000..11cc773041 --- /dev/null +++ b/test/1928-exception-event-exception/src/Main.java @@ -0,0 +1,21 @@ +/* + * Copyright (C) 2017 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +public class Main { + public static void main(String[] args) throws Exception { + art.Test1928.run(); + } +} -- cgit v1.2.3-59-g8ed1b