summaryrefslogtreecommitdiff
path: root/runtime/class_table.cc
diff options
context:
space:
mode:
author Vladimir Marko <vmarko@google.com> 2016-11-22 17:37:21 +0000
committer Vladimir Marko <vmarko@google.com> 2016-11-22 17:41:49 +0000
commitecffc67068a28d55d131553bf915fdb9fafbbc03 (patch)
tree3f63982d609fa01a5b271b5f393ee9c6d83e1107 /runtime/class_table.cc
parentb46782abf6752ccf688b0d9f5b4bb83e5d33793b (diff)
Revert "Make sure that const-class linkage is preserved."
Bug: 30627598 This reverts commit 19886dbeced9430579a27979beb92b09c95197b4. Squashed reverts of subsequent partial fixes. This reverts commit bad475a63b7c938b7ff7903ea1dae27369c3f629. This reverts commit 0ba0c7d9b0328af39a385014652eb9af4e42d8b5. This reverts commit ddb8afec79492750f16f98e5bd07d44f3dc485d4. Change-Id: Id94af5ae56a0335f9641a79c885cc75bba971713
Diffstat (limited to 'runtime/class_table.cc')
-rw-r--r--runtime/class_table.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/runtime/class_table.cc b/runtime/class_table.cc
index bd477ea54c..0fcce6b307 100644
--- a/runtime/class_table.cc
+++ b/runtime/class_table.cc
@@ -142,6 +142,7 @@ uint32_t ClassTable::ClassDescriptorHashEquals::operator()(const GcRoot<mirror::
bool ClassTable::ClassDescriptorHashEquals::operator()(const GcRoot<mirror::Class>& a,
const GcRoot<mirror::Class>& b) const {
+ DCHECK_EQ(a.Read()->GetClassLoader(), b.Read()->GetClassLoader());
std::string temp;
return a.Read()->DescriptorEquals(b.Read()->GetDescriptor(&temp));
}