diff options
author | Andreas Gampe <agampe@google.com> | 2014-05-13 21:42:05 -0700 |
---|---|---|
committer | Andreas Gampe <agampe@google.com> | 2014-05-14 17:33:52 -0700 |
commit | 72b3e430d880ef57eaa6a34a0822165994052202 (patch) | |
tree | b102b12d67e6cbc5cf0e6dc4e4ca147325264a43 /test/111-unresolvable-exception | |
parent | d0916f36d27b643bca970f3645c38f44270c74ef (diff) | |
download | android_art-72b3e430d880ef57eaa6a34a0822165994052202.tar.gz android_art-72b3e430d880ef57eaa6a34a0822165994052202.tar.bz2 android_art-72b3e430d880ef57eaa6a34a0822165994052202.zip |
ART: Fix typo in ArtMethod::FindCatchBlock
The thrown exception is always resolved, as we have an instance of
it. What is potentially not resolved is the catch handler's exception
type.
The resolution failure will trigger a NoClassDefFoundError, which
should replace the original exception. For this, the API has to be
changed a little bit to tell callers that there was this change.
Change-Id: Id51d54a15c732ed175eb617b3b0331b89cbb2051
Diffstat (limited to 'test/111-unresolvable-exception')
-rw-r--r-- | test/111-unresolvable-exception/build | 25 | ||||
-rw-r--r-- | test/111-unresolvable-exception/expected.txt | 1 | ||||
-rw-r--r-- | test/111-unresolvable-exception/info.txt | 2 | ||||
-rw-r--r-- | test/111-unresolvable-exception/src/Main.java | 41 | ||||
-rw-r--r-- | test/111-unresolvable-exception/src/TestException.java | 18 |
5 files changed, 87 insertions, 0 deletions
diff --git a/test/111-unresolvable-exception/build b/test/111-unresolvable-exception/build new file mode 100644 index 0000000000..c21a9eff83 --- /dev/null +++ b/test/111-unresolvable-exception/build @@ -0,0 +1,25 @@ +#!/bin/bash +# +# Copyright (C) 2014 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. + +# Stop if something fails. +set -e + +mkdir classes +${JAVAC} -d classes `find src -name '*.java'` +rm classes/TestException.class + +${DX} -JXmx256m --debug --dex --dump-to=classes.lst --output=classes.dex classes +zip $TEST_NAME.jar classes.dex diff --git a/test/111-unresolvable-exception/expected.txt b/test/111-unresolvable-exception/expected.txt new file mode 100644 index 0000000000..052dd74e7e --- /dev/null +++ b/test/111-unresolvable-exception/expected.txt @@ -0,0 +1 @@ +Caught class java.lang.NoClassDefFoundError diff --git a/test/111-unresolvable-exception/info.txt b/test/111-unresolvable-exception/info.txt new file mode 100644 index 0000000000..5ba373334d --- /dev/null +++ b/test/111-unresolvable-exception/info.txt @@ -0,0 +1,2 @@ +Test that we do not segfault when we check a catch handler +for an unresolvable exception. diff --git a/test/111-unresolvable-exception/src/Main.java b/test/111-unresolvable-exception/src/Main.java new file mode 100644 index 0000000000..ba07ee1bf7 --- /dev/null +++ b/test/111-unresolvable-exception/src/Main.java @@ -0,0 +1,41 @@ +/* + * Copyright (C) 2014 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 { + static public void main(String[] args) throws Exception { + try { + check(false); + } catch (Throwable t) { // Should catch the NoClassDefFoundError + System.out.println("Caught " + t.getClass()); + } + } + + private static void check(boolean b) { + try { + if (b) { // Need this to not be dead code, but also not be invoked. + throwsTestException(); // TestException is checked, so we need something potentially + // throwing it. + } + throw new RuntimeException(); // Trigger exception handling. + } catch (TestException e) { // This handler will have an unresolvable class. + } catch (Exception e) { // General-purpose handler + System.out.println("Should not get here!"); + } + } + + // This avoids having to construct one explicitly, which won't work. + private static native void throwsTestException() throws TestException; +} diff --git a/test/111-unresolvable-exception/src/TestException.java b/test/111-unresolvable-exception/src/TestException.java new file mode 100644 index 0000000000..2d8b23402a --- /dev/null +++ b/test/111-unresolvable-exception/src/TestException.java @@ -0,0 +1,18 @@ +/* + * Copyright (C) 2014 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 TestException extends Exception { +} |