diff options
| -rw-r--r-- | compiler/driver/compiler_driver-inl.h | 6 | ||||
| -rw-r--r-- | compiler/optimizing/builder.cc | 3 | ||||
| -rw-r--r-- | test/511-clinit-interface/expected.txt | 1 | ||||
| -rw-r--r-- | test/511-clinit-interface/info.txt | 2 | ||||
| -rw-r--r-- | test/511-clinit-interface/smali/BogusInterface.smali | 23 | ||||
| -rw-r--r-- | test/511-clinit-interface/src/Main.java | 28 |
6 files changed, 60 insertions, 3 deletions
diff --git a/compiler/driver/compiler_driver-inl.h b/compiler/driver/compiler_driver-inl.h index e0c56fcc82..633bc1b1be 100644 --- a/compiler/driver/compiler_driver-inl.h +++ b/compiler/driver/compiler_driver-inl.h @@ -250,8 +250,10 @@ inline bool CompilerDriver::CanAssumeClassIsInitialized(mirror::Class* klass) { inline bool CompilerDriver::CanReferrerAssumeClassIsInitialized(mirror::Class* referrer_class, mirror::Class* klass) { - return (referrer_class != nullptr && referrer_class->IsSubClass(klass)) || - CanAssumeClassIsInitialized(klass); + return (referrer_class != nullptr + && !referrer_class->IsInterface() + && referrer_class->IsSubClass(klass)) + || CanAssumeClassIsInitialized(klass); } inline bool CompilerDriver::IsStaticFieldsClassInitialized(mirror::Class* referrer_class, diff --git a/compiler/optimizing/builder.cc b/compiler/optimizing/builder.cc index 07366936bf..c49752642b 100644 --- a/compiler/optimizing/builder.cc +++ b/compiler/optimizing/builder.cc @@ -697,7 +697,8 @@ bool HGraphBuilder::BuildInvoke(const Instruction& instruction, &storage_index); } - if (outer_class.Get()->IsSubClass(resolved_method->GetDeclaringClass())) { + if (!outer_class->IsInterface() + && outer_class->IsSubClass(resolved_method->GetDeclaringClass())) { // If the outer class is the declaring class or a subclass // of the declaring class, no class initialization is needed // before the static method call. diff --git a/test/511-clinit-interface/expected.txt b/test/511-clinit-interface/expected.txt new file mode 100644 index 0000000000..ccaf6f8f0f --- /dev/null +++ b/test/511-clinit-interface/expected.txt @@ -0,0 +1 @@ +Enter diff --git a/test/511-clinit-interface/info.txt b/test/511-clinit-interface/info.txt new file mode 100644 index 0000000000..1351b2928b --- /dev/null +++ b/test/511-clinit-interface/info.txt @@ -0,0 +1,2 @@ +Test that compilers don't crash when having to compile +an interface method. diff --git a/test/511-clinit-interface/smali/BogusInterface.smali b/test/511-clinit-interface/smali/BogusInterface.smali new file mode 100644 index 0000000000..619df24afe --- /dev/null +++ b/test/511-clinit-interface/smali/BogusInterface.smali @@ -0,0 +1,23 @@ +# Copyright (C) 2015 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. + +.class public abstract interface LBogusInterface; + +.super Ljava/lang/Object; + +.method public static <clinit>()V + .registers 2 + invoke-static {}, LMain;->method()V + return-void +.end method diff --git a/test/511-clinit-interface/src/Main.java b/test/511-clinit-interface/src/Main.java new file mode 100644 index 0000000000..c4d0c6625e --- /dev/null +++ b/test/511-clinit-interface/src/Main.java @@ -0,0 +1,28 @@ +/* + * Copyright (C) 2015 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. + */ + +import java.lang.reflect.Method; + +public class Main { + public static void main(String[] args) throws Exception { + // Workaround for b/18051191. + System.out.println("Enter"); + Class<?> c = Class.forName("BogusInterface"); + } + + public static void method() { + } +} |