azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Protect getSingleAbstractMethodOrNull from data binding deadlock

Browse Source 
Now it cannot cause resolve re-entrance
Probably #KT-18687 Fixed
This commit is contained in:
Mikhail Glukhikh
2017-06-28 16:40:27 +03:00
parent 3e29f9ed5a
commit 6c274cecff
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/kotlin/load/java/sam/SingleAbstractMethodUtils.java
+6 -2
View File
@@ -129,12 +129,16 @@ public class SingleAbstractMethodUtils {
@Nullable @Nullable
public static FunctionDescriptor getSingleAbstractMethodOrNull(@NotNull JavaClassDescriptor klass) { public static FunctionDescriptor getSingleAbstractMethodOrNull(@NotNull JavaClassDescriptor klass) {
if (klass.isDefinitelyNotSamInterface()) return null; // NB: this check MUST BE at start. Please do not touch until following to-do is resolved
// Otherwise android data binding can cause resolve re-entrance
// For details see KT-18687, KT-16149
// TODO: prevent resolve re-entrance on architecture level, or (alternatively) ask data binding owners not to do it
if (DescriptorUtilsKt.getFqNameSafe(klass).asString().equals("android.databinding.DataBindingComponent")) { if (DescriptorUtilsKt.getFqNameSafe(klass).asString().equals("android.databinding.DataBindingComponent")) {
return null; return null;
} }
if (klass.isDefinitelyNotSamInterface()) return null;
List<CallableMemberDescriptor> abstractMembers = getAbstractMembers(klass.getDefaultType()); List<CallableMemberDescriptor> abstractMembers = getAbstractMembers(klass.getDefaultType());
if (abstractMembers.size() == 1) { if (abstractMembers.size() == 1) {
CallableMemberDescriptor member = abstractMembers.get(0); CallableMemberDescriptor member = abstractMembers.get(0);