OSDN Git Service

Revert "Revert "Revert "Make sure that const-class linkage is preserved."""
authorVladimir Marko <vmarko@google.com>
Thu, 24 Nov 2016 13:03:57 +0000 (13:03 +0000)
committerVladimir Marko <vmarko@google.com>
Thu, 24 Nov 2016 13:03:57 +0000 (13:03 +0000)
commit09ded9201fbeec605b12741ae255663c14bda225
treec0276a06f8b6dba35e843098a05be326c8f5e2ac
parent25dcbad4462ea7279ee2bbe0884abc25bdfac77a
Revert "Revert "Revert "Make sure that const-class linkage is preserved."""

626-const-class-linking is failing (spurious wakeups?)
970-iface-super-resolution-gen is failing:
    dex2oatd F 11-24 10:57:16  6410  6410 image_writer.cc:1144]
    Check failed: !IsBootClassLoaderClass(as_klass)
    java.lang.Class<java.lang.NoSuchMethodError>

Bug: 30627598

This reverts commit 25dcbad4462ea7279ee2bbe0884abc25bdfac77a.

Change-Id: Ie010169bdde45e6ccf2e04a521da4682bd817114
26 files changed:
compiler/image_writer.cc
compiler/image_writer.h
runtime/class_linker.cc
runtime/class_linker.h
runtime/class_table.cc
runtime/class_table.h
test/626-const-class-linking/clear_dex_cache_types.cc [deleted file]
test/626-const-class-linking/expected.txt [deleted file]
test/626-const-class-linking/info.txt [deleted file]
test/626-const-class-linking/multidex.jpp [deleted file]
test/626-const-class-linking/src-multidex/Helper2.java [deleted file]
test/626-const-class-linking/src-multidex/Helper3.java [deleted file]
test/626-const-class-linking/src-multidex/Test.java [deleted file]
test/626-const-class-linking/src-multidex/Test3.java [deleted file]
test/626-const-class-linking/src/ClassPair.java [deleted file]
test/626-const-class-linking/src/DefiningLoader.java [deleted file]
test/626-const-class-linking/src/DelegatingLoader.java [deleted file]
test/626-const-class-linking/src/Helper1.java [deleted file]
test/626-const-class-linking/src/Main.java [deleted file]
test/626-const-class-linking/src/MisbehavingLoader.java [deleted file]
test/626-const-class-linking/src/RacyLoader.java [deleted file]
test/626-const-class-linking/src/RacyMisbehavingHelper.java [deleted file]
test/626-const-class-linking/src/RacyMisbehavingLoader.java [deleted file]
test/Android.bp
test/etc/default-build
test/etc/run-test-jar