Drop deprecated INLINE flag from binary format

This commit is contained in:
Alexander Udalov
2013-12-02 18:08:32 +04:00
parent 310a70bf84
commit 969d81b43b
40 changed files with 3 additions and 9 deletions
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1,3 +1,3 @@
fÀ2
Z æ0aB
Z æ0aB
%
Binary file not shown.
Binary file not shown.
@@ -1,5 +1,5 @@
Л2
Z ЖB
Z ЖB
_j
Ж0: в
_B
@@ -201,8 +201,6 @@ public class DescriptorSerializer {
descriptor.getModality(),
descriptor.getKind(),
callableKind(descriptor),
descriptor instanceof SimpleFunctionDescriptor &&
((SimpleFunctionDescriptor) descriptor).isInline(),
hasGetter,
hasSetter
));
@@ -28,9 +28,7 @@ public class Flags {
public static final FlagField<ProtoBuf.Callable.MemberKind> MEMBER_KIND = FlagField.after(CALLABLE_KIND,
ProtoBuf.Callable.MemberKind.values());
@Deprecated
public static final FlagField<Boolean> INLINE = FlagField.booleanAfter(MEMBER_KIND);
public static final FlagField<Boolean> HAS_GETTER = FlagField.booleanAfter(INLINE);
public static final FlagField<Boolean> HAS_GETTER = FlagField.booleanAfter(MEMBER_KIND);
public static final FlagField<Boolean> HAS_SETTER = FlagField.booleanAfter(HAS_GETTER);
// Parameters
@@ -94,7 +92,6 @@ public class Flags {
@NotNull Modality modality,
@NotNull CallableMemberDescriptor.Kind memberKind,
@NotNull ProtoBuf.Callable.CallableKind callableKind,
boolean inline,
boolean hasGetter,
boolean hasSetter
) {
@@ -103,7 +100,6 @@ public class Flags {
| VISIBILITY.toFlags(visibility(visibility))
| MEMBER_KIND.toFlags(memberKind(memberKind))
| CALLABLE_KIND.toFlags(callableKind)
| INLINE.toFlags(inline)
| HAS_GETTER.toFlags(hasGetter)
| HAS_SETTER.toFlags(hasSetter)
;