Merge "Fix race in AllocEntrypointsInstrumented"
diff --git a/runtime/art_method-inl.h b/runtime/art_method-inl.h
index 8541210..f692ef6 100644
--- a/runtime/art_method-inl.h
+++ b/runtime/art_method-inl.h
@@ -332,6 +332,7 @@
}
inline const DexFile::CodeItem* ArtMethod::GetCodeItem() {
+ DCHECK(!IsProxyMethod());
return GetDeclaringClass()->GetDexFile().GetCodeItem(GetCodeItemOffset());
}
diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc
index 3c69323..268b982 100644
--- a/runtime/class_linker.cc
+++ b/runtime/class_linker.cc
@@ -4265,10 +4265,14 @@
DCHECK(out != nullptr);
out->CopyFrom(prototype, image_pointer_size_);
- // Set class to be the concrete proxy class and clear the abstract flag, modify exceptions to
- // the intersection of throw exceptions as defined in Proxy
+ // Set class to be the concrete proxy class.
out->SetDeclaringClass(klass.Get());
- out->SetAccessFlags((out->GetAccessFlags() & ~kAccAbstract) | kAccFinal);
+ // Clear the abstract, default and conflict flags to ensure that defaults aren't picked in
+ // preference to the invocation handler.
+ const uint32_t kRemoveFlags = kAccAbstract | kAccDefault | kAccDefaultConflict;
+ // Make the method final.
+ const uint32_t kAddFlags = kAccFinal;
+ out->SetAccessFlags((out->GetAccessFlags() & ~kRemoveFlags) | kAddFlags);
// At runtime the method looks like a reference and argument saving method, clone the code
// related parameters from this method.
diff --git a/runtime/interpreter/interpreter_common.cc b/runtime/interpreter/interpreter_common.cc
index 3453abc..310e211 100644
--- a/runtime/interpreter/interpreter_common.cc
+++ b/runtime/interpreter/interpreter_common.cc
@@ -555,8 +555,10 @@
string_init = true;
}
- // Compute method information.
- const DexFile::CodeItem* code_item = called_method->GetCodeItem();
+ // Compute method information. Need to specifically check for proxy methods since default-method
+ // proxies might have a CodeItem from the default version.
+ const DexFile::CodeItem* code_item =
+ called_method->IsProxyMethod() ? nullptr : called_method->GetCodeItem();
// Number of registers for the callee's call frame.
uint16_t num_regs;